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:31:26 +0800 |
commit | a8421c0fb6a25e4af628d43841cbb8b7cca81997 (patch) | |
tree | d9e86d4c93d7236cd0c4650b57271d822c503798 /utils | |
parent | 8c8eabf8451c91635edf4cf48b20bc59210037ef (diff) | |
download | libpinyin-a8421c0fb6a25e4af628d43841cbb8b7cca81997.tar.gz libpinyin-a8421c0fb6a25e4af628d43841cbb8b7cca81997.tar.xz libpinyin-a8421c0fb6a25e4af628d43841cbb8b7cca81997.zip |
Fixes issue reported by fundawang:
https://github.com/libpinyin/libpinyin/issues/33
merge libpinyin-0.8.0-link.patch.
Diffstat (limited to 'utils')
-rw-r--r-- | utils/segment/Makefile.am | 6 | ||||
-rw-r--r-- | utils/storage/Makefile.am | 10 | ||||
-rw-r--r-- | utils/training/Makefile.am | 28 |
3 files changed, 22 insertions, 22 deletions
diff --git a/utils/segment/Makefile.am b/utils/segment/Makefile.am index 184b7af..5315266 100644 --- a/utils/segment/Makefile.am +++ b/utils/segment/Makefile.am @@ -22,14 +22,14 @@ INCLUDES = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/storage \ -I$(top_srcdir)/src/lookup \ -I$(top_srcdir)/utils \ - @GLIB2_CPPFLAGS@ + @GLIB2_CFLAGS@ noinst_PROGRAMS = spseg ngseg spseg_SOURCES = spseg.cpp -spseg_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@ +spseg_LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ ngseg_SOURCES = ngseg.cpp -ngseg_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@ +ngseg_LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ diff --git a/utils/storage/Makefile.am b/utils/storage/Makefile.am index 944d647..321f426 100644 --- a/utils/storage/Makefile.am +++ b/utils/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)/utils \ - @GLIB2_CPPFLAGS@ + @GLIB2_CFLAGS@ bin_PROGRAMS = gen_binary_files \ import_interpolation @@ -30,16 +30,16 @@ noinst_PROGRAMS = export_interpolation \ gen_binary_files_SOURCES = gen_binary_files.cpp -gen_binary_files_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@ +gen_binary_files_LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ import_interpolation_SOURCES = import_interpolation.cpp -import_interpolation_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@ +import_interpolation_LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ export_interpolation_SOURCES = export_interpolation.cpp -export_interpolation_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@ +export_interpolation_LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ gen_chewing_table_SOURCES = gen_chewing_table.cpp -gen_chewing_table_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@ +gen_chewing_table_LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ diff --git a/utils/training/Makefile.am b/utils/training/Makefile.am index 58119aa..dc834ec 100644 --- a/utils/training/Makefile.am +++ b/utils/training/Makefile.am @@ -22,7 +22,7 @@ INCLUDES = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/storage \ -I$(top_srcdir)/src/lookup \ -I$(top_srcdir)/utils \ - @GLIB2_CPPFLAGS@ + @GLIB2_CFLAGS@ noinst_HEADERS = k_mixture_model.h @@ -43,55 +43,55 @@ noinst_PROGRAMS = gen_ngram \ gen_ngram_SOURCES = gen_ngram.cpp -gen_ngram_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@ +gen_ngram_LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ gen_deleted_ngram_SOURCES = gen_deleted_ngram.cpp -gen_deleted_ngram_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@ +gen_deleted_ngram_LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ gen_unigram_SOURCES = gen_unigram.cpp -gen_unigram_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@ +gen_unigram_LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ gen_k_mixture_model_SOURCES = gen_k_mixture_model.cpp -gen_k_mixture_model_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@ +gen_k_mixture_model_LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ estimate_interpolation_SOURCES = estimate_interpolation.cpp -estimate_interpolation_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@ +estimate_interpolation_LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ estimate_k_mixture_model_SOURCES = estimate_k_mixture_model.cpp estimate_k_mixture_model_LDADD = ../../src/libpinyin_internal.la \ - @GLIB2_LDFLAGS@ + @GLIB2_LIBS@ merge_k_mixture_model_SOURCES = merge_k_mixture_model.cpp -merge_k_mixture_model_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@ +merge_k_mixture_model_LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ prune_k_mixture_model_SOURCES = prune_k_mixture_model.cpp -prune_k_mixture_model_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@ +prune_k_mixture_model_LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ import_k_mixture_model_SOURCES = import_k_mixture_model.cpp -import_k_mixture_model_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@ +import_k_mixture_model_LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ export_k_mixture_model_SOURCES = export_k_mixture_model.cpp -export_k_mixture_model_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@ +export_k_mixture_model_LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ k_mixture_model_to_interpolation_SOURCES = k_mixture_model_to_interpolation.cpp k_mixture_model_to_interpolation_LDADD = ../../src/libpinyin_internal.la \ - @GLIB2_LDFLAGS@ + @GLIB2_LIBS@ validate_k_mixture_model_SOURCES = validate_k_mixture_model.cpp validate_k_mixture_model_LDADD = ../../src/libpinyin_internal.la \ - @GLIB2_LDFLAGS@ + @GLIB2_LIBS@ eval_correction_rate_SOURCES = eval_correction_rate.cpp -eval_correction_rate_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@ +eval_correction_rate_LDADD = ../../src/libpinyin_internal.la @GLIB2_LIBS@ |