summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2014-08-23 06:14:45 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2014-08-23 06:14:45 (GMT)
commit1cb788cfec3dca18a2a06f30fb1e38826a51e89d (patch) (side-by-side diff)
treeae430bfa847f38c9d2da565a07e21fda35626530
parentd07192a4d563a46134cb6b206ee76a41ec6f2944 (diff)
downloadsmap-1cb788cfec3dca18a2a06f30fb1e38826a51e89d.tar.gz
smap-1cb788cfec3dca18a2a06f30fb1e38826a51e89d.tar.bz2
Update build system: use AP_CPPFLAGS instead of INCLUDES and upgrade grecs
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--configure.ac2
m---------gint0
-rw-r--r--lib/Makefile.am2
-rw-r--r--modules/echo/Makefile.am2
-rw-r--r--modules/guile/Makefile.am5
-rw-r--r--modules/mailutils/Makefile.am2
-rw-r--r--modules/mysql/Makefile.am2
-rw-r--r--modules/postgres/Makefile.am2
-rw-r--r--modules/sed/Makefile.am2
-rw-r--r--src/Makefile.am5
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
@@ -25,7 +25,7 @@ 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])
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
@@ -40,4 +40,4 @@ libsmap_la_SOURCES = \
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
@@ -21,4 +21,4 @@ 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
@@ -21,7 +21,7 @@ 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 =
@@ -29,9 +29,10 @@ 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
@@ -21,4 +21,4 @@ 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
@@ -21,4 +21,4 @@ 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
@@ -21,4 +21,4 @@ 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
@@ -22,4 +22,4 @@ 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
@@ -42,8 +42,9 @@ SUFFIXES=.opt .c
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

Return to:

Send suggestions and report system problems to the System administrator.