diff options
author | Peng Wu <pwu@redhat.com> | 2019-11-28 15:42:26 +0800 |
---|---|---|
committer | Peng Wu <pwu@redhat.com> | 2019-11-28 15:42:26 +0800 |
commit | 50a87b3efe0b10a9ae2ce989c0c0172e2984af32 (patch) | |
tree | 87f75013414c0e1fa02003758054876b31766061 /src | |
parent | 51c551dc9a8b264315100a774720373a0e3744e6 (diff) | |
download | libpinyin-50a87b3efe0b10a9ae2ce989c0c0172e2984af32.tar.gz libpinyin-50a87b3efe0b10a9ae2ce989c0c0172e2984af32.tar.xz libpinyin-50a87b3efe0b10a9ae2ce989c0c0172e2984af32.zip |
improve autoconf for libpinyin_internal.a
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 33 | ||||
-rw-r--r-- | src/lookup/Makefile.am | 14 | ||||
-rw-r--r-- | src/storage/Makefile.am | 16 |
3 files changed, 29 insertions, 34 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index c821d04..07153ce 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,19 +14,18 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see <http://www.gnu.org/licenses/>. -AUTOMAKE_OPTIONS = gnu -SUBDIRS = include storage lookup +AUTOMAKE_OPTIONS = gnu +SUBDIRS = include storage lookup -EXTRA_DIST = libpinyin.ver \ - libzhuyin.ver +EXTRA_DIST = libpinyin.ver libzhuyin.ver -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = Makefile.in -CLEANFILES = *.bak +CLEANFILES = *.bak -ACLOCAL = aclocal -I $(ac_aux_dir) +ACLOCAL = aclocal -I $(ac_aux_dir) -INCLUDES = -I$(top_srcdir)/src \ +AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ -I$(top_srcdir)/src/lookup \ @@ -42,31 +41,31 @@ endif noinst_HEADERS = pinyin_internal.h -lib_LTLIBRARIES = libpinyin.la +lib_LTLIBRARIES = libpinyin.la -noinst_LTLIBRARIES = libpinyin_internal.la +noinst_LIBRARIES = libpinyin_internal.a -libpinyin_la_SOURCES = pinyin.cpp +libpinyin_la_SOURCES = pinyin.cpp -libpinyin_la_LIBADD = storage/libstorage.la lookup/liblookup.la @GLIB2_LIBS@ +libpinyin_la_LIBADD = storage/libstorage.a lookup/liblookup.a @GLIB2_LIBS@ -libpinyin_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libpinyin.ver \ +libpinyin_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libpinyin.ver \ -version-info @LT_VERSION_INFO@ if ENABLE_LIBZHUYIN lib_LTLIBRARIES += libzhuyin.la -libzhuyin_la_SOURCES = zhuyin.cpp +libzhuyin_la_SOURCES = zhuyin.cpp libzhuyin_la_LIBADD = storage/libstorage.la lookup/liblookup.la @GLIB2_LIBS@ -libzhuyin_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libzhuyin.ver \ +libzhuyin_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libzhuyin.ver \ -version-info @LT_VERSION_INFO@ endif -libpinyin_internal_la_SOURCES = pinyin_internal.cpp +libpinyin_internal_a_SOURCES = pinyin_internal.cpp -libpinyin_internal_la_LIBADD = storage/libstorage.la lookup/liblookup.la +libpinyin_internal_a_LIBADD = storage/libstorage.a lookup/liblookup.a ## Note: ## As libpinyin internal interface will change, only provides static library diff --git a/src/lookup/Makefile.am b/src/lookup/Makefile.am index 55c1881..a6000cb 100644 --- a/src/lookup/Makefile.am +++ b/src/lookup/Makefile.am @@ -14,13 +14,13 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see <http://www.gnu.org/licenses/>. -MAINTAINERCLEANFILES = Makefile.in +MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(top_srcdir)/src/include \ +AM_CPPFLAGS = -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ @GLIB2_CFLAGS@ -noinst_HEADERS = lookup.h \ +noinst_HEADERS = lookup.h \ pinyin_lookup2.h \ phrase_lookup.h \ phonetic_lookup.h \ @@ -28,13 +28,11 @@ noinst_HEADERS = lookup.h \ phonetic_lookup_heap.h -noinst_LTLIBRARIES = liblookup.la +noinst_LIBRARIES = liblookup.a -liblookup_la_CXXFLAGS = "-fPIC" +liblookup_a_CXXFLAGS = "-fPIC" -liblookup_la_LDFLAGS = -static - -liblookup_la_SOURCES = pinyin_lookup2.cpp \ +liblookup_a_SOURCES = pinyin_lookup2.cpp \ phrase_lookup.cpp \ lookup.cpp \ phonetic_lookup.cpp diff --git a/src/storage/Makefile.am b/src/storage/Makefile.am index ba9d4f4..5e9d1d1 100644 --- a/src/storage/Makefile.am +++ b/src/storage/Makefile.am @@ -14,7 +14,7 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see <http://www.gnu.org/licenses/>. -INCLUDES = -I$(top_srcdir)/src/include \ +AM_CPPFLAGS = -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ @GLIB2_CFLAGS@ @@ -26,7 +26,7 @@ if ENABLE_LIBZHUYIN libpinyininclude_HEADERS += zhuyin_custom2.h endif -noinst_HEADERS = chewing_enum.h \ +noinst_HEADERS = chewing_enum.h \ chewing_key.h \ pinyin_parser2.h \ zhuyin_parser2.h \ @@ -64,13 +64,11 @@ noinst_HEADERS = chewing_enum.h \ kyotodb_utils.h -noinst_LTLIBRARIES = libstorage.la +noinst_LIBRARIES = libstorage.a -libstorage_la_CXXFLAGS = "-fPIC" +libstorage_a_CXXFLAGS = "-fPIC" -libstorage_la_LDFLAGS = -static - -libstorage_la_SOURCES = phrase_index.cpp \ +libstorage_a_SOURCES = phrase_index.cpp \ phrase_large_table2.cpp \ phrase_large_table3.cpp \ ngram.cpp \ @@ -84,13 +82,13 @@ libstorage_la_SOURCES = phrase_index.cpp \ table_info.cpp if BERKELEYDB -libstorage_la_SOURCES += ngram_bdb.cpp \ +libstorage_a_SOURCES += ngram_bdb.cpp \ phrase_large_table3_bdb.cpp \ chewing_large_table2_bdb.cpp endif if KYOTOCABINET -libstorage_la_SOURCES += ngram_kyotodb.cpp \ +libstorage_a_SOURCES += ngram_kyotodb.cpp \ phrase_large_table3_kyotodb.cpp \ chewing_large_table2_kyotodb.cpp endif |