diff options
author | Peng Wu <alexepico@gmail.com> | 2013-02-17 17:28:43 +0800 |
---|---|---|
committer | Peng Wu <alexepico@gmail.com> | 2013-02-17 17:32:45 +0800 |
commit | 0bd4ccf6a1a74e12a1921578d8338c9c281fdf87 (patch) | |
tree | f3b4b041440c027084661ccbcb088af58f8f6d1a /tests | |
parent | dfcd7aab4df1b1e679926cf8e1357429b8b8b67d (diff) | |
download | libpinyin-0bd4ccf6a1a74e12a1921578d8338c9c281fdf87.tar.gz libpinyin-0bd4ccf6a1a74e12a1921578d8338c9c281fdf87.tar.xz libpinyin-0bd4ccf6a1a74e12a1921578d8338c9c281fdf87.zip |
Fixes issue reported by fundawang:
https://github.com/libpinyin/libpinyin/issues/33
merge libpinyin-0.8.0-link.patch.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Makefile.am | 8 | ||||
-rw-r--r-- | tests/include/Makefile.am | 2 | ||||
-rw-r--r-- | tests/lookup/Makefile.am | 6 | ||||
-rw-r--r-- | tests/storage/Makefile.am | 16 |
4 files changed, 16 insertions, 16 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 84b4518..8208214 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -28,7 +28,7 @@ INCLUDES = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ -I$(top_srcdir)/src/lookup \ - @GLIB2_CPPFLAGS@ + @GLIB2_CFLAGS@ noinst_HEADERS = timer.h \ tests_helper.h @@ -39,12 +39,12 @@ noinst_PROGRAMS = test_pinyin \ test_pinyin_SOURCES = test_pinyin.cpp -test_pinyin_LDADD = ../src/libpinyin.la @GLIB2_LDFLAGS@ +test_pinyin_LDADD = ../src/libpinyin.la @GLIB2_LIBS@ test_phrase_SOURCES = test_phrase.cpp -test_phrase_LDADD = ../src/libpinyin.la @GLIB2_LDFLAGS@ +test_phrase_LDADD = ../src/libpinyin.la @GLIB2_LIBS@ test_chewing_SOURCES = test_chewing.cpp -test_chewing_LDADD = ../src/libpinyin.la @GLIB2_LDFLAGS@ +test_chewing_LDADD = ../src/libpinyin.la @GLIB2_LIBS@ diff --git a/tests/include/Makefile.am b/tests/include/Makefile.am index 656c665..7174bec 100644 --- a/tests/include/Makefile.am +++ b/tests/include/Makefile.am @@ -19,7 +19,7 @@ INCLUDES = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ -I$(top_srcdir)/src/lookup \ - @GLIB2_CPPFLAGS@ + @GLIB2_CFLAGS@ TESTS = test_memory_chunk diff --git a/tests/lookup/Makefile.am b/tests/lookup/Makefile.am index f0eb408..4bcc176 100644 --- a/tests/lookup/Makefile.am +++ b/tests/lookup/Makefile.am @@ -20,15 +20,15 @@ INCLUDES = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/storage \ -I$(top_srcdir)/src/lookup \ -I$(top_srcdir)/tests \ - @GLIB2_CPPFLAGS@ + @GLIB2_CFLAGS@ noinst_PROGRAMS = test_pinyin_lookup \ test_phrase_lookup test_pinyin_lookup_SOURCES = test_pinyin_lookup.cpp -test_pinyin_lookup_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@ +test_pinyin_lookup_LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ test_phrase_lookup_SOURCES = test_phrase_lookup.cpp -test_phrase_lookup_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@
\ No newline at end of file +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 df20f67..7b03120 100644 --- a/tests/storage/Makefile.am +++ b/tests/storage/Makefile.am @@ -20,7 +20,7 @@ INCLUDES = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/storage \ -I$(top_srcdir)/src/lookup \ -I$(top_srcdir)/tests \ - @GLIB2_CPPFLAGS@ + @GLIB2_CFLAGS@ TESTS = test_phrase_index_logger \ test_ngram \ @@ -37,30 +37,30 @@ noinst_PROGRAMS = test_phrase_index \ test_phrase_index_SOURCES = test_phrase_index.cpp -test_phrase_index_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@ +test_phrase_index_LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ test_phrase_index_logger_SOURCES = test_phrase_index_logger.cpp test_phrase_index_logger_LDADD = ../../src/libpinyin_internal.la \ - @GLIB2_LDFLAGS@ + @GLIB2_LIBS@ test_phrase_table_SOURCES = test_phrase_table.cpp -test_phrase_table_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@ +test_phrase_table_LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ test_ngram_SOURCES = test_ngram.cpp -test_ngram_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@ +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_LDFLAGS@ + @GLIB2_LIBS@ test_parser2_SOURCES = test_parser2.cpp -test_parser2_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@ +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_LDFLAGS@ +test_chewing_table_LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ |