[sword-svn] r2854 - in trunk: examples/cmdline tests utilities

[scribe at crosswire.org]

Author: scribe
Date: 2013-07-05 18:43:36 -0700 (Fri, 05 Jul 2013)
New Revision: 2854

Modified:
   trunk/examples/cmdline/Makefile.am
   trunk/tests/Makefile.am
   trunk/utilities/Makefile.am
Log:
removed warnings for deprecated INCLUDES variable


Modified: trunk/examples/cmdline/Makefile.am
===================================================================
--- trunk/examples/cmdline/Makefile.am	2013-07-06 01:43:10 UTC (rev 2853)
+++ trunk/examples/cmdline/Makefile.am	2013-07-06 01:43:36 UTC (rev 2854)
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = 1.6
-INCLUDES = -I $(top_srcdir)/include
+AM_CPPFLAGS = -I $(top_srcdir)/include
 if USE_INTERNAL_REGEX
-INCLUDES += -I$(top_srcdir)/include/internal/regex
+AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex
 endif
 LDADD = $(top_builddir)/lib/libsword.la
 

Modified: trunk/tests/Makefile.am
===================================================================
--- trunk/tests/Makefile.am	2013-07-06 01:43:10 UTC (rev 2853)
+++ trunk/tests/Makefile.am	2013-07-06 01:43:36 UTC (rev 2854)
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = 1.6
-INCLUDES = -I $(top_srcdir)/include
+AM_CPPFLAGS = -I $(top_srcdir)/include
 if USE_INTERNAL_REGEX
-INCLUDES += -I$(top_srcdir)/include/internal/regex
+AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex
 endif
 LDADD = $(top_builddir)/lib/libsword.la
 

Modified: trunk/utilities/Makefile.am
===================================================================
--- trunk/utilities/Makefile.am	2013-07-06 01:43:10 UTC (rev 2853)
+++ trunk/utilities/Makefile.am	2013-07-06 01:43:36 UTC (rev 2854)
@@ -1,8 +1,8 @@
 AUTOMAKE_OPTIONS = 1.6
 SUBDIRS = diatheke
-INCLUDES = -I $(top_srcdir)/include
+AM_CPPFLAGS = -I $(top_srcdir)/include
 if USE_INTERNAL_REGEX
-INCLUDES += -I$(top_srcdir)/include/internal/regex
+AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex
 endif
 LDADD = $(top_builddir)/lib/libsword.la
 noinst_PROGRAMS = cipherraw lexdump \