move tag utility to src/storage

6 files changed, 19 insertions, 23 deletions

diff --git a/src/pinyin.h b/src/pinyin.h
index 3cf6e71..6e3c81e 100644
--- a/src/pinyin.h
+++ b/src/pinyin.h
@@ -10,6 +10,7 @@
 #include "lookup.h"
 #include "pinyin_lookup.h"
 #include "phrase_lookup.h"
+#include "tag_utility.h"
 
 /* training module */
 #include "flexible_ngram.h"
diff --git a/src/storage/Makefile.am b/src/storage/Makefile.am
index b2d5b1a..8c10cdf 100644
--- a/src/storage/Makefile.am
+++ b/src/storage/Makefile.am
@@ -21,20 +21,22 @@ INCLUDES                = -I$(top_srcdir)/src/include \
 
 noinst_HEADERS          = pinyin_large_table.h \
 			  pinyin_base.h \
-		          pinyin_phrase.h \
+		    	  pinyin_phrase.h \
 			  phrase_index.h \
-		          pinyin_zhuyin_map_data.h \
+		    	  pinyin_zhuyin_map_data.h \
 			  phrase_large_table.h \
 			  ngram.h \
-			  flexible_ngram.h
+			  flexible_ngram.h \
+			  tag_utility.h
 
 noinst_LTLIBRARIES      = libstorage.la
 
 libstorage_la_LDFLAGS	= -static
 
 libstorage_la_SOURCES    = pinyin_base.cpp \
-			  pinyin_large_table.cpp \
-			  phrase_index.cpp \
-			  phrase_large_table.cpp \
-			  ngram.cpp
+			   pinyin_large_table.cpp \
+			   phrase_index.cpp \
+			   phrase_large_table.cpp \
+			   ngram.cpp \
+			   tag_utility.cpp
 
diff --git a/utils/storage/tag_utility.cpp b/src/storage/tag_utility.cpp
index 5dcb35a..dc1f520 100644
--- a/utils/storage/tag_utility.cpp
+++ b/src/storage/tag_utility.cpp
@@ -1,8 +1,10 @@
-#include "pinyin.h"
 #include <glib.h>
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
+#include "novel_types.h"
+#include "phrase_index.h"
+#include "phrase_large_table.h"
 #include "tag_utility.h"
 
 /* internal taglib structure */
diff --git a/utils/storage/tag_utility.h b/src/storage/tag_utility.h
index 67d8946..67d8946 100644
--- a/utils/storage/tag_utility.h
+++ b/src/storage/tag_utility.h
diff --git a/utils/storage/Makefile.am b/utils/storage/Makefile.am
index f314a1a..bc033f1 100644
--- a/utils/storage/Makefile.am
+++ b/utils/storage/Makefile.am
@@ -21,8 +21,6 @@ INCLUDES                = -I$(top_srcdir)/src \
                           -I$(top_srcdir)/src/lookup \
                           @GLIB2_CPPFLAGS@
 
-noinst_HEADERS		= tag_utility.h
-
 noinst_PROGRAMS          = gen_pinyin_table gen_binary_files export_interpolation import_interpolation
 
 gen_pinyin_table_SOURCES    = gen_pinyin_table.cpp
@@ -33,16 +31,10 @@ gen_binary_files_SOURCES    = gen_binary_files.cpp
 
 gen_binary_files_LDADD      = ../../src/libpinyin.la @GLIB2_LDFLAGS@
 
-noinst_LTLIBRARIES        = libtagutils.la
-
-libtagutils_la_LDFLAGS    = -static
-
-libtagutils_la_SOURCES    = tag_utility.cpp
-
 import_interpolation_SOURCES = import_interpolation.cpp
 
-import_interpolation_LDADD = ./.libs/libtagutils.a ../../src/libpinyin.la @GLIB2_LDFLAGS@
+import_interpolation_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@
 
 export_interpolation_SOURCES = export_interpolation.cpp
 
-export_interpolation_LDADD = ./.libs/libtagutils.a ../../src/libpinyin.la @GLIB2_LDFLAGS@
+export_interpolation_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@
diff --git a/utils/training/Makefile.am b/utils/training/Makefile.am
index 7411e78..0915479 100644
--- a/utils/training/Makefile.am
+++ b/utils/training/Makefile.am
@@ -20,8 +20,7 @@ MAINTAINERCLEANFILES    = Makefile.in
 INCLUDES		= -I$(top_srcdir)/src \
 			  -I$(top_srcdir)/src/include \
 			  -I$(top_srcdir)/src/storage \
-              -I$(top_srcdir)/src/lookup \
-			  -I$(top_srcdir)/utils/storage \
+			  -I$(top_srcdir)/src/lookup \
 			  @GLIB2_CPPFLAGS@
 
 noinst_HEADERS		= k_mixture_model.h
@@ -72,12 +71,12 @@ prune_k_mixture_model_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@
 
 import_k_mixture_model_SOURCES = import_k_mixture_model.cpp
 
-import_k_mixture_model_LDADD = ../storage/libtagutils.la ../../src/libpinyin.la @GLIB2_LDFLAGS@
+import_k_mixture_model_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@
 
 export_k_mixture_model_SOURCES = export_k_mixture_model.cpp
 
-export_k_mixture_model_LDADD = ../storage/libtagutils.la ../../src/libpinyin.la @GLIB2_LDFLAGS@
+export_k_mixture_model_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@
 
 k_mixture_model_to_interpolation_SOURCES = k_mixture_model_to_interpolation.cpp
 
-k_mixture_model_to_interpolation_LDADD = ../storage/libtagutils.la ../../src/libpinyin.la @GLIB2_LDFLAGS@
\ No newline at end of file
+k_mixture_model_to_interpolation_LDADD = ../../src/libpinyin.la @GLIB2_LDFLAGS@
\ No newline at end of file