diff options
| -rw-r--r-- | src/Makefile.am | 8 | ||||
| -rw-r--r-- | src/lookup/Makefile.am | 2 | ||||
| -rw-r--r-- | src/pinyin.cpp | 1 | ||||
| -rw-r--r-- | src/storage/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/include/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/lookup/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/storage/Makefile.am | 10 | ||||
| -rw-r--r-- | utils/storage/Makefile.am | 6 |
8 files changed, 24 insertions, 11 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 59e009f..6894e01 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,3 +23,11 @@ MAINTAINERCLEANFILES = Makefile.in CLEANFILES = *.bak ACLOCAL = aclocal -I $(ac_aux_dir) + +noinst_LTLIBRARIES = libpinyin.la + +libpinyin_la_LDFLAGS = -static + +libpinyin_la_SOURCES = pinyin.cpp + +libpinyin_la_LIBADD = storage/libstorage.la lookup/liblookup.la diff --git a/src/lookup/Makefile.am b/src/lookup/Makefile.am index 2b7d21f..7ad7ac3 100644 --- a/src/lookup/Makefile.am +++ b/src/lookup/Makefile.am @@ -27,4 +27,6 @@ noinst_PROGRAMS = noinst_LTLIBRARIES = liblookup.la +liblookup_la_LDFLAGS = -static + liblookup_la_SOURCES = pinyin_lookup.cpp winner_tree.cpp diff --git a/src/pinyin.cpp b/src/pinyin.cpp new file mode 100644 index 0000000..f7f6a7e --- /dev/null +++ b/src/pinyin.cpp @@ -0,0 +1 @@ +/* Place holder for combining static libraries in sub-directories. */ diff --git a/src/storage/Makefile.am b/src/storage/Makefile.am index 2ffcfbd..c486800 100644 --- a/src/storage/Makefile.am +++ b/src/storage/Makefile.am @@ -27,7 +27,9 @@ noinst_HEADERS = pinyin_large_table.h \ phrase_large_table.h \ ngram.h -noinst_LTLIBRARIES = libstorage.la +noinst_LTLIBRARIES = libstorage.la + +libstorage_la_LDFLAGS = -static libstorage_la_SOURCES = pinyin_base.cpp \ pinyin_large_table.cpp \ diff --git a/tests/include/Makefile.am b/tests/include/Makefile.am index 53bc089..3ab278a 100644 --- a/tests/include/Makefile.am +++ b/tests/include/Makefile.am @@ -21,5 +21,5 @@ noinst_PROGRAMS = test_memory_chunk test_memory_chunk_SOURCES = test_memory_chunk.cpp -test_memory_chunk_LDADD = ../../src/storage/libstorage.la @GLIB2_LIBS@ +test_memory_chunk_LDADD = ../../src/libpinyin.la @GLIB2_LIBS@ diff --git a/tests/lookup/Makefile.am b/tests/lookup/Makefile.am index ca863ce..4c71c36 100644 --- a/tests/lookup/Makefile.am +++ b/tests/lookup/Makefile.am @@ -24,4 +24,4 @@ noinst_PROGRAMS = test_simple_lookup test_simple_lookup_SOURCES = test_simple_lookup.cpp -test_simple_lookup_LDADD = ../../src/storage/libstorage.la ../../src/lookup/liblookup.la @GLIB2_LDFLAGS@ +test_simple_lookup_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@ diff --git a/tests/storage/Makefile.am b/tests/storage/Makefile.am index 8d73153..39570a3 100644 --- a/tests/storage/Makefile.am +++ b/tests/storage/Makefile.am @@ -27,20 +27,20 @@ noinst_PROGRAMS = test_parser \ test_parser_SOURCES = test_parser.cpp -test_parser_LDADD = ../../src/storage/libstorage.la @GLIB2_LDFLAGS@ +test_parser_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@ test_pinyin_index_SOURCES = test_pinyin_index.cpp -test_pinyin_index_LDADD = ../../src/storage/libstorage.la @GLIB2_LDFLAGS@ +test_pinyin_index_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@ test_phrase_index_SOURCES = test_phrase_index.cpp -test_phrase_index_LDADD = ../../src/storage/libstorage.la @GLIB2_LDFLAGS@ +test_phrase_index_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@ test_phrase_table_SOURCES = test_phrase_table.cpp -test_phrase_table_LDADD = ../../src/storage/libstorage.la @GLIB2_LDFLAGS@ +test_phrase_table_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@ test_ngram_SOURCES = test_ngram.cpp -test_ngram_LDADD = ../../src/storage/libstorage.la @GLIB2_LDFLAGS@ +test_ngram_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@ diff --git a/utils/storage/Makefile.am b/utils/storage/Makefile.am index 364ba3a..e9e9ca9 100644 --- a/utils/storage/Makefile.am +++ b/utils/storage/Makefile.am @@ -23,12 +23,12 @@ noinst_PROGRAMS = gen_pinyin_table gen_binary_files export_interpolatio gen_pinyin_table_SOURCES = gen_pinyin_table.cpp -gen_pinyin_table_LDADD = ../../src/storage/libstorage.la @GLIB2_LDFLAGS@ +gen_pinyin_table_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@ gen_binary_files_SOURCES = gen_binary_files.cpp -gen_binary_files_LDADD = ../../src/storage/libstorage.la @GLIB2_LDFLAGS@ +gen_binary_files_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@ export_interpolation_SOURCES = export_interpolation.cpp -export_interpolation_LDADD = ../../src/storage/libstorage.la @GLIB2_LDFLAGS@ +export_interpolation_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@ |