summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorPeng Wu <alexepico@gmail.com>2011-08-30 14:41:29 +0800
committerPeng Wu <alexepico@gmail.com>2011-08-30 14:41:29 +0800
commit12c6b51b1296aad330df572794693d37423179a4 (patch)
tree532066af19e5262c804f1dfef03b449b9f0639a6 /utils
parent293003483072888aa954f06d3097f5b46f55e1e5 (diff)
downloadlibpinyin-12c6b51b1296aad330df572794693d37423179a4.tar.gz
libpinyin-12c6b51b1296aad330df572794693d37423179a4.tar.xz
libpinyin-12c6b51b1296aad330df572794693d37423179a4.zip
switch to pinyin internal library
Diffstat (limited to 'utils')
-rw-r--r--utils/segment/Makefile.am4
-rw-r--r--utils/storage/Makefile.am8
-rw-r--r--utils/storage/gen_pinyin_table.cpp4
-rw-r--r--utils/training/Makefile.am29
4 files changed, 23 insertions, 22 deletions
diff --git a/utils/segment/Makefile.am b/utils/segment/Makefile.am
index 6317a89..b04f64f 100644
--- a/utils/segment/Makefile.am
+++ b/utils/segment/Makefile.am
@@ -27,8 +27,8 @@ noinst_PROGRAMS = spseg ngseg
spseg_SOURCES = spseg.cpp
-spseg_LDADD = @GLIB2_LDFLAGS@ ../../src/libpinyin.la
+spseg_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@
ngseg_SOURCES = ngseg.cpp
-ngseg_LDADD = @GLIB2_LDFLAGS@ ../../src/libpinyin.la
+ngseg_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@
diff --git a/utils/storage/Makefile.am b/utils/storage/Makefile.am
index bc033f1..36452a4 100644
--- a/utils/storage/Makefile.am
+++ b/utils/storage/Makefile.am
@@ -25,16 +25,16 @@ noinst_PROGRAMS = gen_pinyin_table gen_binary_files export_interpolatio
gen_pinyin_table_SOURCES = gen_pinyin_table.cpp
-gen_pinyin_table_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@
+gen_pinyin_table_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@
gen_binary_files_SOURCES = gen_binary_files.cpp
-gen_binary_files_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@
+gen_binary_files_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@
import_interpolation_SOURCES = import_interpolation.cpp
-import_interpolation_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@
+import_interpolation_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@
export_interpolation_SOURCES = export_interpolation.cpp
-export_interpolation_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@
+export_interpolation_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@
diff --git a/utils/storage/gen_pinyin_table.cpp b/utils/storage/gen_pinyin_table.cpp
index 83a5c8a..414946b 100644
--- a/utils/storage/gen_pinyin_table.cpp
+++ b/utils/storage/gen_pinyin_table.cpp
@@ -20,11 +20,9 @@
*/
#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
#include <locale.h>
#include <glib.h>
-#include "pinyin.h"
+#include "pinyin_internal.h"
GTree * g_pinyin_tree;
diff --git a/utils/training/Makefile.am b/utils/training/Makefile.am
index 38fdd60..39d9731 100644
--- a/utils/training/Makefile.am
+++ b/utils/training/Makefile.am
@@ -41,52 +41,55 @@ noinst_PROGRAMS = gen_ngram \
gen_ngram_SOURCES = gen_ngram.cpp
-gen_ngram_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@
+gen_ngram_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@
gen_deleted_ngram_SOURCES = gen_deleted_ngram.cpp
-gen_deleted_ngram_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@
+gen_deleted_ngram_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@
gen_unigram_SOURCES = gen_unigram.cpp
-gen_unigram_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@
+gen_unigram_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@
gen_k_mixture_model_SOURCES = gen_k_mixture_model.cpp
-gen_k_mixture_model_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@
+gen_k_mixture_model_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@
estimate_interpolation_SOURCES = estimate_interpolation.cpp
-estimate_interpolation_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@
+estimate_interpolation_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@
estimate_k_mixture_model_SOURCES = estimate_k_mixture_model.cpp
-estimate_k_mixture_model_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@
+estimate_k_mixture_model_LDADD = ../../src/libpinyin_internal.la \
+ @GLIB2_LDFLAGS@
merge_k_mixture_model_SOURCES = merge_k_mixture_model.cpp
-merge_k_mixture_model_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@
+merge_k_mixture_model_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@
prune_k_mixture_model_SOURCES = prune_k_mixture_model.cpp
-prune_k_mixture_model_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@
+prune_k_mixture_model_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@
import_k_mixture_model_SOURCES = import_k_mixture_model.cpp
-import_k_mixture_model_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@
+import_k_mixture_model_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@
export_k_mixture_model_SOURCES = export_k_mixture_model.cpp
-export_k_mixture_model_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@
+export_k_mixture_model_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@
k_mixture_model_to_interpolation_SOURCES = k_mixture_model_to_interpolation.cpp
-k_mixture_model_to_interpolation_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@
+k_mixture_model_to_interpolation_LDADD = ../../src/libpinyin_internal.la \
+ @GLIB2_LDFLAGS@
validate_k_mixture_model_SOURCES = validate_k_mixture_model.cpp
-validate_k_mixture_model_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@
+validate_k_mixture_model_LDADD = ../../src/libpinyin_internal.la \
+ @GLIB2_LDFLAGS@
eval_correction_rate_SOURCES = eval_correction_rate.cpp
-eval_correction_rate_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@ \ No newline at end of file
+eval_correction_rate_LDADD = ../../src/libpinyin_internal.la @GLIB2_LDFLAGS@