diff options
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/include/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/lookup/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/storage/Makefile.am | 2 | ||||
| -rw-r--r-- | utils/segment/Makefile.am | 21 | ||||
| -rw-r--r-- | utils/storage/Makefile.am | 2 | ||||
| -rw-r--r-- | utils/training/Makefile.am | 23 |
7 files changed, 26 insertions, 28 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 34da2d0..de08cef 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -23,7 +23,7 @@ CLEANFILES = *.bak ACLOCAL = aclocal -I $(ac_aux_dir) -INCLUDES = -I$(top_srcdir)/src \ +AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ -I$(top_srcdir)/src/lookup \ diff --git a/tests/include/Makefile.am b/tests/include/Makefile.am index 4a22aea..a140ff0 100644 --- a/tests/include/Makefile.am +++ b/tests/include/Makefile.am @@ -14,7 +14,7 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see <http://www.gnu.org/licenses/>. -INCLUDES = -I$(top_srcdir)/src \ +AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ -I$(top_srcdir)/src/lookup \ diff --git a/tests/lookup/Makefile.am b/tests/lookup/Makefile.am index e50304a..c96bfb2 100644 --- a/tests/lookup/Makefile.am +++ b/tests/lookup/Makefile.am @@ -14,7 +14,7 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see <http://www.gnu.org/licenses/>. -INCLUDES = -I$(top_srcdir)/src \ +AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ -I$(top_srcdir)/src/lookup \ diff --git a/tests/storage/Makefile.am b/tests/storage/Makefile.am index a4b3c09..d08d923 100644 --- a/tests/storage/Makefile.am +++ b/tests/storage/Makefile.am @@ -14,7 +14,7 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see <http://www.gnu.org/licenses/>. -INCLUDES = -I$(top_srcdir)/src \ +AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ -I$(top_srcdir)/src/lookup \ diff --git a/utils/segment/Makefile.am b/utils/segment/Makefile.am index 0d801b6..72e6743 100644 --- a/utils/segment/Makefile.am +++ b/utils/segment/Makefile.am @@ -16,18 +16,17 @@ 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 \ - @GLIB2_CFLAGS@ +AM_CPPFLAGS = -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/storage \ + -I$(top_srcdir)/src/lookup \ + -I$(top_srcdir)/utils \ + @GLIB2_CFLAGS@ -LDADD = \ - ../../src/libpinyin_internal.a \ - ../../src/storage/libstorage.a \ - ../../src/lookup/liblookup.a \ - @GLIB2_LIBS@ +LDADD = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a \ + ../../src/lookup/liblookup.a \ + @GLIB2_LIBS@ noinst_PROGRAMS = spseg ngseg mergeseq diff --git a/utils/storage/Makefile.am b/utils/storage/Makefile.am index 3046bcf..262e0de 100644 --- a/utils/storage/Makefile.am +++ b/utils/storage/Makefile.am @@ -14,7 +14,7 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see <http://www.gnu.org/licenses/>. -INCLUDES = -I$(top_srcdir)/src \ +AM_CPPFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/storage \ -I$(top_srcdir)/src/lookup \ diff --git a/utils/training/Makefile.am b/utils/training/Makefile.am index d27a792..d82cacf 100644 --- a/utils/training/Makefile.am +++ b/utils/training/Makefile.am @@ -16,18 +16,17 @@ 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 \ - @GLIB2_CFLAGS@ - -LDADD = \ - ../../src/libpinyin_internal.a \ - ../../src/storage/libstorage.a \ - ../../src/lookup/liblookup.a \ - @GLIB2_LIBS@ +AM_CPPFLAGS = -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/storage \ + -I$(top_srcdir)/src/lookup \ + -I$(top_srcdir)/utils \ + @GLIB2_CFLAGS@ + +LDADD = ../../src/libpinyin_internal.a \ + ../../src/storage/libstorage.a \ + ../../src/lookup/liblookup.a \ + @GLIB2_LIBS@ noinst_HEADERS = k_mixture_model.h |