diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2012-12-30 15:02:04 +0200 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2012-12-30 15:02:04 +0200 |
| commit | 529467a76bf0116dcd045472b18b762830a87cb0 (patch) | |
| tree | 0d2678764f507208ba1544f9b19b2a0de8130819 /src | |
| parent | 0273a63f52377b3fb613ed9692c697cbe83cd54d (diff) | |
| download | mailfromd-529467a76bf0116dcd045472b18b762830a87cb0.tar.gz mailfromd-529467a76bf0116dcd045472b18b762830a87cb0.tar.bz2 | |
Use AM_CPPFLAGS instead of INCLUDES in Makefiles.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 19 | ||||
| -rw-r--r-- | src/builtin/Makefile.am | 2 |
2 files changed, 10 insertions, 11 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index b4aaff33..e8ea8427 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -104,15 +104,7 @@ BUILT_SOURCES=\ incdir=$(pkgdatadir)/$(VERSION)/include -AM_CPPFLAGS=-DSYSCONFDIR=\"$(sysconfdir)\"\ - -DDEFAULT_STATE_DIR=\"$(DEFAULT_STATE_DIR)\"\ - -DDEFAULT_SOCKET=\"$(DEFAULT_SOCKET)\"\ - -DDEFAULT_VERSION_INCLUDE_DIR=\"$(incdir)\"\ - -DDEFAULT_INCLUDE_DIR=\"$(pkgdatadir)/include\"\ - -DDEFAULT_PREPROCESSOR="\"$(DEFAULT_PREPROCESSOR)\""\ - -DLOCALEDIR=\"$(localedir)\" - -INCLUDES = \ +AM_CPPFLAGS=\ -I$(top_srcdir)\ $(MAILUTILS_INCLUDES)\ $(MU_COMMON_INCLUDES)\ @@ -121,7 +113,14 @@ INCLUDES = \ -I../gnu\ -I$(top_srcdir)/src/builtin\ $(MILTER_INCLUDES)\ - $(DSPAM_CFLAGS) + $(DSPAM_CFLAGS)\ + -DSYSCONFDIR=\"$(sysconfdir)\"\ + -DDEFAULT_STATE_DIR=\"$(DEFAULT_STATE_DIR)\"\ + -DDEFAULT_SOCKET=\"$(DEFAULT_SOCKET)\"\ + -DDEFAULT_VERSION_INCLUDE_DIR=\"$(incdir)\"\ + -DDEFAULT_INCLUDE_DIR=\"$(pkgdatadir)/include\"\ + -DDEFAULT_PREPROCESSOR="\"$(DEFAULT_PREPROCESSOR)\""\ + -DLOCALEDIR=\"$(localedir)\" node-type.h: drivers.c $(AM_V_GEN) $(AWK) -v MODE=types -f $(top_srcdir)/src/drv.awk drivers.c > node-type.h diff --git a/src/builtin/Makefile.am b/src/builtin/Makefile.am index c82079c1..3bcfe7b9 100644 --- a/src/builtin/Makefile.am +++ b/src/builtin/Makefile.am @@ -70,7 +70,7 @@ BUILT_SOURCES=\ $(BI_FILES:.bi=.c)\ builtin.h -INCLUDES = \ +AM_CPPFLAGS = \ $(MAILUTILS_INCLUDES)\ $(MU_COMMON_INCLUDES)\ -I$(top_srcdir)/lib\ |