From a99fa36f8e6a75f2c305a07e08354fa881a1a124 Mon Sep 17 00:00:00 2001
From: Peng Wu <alexepico@gmail.com>
Date: Thu, 14 Oct 2010 14:42:59 +0800
Subject: switch to pinyin.h for utils

---
 utils/storage/Makefile.am              | 8 +++++---
 utils/storage/export_interpolation.cpp | 5 +----
 utils/storage/gen_binary_files.cpp     | 8 +-------
 utils/storage/gen_pinyin_table.cpp     | 4 +---
 utils/storage/import_interpolation.cpp | 6 +-----
 5 files changed, 9 insertions(+), 22 deletions(-)

(limited to 'utils')

diff --git a/utils/storage/Makefile.am b/utils/storage/Makefile.am
index edb134b..3e0fab4 100644
--- a/utils/storage/Makefile.am
+++ b/utils/storage/Makefile.am
@@ -15,9 +15,11 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-INCLUDES                = -I$(top_srcdir)/src/include \
-			  -I$(top_srcdir)/src/storage \
-			  @GLIB2_CPPFLAGS@
+INCLUDES                = -I$(top_srcdir)/src \
+                          -I$(top_srcdir)/src/include \
+                          -I$(top_srcdir)/src/storage \
+                          -I$(top_srcdir)/src/lookup \
+                          @GLIB2_CPPFLAGS@
 
 noinst_HEADERS		= tag_utility.h
 
diff --git a/utils/storage/export_interpolation.cpp b/utils/storage/export_interpolation.cpp
index c5fa790..ee53230 100644
--- a/utils/storage/export_interpolation.cpp
+++ b/utils/storage/export_interpolation.cpp
@@ -22,10 +22,7 @@
 #include <stdio.h>
 #include <assert.h>
 #include <glib.h>
-#include "novel_types.h"
-#include "memory_chunk.h"
-#include "phrase_index.h"
-#include "ngram.h"
+#include "pinyin.h"
 
 /* export interpolation model as textual format */
 
diff --git a/utils/storage/gen_binary_files.cpp b/utils/storage/gen_binary_files.cpp
index 0873283..757b075 100644
--- a/utils/storage/gen_binary_files.cpp
+++ b/utils/storage/gen_binary_files.cpp
@@ -20,13 +20,7 @@
  */
 
 #include <stdio.h>
-#include "memory_chunk.h"
-#include "novel_types.h"
-#include "pinyin_base.h"
-#include "pinyin_phrase.h"
-#include "pinyin_large_table.h"
-#include "phrase_index.h"
-#include "phrase_large_table.h"
+#include "pinyin.h"
 
 int main(int argc, char * argv[]){
     /* generate pinyin index*/
diff --git a/utils/storage/gen_pinyin_table.cpp b/utils/storage/gen_pinyin_table.cpp
index 50b2ef2..a753a89 100644
--- a/utils/storage/gen_pinyin_table.cpp
+++ b/utils/storage/gen_pinyin_table.cpp
@@ -22,9 +22,7 @@
 #include <stdio.h>
 #include <locale.h>
 #include <glib.h>
-#include "novel_types.h"
-#include "pinyin_base.h"
-#include "pinyin_phrase.h"
+#include "pinyin.h"
 
 
 GTree * g_pinyin_tree;
diff --git a/utils/storage/import_interpolation.cpp b/utils/storage/import_interpolation.cpp
index c113cf0..9976f09 100644
--- a/utils/storage/import_interpolation.cpp
+++ b/utils/storage/import_interpolation.cpp
@@ -21,11 +21,7 @@
 
 #include <stdio.h>
 #include <glib.h>
-#include "novel_types.h"
-#include "memory_chunk.h"
-#include "phrase_index.h"
-#include "ngram.h"
-#include "phrase_large_table.h"
+#include "pinyin.h"
 #include "tag_utility.h"
 
 enum LINE_TYPE{
-- 
cgit