diff options
| author | Peng Wu <alexepico@gmail.com> | 2011-08-05 14:13:21 +0800 |
|---|---|---|
| committer | Peng Wu <alexepico@gmail.com> | 2011-08-05 14:13:21 +0800 |
| commit | a1b9f96c6878d06c5b803ccdcea26f5fcc971365 (patch) | |
| tree | f7e0c3ac4fc15d5f7b8e52999f03a7f9edbb6c35 | |
| parent | d593958f5b3019c44a7bb6d7c664df12e0478d0e (diff) | |
| download | libpinyin-a1b9f96c6878d06c5b803ccdcea26f5fcc971365.tar.gz libpinyin-a1b9f96c6878d06c5b803ccdcea26f5fcc971365.tar.xz libpinyin-a1b9f96c6878d06c5b803ccdcea26f5fcc971365.zip | |
make libpinyin installable
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/include/Makefile.am | 4 | ||||
| -rw-r--r-- | src/lookup/Makefile.am | 8 | ||||
| -rw-r--r-- | src/storage/Makefile.am | 6 |
5 files changed, 20 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index efa32c4..0b2b816 100644 --- a/configure.ac +++ b/configure.ac @@ -8,6 +8,10 @@ AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) +# Define a string for binary compatibility +LIBPINYIN_BINARY_VERSION=0.3 +AC_SUBST(LIBPINYIN_BINARY_VERSION) + # Checks for programs. AC_PROG_CXX AC_PROG_CC diff --git a/src/Makefile.am b/src/Makefile.am index e6b17ca..94eae2d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -30,11 +30,11 @@ INCLUDES = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/lookup \ @GLIB2_CPPFLAGS@ -noinst_HEADERS = pinyin.h +libpinyinincludedir = $(includedir)/libpinyin-@LIBPINYIN_BINARY_VERSION@ -noinst_LTLIBRARIES = libpinyin.la +libpinyininclude_HEADERS= pinyin.h -libpinyin_la_LDFLAGS = -static +lib_LTLIBRARIES = libpinyin.la libpinyin_la_SOURCES = pinyin.cpp diff --git a/src/include/Makefile.am b/src/include/Makefile.am index bb605ee..3aaa60d 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -17,6 +17,8 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_HEADERS = memory_chunk.h \ +libpinyinincludedir = $(includedir)/libpinyin-@LIBPINYIN_BINARY_VERSION@ + +libpinyininclude_HEADERS= memory_chunk.h \ novel_types.h \ stl_lite.h diff --git a/src/lookup/Makefile.am b/src/lookup/Makefile.am index 4d6917a..9efb92e 100644 --- a/src/lookup/Makefile.am +++ b/src/lookup/Makefile.am @@ -21,13 +21,15 @@ INCLUDES = -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ @GLIB2_CPPFLAGS@ -noinst_HEADERS = lookup.h pinyin_lookup.h \ - phrase_lookup.h winner_tree.h +libpinyinincludedir = $(includedir)/libpinyin-@LIBPINYIN_BINARY_VERSION@ -noinst_PROGRAMS = +libpinyininclude_HEADERS= lookup.h pinyin_lookup.h \ + phrase_lookup.h winner_tree.h noinst_LTLIBRARIES = liblookup.la +liblookup_la_CXXFLAGS = "-fPIC" + liblookup_la_LDFLAGS = -static liblookup_la_SOURCES = pinyin_lookup.cpp winner_tree.cpp phrase_lookup.cpp diff --git a/src/storage/Makefile.am b/src/storage/Makefile.am index 8c10cdf..f508b82 100644 --- a/src/storage/Makefile.am +++ b/src/storage/Makefile.am @@ -19,7 +19,9 @@ INCLUDES = -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ @GLIB2_CPPFLAGS@ -noinst_HEADERS = pinyin_large_table.h \ +libpinyinincludedir = $(includedir)/libpinyin-@LIBPINYIN_BINARY_VERSION@ + +libpinyininclude_HEADERS= pinyin_large_table.h \ pinyin_base.h \ pinyin_phrase.h \ phrase_index.h \ @@ -31,6 +33,8 @@ noinst_HEADERS = pinyin_large_table.h \ noinst_LTLIBRARIES = libstorage.la +libstorage_la_CXXFLAGS = "-fPIC" + libstorage_la_LDFLAGS = -static libstorage_la_SOURCES = pinyin_base.cpp \ |