diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | extensions/GNUmakefile.in | 9 | ||||
| -rw-r--r-- | libipq/Makefile.am | 1 | ||||
| -rw-r--r-- | utils/Makefile.am | 1 |
5 files changed, 14 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index ae7923f0..414905c2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,6 +4,7 @@ ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = foreign subdir-objects AM_CFLAGS = ${regular_CFLAGS} -I${top_builddir}/include -I${top_srcdir}/include ${kinclude_CFLAGS} +AM_CPPFLAGS = ${regular_CPPFLAGS} SUBDIRS = extensions if ENABLE_DEVEL SUBDIRS += include diff --git a/configure.ac b/configure.ac index 27cca9f8..77502fb6 100644 --- a/configure.ac +++ b/configure.ac @@ -41,7 +41,7 @@ AC_ARG_ENABLE([largefile], AS_HELP_STRING([--disable-largefile], [Do not build largefile support]), [enable_largefile="$enableval"], [enable_largefile="yes"; - largefile_cflags='-D_LARGEFILE_SOURCE=1 -D_LARGE_FILES -D_FILE_OFFSET_BITS=64']) + largefile_cppflags='-D_LARGEFILE_SOURCE=1 -D_LARGE_FILES -D_FILE_OFFSET_BITS=64']) AC_ARG_ENABLE([devel], AS_HELP_STRING([--enable-devel], [Install Xtables development headers]), @@ -83,10 +83,10 @@ PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0], [nfnetlink=1], [nfnetlink=0]) AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1]) -regular_CFLAGS="${largefile_cflags} \ - -D_REENTRANT -Wall -Waggregate-return -Wmissing-declarations \ +regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \ -Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \ - -Winline -pipe \ + -Winline -pipe"; +regular_CPPFLAGS="${largefile_cppflags} -D_REENTRANT \ -DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\" -DXTABLES_INTERNAL"; kinclude_CFLAGS=""; if [[ -n "$kbuilddir" ]]; then @@ -98,6 +98,7 @@ fi; pkgdatadir='${datadir}/xtables'; AC_SUBST([regular_CFLAGS]) +AC_SUBST([regular_CPPFLAGS]) AC_SUBST([kinclude_CFLAGS]) AC_SUBST([kbuilddir]) AC_SUBST([ksourcedir]) diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in index a511a39a..9e39977f 100644 --- a/extensions/GNUmakefile.in +++ b/extensions/GNUmakefile.in @@ -14,11 +14,14 @@ xtlibdir := @xtlibdir@ CC := @CC@ CCLD := ${CC} CFLAGS := @CFLAGS@ +CPPFLAGS := @CPPFLAGS@ LDFLAGS := @LDFLAGS@ regular_CFLAGS := @regular_CFLAGS@ +regular_CPPFLAGS := @regular_CPPFLAGS@ kinclude_CFLAGS := @kinclude_CFLAGS@ AM_CFLAGS := ${regular_CFLAGS} -I${top_builddir}/include -I${top_srcdir}/include ${kinclude_CFLAGS} +AM_CPPFLAGS = ${regular_CPPFLAGS} AM_DEPFLAGS = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@ ifeq (${V},) @@ -78,7 +81,7 @@ distclean: clean rm -f .*.d .*.dd; init%.o: init%.c - ${AM_VERBOSE_CC} ${CC} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=$*_init ${CFLAGS} -o $@ -c $<; + ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=$*_init ${CFLAGS} -o $@ -c $<; -include .*.d @@ -90,7 +93,7 @@ lib%.so: lib%.oo ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $<; lib%.oo: ${srcdir}/lib%.c - ${AM_VERBOSE_CC} ${CC} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<; + ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<; # @@ -101,7 +104,7 @@ lib%.oo: ${srcdir}/lib%.c # handling code in the Makefiles. # lib%.o: ${srcdir}/lib%.c - ${AM_VERBOSE_CC} ${CC} ${AM_DEPFLAGS} ${AM_CFLAGS} -DNO_SHARED_LIBS=1 -D_INIT=lib$*_init ${CFLAGS} -o $@ -c $<; + ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -DNO_SHARED_LIBS=1 -D_INIT=lib$*_init ${CFLAGS} -o $@ -c $<; libext.a: initext.o ${libext_objs} ${AM_VERBOSE_AR} ${AR} crs $@ $^; diff --git a/libipq/Makefile.am b/libipq/Makefile.am index 556a17bd..8ebeb14c 100644 --- a/libipq/Makefile.am +++ b/libipq/Makefile.am @@ -1,6 +1,7 @@ # -*- Makefile -*- AM_CFLAGS = ${regular_CFLAGS} -I${top_builddir}/include -I${top_srcdir}/include +AM_CPPFLAGS = ${regular_CPPFLAGS} libipq_la_SOURCES = libipq.c lib_LTLIBRARIES = libipq.la diff --git a/utils/Makefile.am b/utils/Makefile.am index 79ce34bf..87bb1cbc 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -1,6 +1,7 @@ # -*- Makefile -*- AM_CFLAGS = ${regular_CFLAGS} -I${top_builddir}/include -I${top_srcdir}/include +AM_CPPFLAGS = ${regular_CPPFLAGS} sbin_PROGRAMS = nfnl_osf pkgdata_DATA = pf.os |