diff options
| author | Peng Wu <alexepico@gmail.com> | 2013-10-14 13:44:25 +0800 |
|---|---|---|
| committer | Peng Wu <alexepico@gmail.com> | 2013-10-14 13:44:25 +0800 |
| commit | 6377b302af8aa66eaead9b8e4d13ad5e3f8faad3 (patch) | |
| tree | 6df20ec2bfcdc6214460293b762ac9dd11a36c9e /tests | |
| parent | 8c4416a0b02ee81925ab200be91e6a0a3de016fa (diff) | |
| download | libpinyin-6377b302af8aa66eaead9b8e4d13ad5e3f8faad3.tar.gz libpinyin-6377b302af8aa66eaead9b8e4d13ad5e3f8faad3.tar.xz libpinyin-6377b302af8aa66eaead9b8e4d13ad5e3f8faad3.zip | |
clean up Makefile.am
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 8 | ||||
| -rw-r--r-- | tests/include/Makefile.am | 9 | ||||
| -rw-r--r-- | tests/lookup/Makefile.am | 10 | ||||
| -rw-r--r-- | tests/storage/Makefile.am | 42 |
4 files changed, 23 insertions, 46 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 8208214..93df7d6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -30,6 +30,8 @@ INCLUDES = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/lookup \ @GLIB2_CFLAGS@ +LDADD = ../src/libpinyin.la @GLIB2_LIBS@ + noinst_HEADERS = timer.h \ tests_helper.h @@ -39,12 +41,6 @@ noinst_PROGRAMS = test_pinyin \ test_pinyin_SOURCES = test_pinyin.cpp -test_pinyin_LDADD = ../src/libpinyin.la @GLIB2_LIBS@ - test_phrase_SOURCES = test_phrase.cpp -test_phrase_LDADD = ../src/libpinyin.la @GLIB2_LIBS@ - test_chewing_SOURCES = test_chewing.cpp - -test_chewing_LDADD = ../src/libpinyin.la @GLIB2_LIBS@ diff --git a/tests/include/Makefile.am b/tests/include/Makefile.am index 7174bec..f52c5ac 100644 --- a/tests/include/Makefile.am +++ b/tests/include/Makefile.am @@ -21,11 +21,10 @@ INCLUDES = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/lookup \ @GLIB2_CFLAGS@ -TESTS = test_memory_chunk +LDADD = @GLIB2_LIBS@ -noinst_PROGRAMS = test_memory_chunk +TESTS = test_memory_chunk -test_memory_chunk_SOURCES = test_memory_chunk.cpp - -test_memory_chunk_LDADD = @GLIB2_LIBS@ +noinst_PROGRAMS = test_memory_chunk +test_memory_chunk_SOURCES = test_memory_chunk.cpp diff --git a/tests/lookup/Makefile.am b/tests/lookup/Makefile.am index 4bcc176..804d037 100644 --- a/tests/lookup/Makefile.am +++ b/tests/lookup/Makefile.am @@ -22,13 +22,11 @@ INCLUDES = -I$(top_srcdir)/src \ -I$(top_srcdir)/tests \ @GLIB2_CFLAGS@ -noinst_PROGRAMS = test_pinyin_lookup \ - test_phrase_lookup +LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ -test_pinyin_lookup_SOURCES = test_pinyin_lookup.cpp +noinst_PROGRAMS = test_pinyin_lookup \ + test_phrase_lookup -test_pinyin_lookup_LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ +test_pinyin_lookup_SOURCES = test_pinyin_lookup.cpp test_phrase_lookup_SOURCES = test_phrase_lookup.cpp - -test_phrase_lookup_LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@
\ No newline at end of file diff --git a/tests/storage/Makefile.am b/tests/storage/Makefile.am index b7ed8b6..7675d11 100644 --- a/tests/storage/Makefile.am +++ b/tests/storage/Makefile.am @@ -22,50 +22,34 @@ INCLUDES = -I$(top_srcdir)/src \ -I$(top_srcdir)/tests \ @GLIB2_CFLAGS@ -TESTS = test_phrase_index_logger \ - test_ngram \ - test_flexible_ngram +LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ -noinst_PROGRAMS = test_phrase_index \ - test_phrase_index_logger \ - test_phrase_table \ - test_ngram \ - test_flexible_ngram \ - test_parser2 \ - test_chewing_table \ - test_table_info +TESTS = test_phrase_index_logger \ + test_ngram \ + test_flexible_ngram +noinst_PROGRAMS = test_phrase_index \ + test_phrase_index_logger \ + test_phrase_table \ + test_ngram \ + test_flexible_ngram \ + test_parser2 \ + test_chewing_table \ + test_table_info -test_phrase_index_SOURCES = test_phrase_index.cpp -test_phrase_index_LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ +test_phrase_index_SOURCES = test_phrase_index.cpp test_phrase_index_logger_SOURCES = test_phrase_index_logger.cpp -test_phrase_index_logger_LDADD = ../../src/libpinyin_internal.la \ - @GLIB2_LIBS@ - test_phrase_table_SOURCES = test_phrase_table.cpp -test_phrase_table_LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ - test_ngram_SOURCES = test_ngram.cpp -test_ngram_LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ - test_flexible_ngram_SOURCES = test_flexible_ngram.cpp -test_flexible_ngram_LDADD = ../../src/libpinyin_internal.la \ - @GLIB2_LIBS@ - test_parser2_SOURCES = test_parser2.cpp -test_parser2_LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ - test_chewing_table_SOURCES = test_chewing_table.cpp -test_chewing_table_LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ - test_table_info_SOURCES = test_table_info.cpp - -test_table_info_LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ |