diff options
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | utils/Makefile.am | 2 | ||||
| -rw-r--r-- | utils/segment/Makefile.am | 3 | ||||
| -rw-r--r-- | utils/training/Makefile.am | 7 |
5 files changed, 13 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 0d9390a..efa32c4 100644 --- a/configure.ac +++ b/configure.ac @@ -70,13 +70,15 @@ AC_CONFIG_FILES([Makefile src/Makefile src/include/Makefile src/storage/Makefile - src/segment/Makefile - src/training/Makefile src/lookup/Makefile tests/Makefile tests/include/Makefile tests/storage/Makefile tests/lookup/Makefile utils/Makefile - utils/storage/Makefile]) + utils/storage/Makefile + utils/segment/Makefile + utils/training/Makefile +]) + AC_OUTPUT diff --git a/src/Makefile.am b/src/Makefile.am index ad037fb..e6b17ca 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,7 +16,7 @@ ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. AUTOMAKE_OPTIONS = gnu -SUBDIRS = include storage segment training lookup +SUBDIRS = include storage lookup MAINTAINERCLEANFILES = Makefile.in diff --git a/utils/Makefile.am b/utils/Makefile.am index 1f0d85d..c315d10 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -16,7 +16,7 @@ ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. AUTOMAKE_OPTIONS = gnu -SUBDIRS = storage +SUBDIRS = storage segment training MAINTAINERCLEANFILES = Makefile.in diff --git a/utils/segment/Makefile.am b/utils/segment/Makefile.am index a82627a..789de23 100644 --- a/utils/segment/Makefile.am +++ b/utils/segment/Makefile.am @@ -19,10 +19,11 @@ MAINTAINERCLEANFILES = Makefile.in INCLUDES = -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ + -I$(top_srcdir)/src/lookup \ @GLIB2_CPPFLAGS@ noinst_PROGRAMS = spseg spseg_SOURCES = spseg.cpp -spseg_LDADD = @GLIB2_LDFLAGS@ ../storage/libstorage.la +spseg_LDADD = @GLIB2_LDFLAGS@ ../../src/libpinyin.la diff --git a/utils/training/Makefile.am b/utils/training/Makefile.am index 520e4e1..b284747 100644 --- a/utils/training/Makefile.am +++ b/utils/training/Makefile.am @@ -19,18 +19,19 @@ MAINTAINERCLEANFILES = Makefile.in INCLUDES = -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ + -I$(top_srcdir)/src/lookup \ @GLIB2_CPPFLAGS@ noinst_PROGRAMS = gen_ngram gen_unigram estimate_interpolation gen_ngram_SOURCES = gen_ngram.cpp -gen_ngram_LDADD = ../storage/libstorage.la @GLIB2_LDFLAGS@ +gen_ngram_LDADD = @GLIB2_LDFLAGS@ ../../src/libpinyin.la gen_unigram_SOURCES = gen_unigram.cpp -gen_unigram_LDADD = ../storage/libstorage.la @GLIB2_LDFLAGS@ +gen_unigram_LDADD = @GLIB2_LDFLAGS@ ../../src/libpinyin.la estimate_interpolation_SOURCES = estimate_interpolation.cpp -estimate_interpolation_LDADD = ../storage/libstorage.la @GLIB2_LDFLAGS@ +estimate_interpolation_LDADD = @GLIB2_LDFLAGS@ ../../src/libpinyin.la |