Update build system: use AP_CPPFLAGS instead of INCLUDES and upgrade grecs

10 files changed, 13 insertions, 11 deletions

diff --git a/configure.ac b/configure.ac
index d5eb94c..aca7ee6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,13 +22,13 @@ AC_INIT([smap],
 	SMAP_VERSION_MAJOR.SMAP_VERSION_MINOR[]m4_ifdef([SMAP_VERSION_PATCH],.SMAP_VERSION_PATCH),
 	[gray+smap@gnu.org.ua])
 AC_CONFIG_SRCDIR([src/smapd.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.11 gnits tar-ustar std-options silent-rules])
+AM_INIT_AUTOMAKE([1.11 gnits tar-ustar std-options silent-rules subdir-objects])
 
 # Enable silent rules by default:
 AM_SILENT_RULES([yes])
 
 dnl Global subst variables
 AC_SUBST(SMAP_MODDIR,'$(libdir)/$(PACKAGE)')
diff --git a/gint b/gint
-Subproject a5774356a1c12d1bcb55b6322710e347e1604fc
+Subproject fd86bf7d44b0c970771830692ae7491447ebe8b
diff --git a/lib/Makefile.am b/lib/Makefile.am
index e19d257..e5fc376 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -37,7 +37,7 @@ libsmap_la_SOURCES = \
  vasnprintf.c\
  wordsplit.c\
  xscript.c
 
 libsmap_la_LDFLAGS = -version-info 0:0:0
 
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
diff --git a/modules/echo/Makefile.am b/modules/echo/Makefile.am
index d0b1495..335dcb3 100644
--- a/modules/echo/Makefile.am
+++ b/modules/echo/Makefile.am
@@ -18,7 +18,7 @@ moddir=@SMAP_MODDIR@
 
 mod_LTLIBRARIES=echo.la
 
 echo_la_SOURCES = echo.c
 echo_la_LIBADD = ../../lib/libsmap.la
 AM_LDFLAGS = -module -avoid-version -no-undefined
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
diff --git a/modules/guile/Makefile.am b/modules/guile/Makefile.am
index 3f44f68..cca8d51 100644
--- a/modules/guile/Makefile.am
+++ b/modules/guile/Makefile.am
@@ -18,20 +18,21 @@ moddir=@SMAP_MODDIR@
 
 mod_LTLIBRARIES=guile.la
 
 guile_la_SOURCES = guile.c
 guile_la_LIBADD = ../../lib/libsmap.la @GUILE_LIBS@
 AM_LDFLAGS = -module -avoid-version -no-undefined
-INCLUDES = -I$(top_srcdir)/include @GUILE_INCLUDES@
+AM_CPPFLAGS = -I$(top_srcdir)/include @GUILE_INCLUDES@
 
 SUFFIXES =
 BUILT_SOURCES =
 EXTRA_DIST = guile.x getpw.scm
 DOT_X_FILES = guile.x
 CLEANFILES=
 DISTCLEANFILES=
+MAINTAINERCLEANFILES=
 sitedir = @GUILE_SITE@/$(PACKAGE)
 site_DATA=getpw.scm
 
-AM_CPPFLAGS = -DADDLOADPATH=\"$(sitedir)\"
+AM_CPPFLAGS += -DADDLOADPATH=\"$(sitedir)\"
 
 include ../../gint/gint.mk
diff --git a/modules/mailutils/Makefile.am b/modules/mailutils/Makefile.am
index f5369bc..058ee03 100644
--- a/modules/mailutils/Makefile.am
+++ b/modules/mailutils/Makefile.am
@@ -18,7 +18,7 @@ moddir=@SMAP_MODDIR@
 
 mod_LTLIBRARIES=mailutils.la
 
 mailutils_la_SOURCES = mailutils.c
 mailutils_la_LIBADD = ../../lib/libsmap.la @MAILUTILS_LIBS@
 AM_LDFLAGS = -module -avoid-version -no-undefined
-INCLUDES = -I$(top_srcdir)/include @MAILUTILS_INCLUDES@
+AM_CPPFLAGS = -I$(top_srcdir)/include @MAILUTILS_INCLUDES@
diff --git a/modules/mysql/Makefile.am b/modules/mysql/Makefile.am
index 42728d0..e3962e7 100644
--- a/modules/mysql/Makefile.am
+++ b/modules/mysql/Makefile.am
@@ -18,7 +18,7 @@ moddir=@SMAP_MODDIR@
 
 mod_LTLIBRARIES=mysql.la
 
 mysql_la_SOURCES = mysql.c
 mysql_la_LIBADD = ../../lib/libsmap.la @MYSQL_LIBS@
 AM_LDFLAGS = -module -avoid-version -no-undefined
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
diff --git a/modules/postgres/Makefile.am b/modules/postgres/Makefile.am
index 981f838..13e05eb 100644
--- a/modules/postgres/Makefile.am
+++ b/modules/postgres/Makefile.am
@@ -18,7 +18,7 @@ moddir=@SMAP_MODDIR@
 
 mod_LTLIBRARIES=postgres.la
 
 postgres_la_SOURCES = postgres.c
 postgres_la_LIBADD = ../../lib/libsmap.la @POSTGRES_LIBS@
 AM_LDFLAGS = -module -avoid-version -no-undefined
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
diff --git a/modules/sed/Makefile.am b/modules/sed/Makefile.am
index bd0b6e5..4531008 100644
--- a/modules/sed/Makefile.am
+++ b/modules/sed/Makefile.am
@@ -19,7 +19,7 @@ moddir=@SMAP_MODDIR@
 mod_LTLIBRARIES=sed.la
 
 sed_la_SOURCES = sed.c transform.c
 sed_la_LIBADD = ../../lib/libsmap.la
 noinst_HEADERS = transform.h
 AM_LDFLAGS = -module -avoid-version -no-undefined
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
diff --git a/src/Makefile.am b/src/Makefile.am
index 9b81c6d..47a1382 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,14 +39,15 @@ SUFFIXES=.opt .c
 
 .opt.c:
 	m4 -s $(top_srcdir)/src/getopt.m4 $< | sed '1d' > $@
 
 BUILT_SOURCES=cmdline.c smapccmd.c smapd.conf
 EXTRA_DIST=cmdline.opt cmdline.c smapccmd.opt smapccmd.c smapd.cfin getopt.m4
-INCLUDES = -I$(top_srcdir)/include @LTDLINCL@
-AM_CPPFLAGS=-DSYSCONFDIR=\"$(sysconfdir)\"\
+AM_CPPFLAGS =\
+ -I$(top_srcdir)/include @LTDLINCL@\
+ -DSYSCONFDIR=\"$(sysconfdir)\"\
  -DSMAP_MODDIR=\"$(SMAP_MODDIR)\"
 CLEANFILES = smapd.conf
 
 cmdline.c: cmdline.opt getopt.m4
 smapccmd.c: smapccmd.opt getopt.m4