build: consistently use CFLAGS

According to the automake manual, CPPFLAGS (aka INCLUDES, as spelled
in automake 1.9.6) should only include -I, -D, and -U directives; more
generic directives like -Wall belong in CFLAGS since they affect more
phases of the build process.  Therefore, we should be sticking CFLAGS
additions into a CFLAGS container, not a CPPFLAGS container.

* src/Makefile.am (libvirt_driver_vmware_la_CFLAGS): Use AM_CFLAGS.
(INCLUDES): Move CFLAGS items...
(AM_CFLAGS): ...to their proper location.
* python/Makefile.am (INCLUDES, AM_CFLAGS): Likewise.
* tests/Makefile.am (INCLUDES, AM_CFLAGS): Likewise.
(commandtest_CFLAGS, commandhelper_CFLAGS)
(virnetmessagetest_CFLAGS, virnetsockettest_CFLAGS): Use AM_CFLAGS.

diff --git a/python/Makefile.am b/python/Makefile.am
index 432ad7091046a4ecc8a702c83ab4cbc3bd24d89c..0edb3e4cb33b4df6c4cc595bf532703c7712fef0 100644 (file)
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -3,12 +3,13 @@
 SUBDIRS= . tests
 
 INCLUDES = \
-        $(WARN_CFLAGS) \
-        $(PYTHON_INCLUDES) \
+       $(PYTHON_INCLUDES) \
        -I$(top_srcdir)/include \
        -I$(top_builddir)/include \
        -I$(top_builddir)/$(subdir)
 
+AM_CFLAGS = $(WARN_CFLAGS)
+
 DOCS_DIR = $(datadir)/doc/libvirt-python-$(LIBVIRT_VERSION)
 
 DOCS = ${srcdir}/TODO

diff --git a/src/Makefile.am b/src/Makefile.am
index 4ba3ea724e6293d336fa381542db1aa76564417e..cd8a7e98787d42ae21ed8f7943865ca105c66f86 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,20 +3,19 @@
 # No libraries with the exception of LIBXML should be listed
 # here. List them against the individual XXX_la_CFLAGS targets
 # that actually use them
-INCLUDES =                                                     \
-               -I$(top_srcdir)/gnulib/lib                      \
+INCLUDES =     -I$(top_srcdir)/gnulib/lib                      \
                -I../gnulib/lib                                 \
                -I../include                                    \
                -I@top_srcdir@/src/util                         \
                -I@top_srcdir@/include                          \
-               $(DRIVER_MODULE_CFLAGS)                         \
+               -DIN_LIBVIRT
+
+AM_CFLAGS =    $(DRIVER_MODULE_CFLAGS)                         \
                $(LIBXML_CFLAGS)                                \
                $(WARN_CFLAGS)                                  \
-               $(LOCK_CHECKING_CFLAGS)                 \
-               -DIN_LIBVIRT                            \
-               $(WIN32_EXTRA_CFLAGS)
-
-AM_CFLAGS = $(COVERAGE_CFLAGS)
+               $(LOCK_CHECKING_CFLAGS)                         \
+               $(WIN32_EXTRA_CFLAGS)                           \
+               $(COVERAGE_CFLAGS)
 AM_LDFLAGS = $(COVERAGE_LDFLAGS)
 
 EXTRA_DIST = $(conf_DATA)
@@ -640,7 +639,7 @@ noinst_LTLIBRARIES += libvirt_driver_vmware.la
 libvirt_la_BUILT_LIBADD += libvirt_driver_vmware.la
 endif
 libvirt_driver_vmware_la_CFLAGS = \
-               -I@top_srcdir@/src/conf -I@top_srcdir@/src/vmx
+               -I@top_srcdir@/src/conf -I@top_srcdir@/src/vmx $(AM_CFLAGS)
 if WITH_DRIVER_MODULES
 libvirt_driver_vmware_la_LIBADD = ../gnulib/lib/libgnu.la
 libvirt_driver_vmware_la_LDFLAGS = -module -avoid-version

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5d1efb3a52173dfed8990ce94eb580364d0f129c..4bea18e36cec17673ad5d787454a46ac719056a1 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,15 +8,17 @@ INCLUDES = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/util \
-       -I$(top_srcdir)/src/conf \
+       -I$(top_srcdir)/src/conf
+
+AM_CFLAGS = \
        $(LIBXML_CFLAGS) \
        $(GNUTLS_CFLAGS) \
        $(SASL_CFLAGS) \
        $(SELINUX_CFLAGS) \
        $(APPARMOR_CFLAGS) \
        $(YAJL_CFLAGS) \
-         $(COVERAGE_CFLAGS) \
-         $(WARN_CFLAGS)
+       $(COVERAGE_CFLAGS) \
+       $(WARN_CFLAGS)
 
 if WITH_DRIVER_MODULES
 INCLUDES += \
@@ -419,22 +421,22 @@ nodeinfotest_LDADD = $(LDADDS)
 
 commandtest_SOURCES = \
        commandtest.c testutils.h testutils.c
-commandtest_CFLAGS = -Dabs_builddir="\"`pwd`\""
+commandtest_CFLAGS = -Dabs_builddir="\"`pwd`\"" $(AM_CFLAGS)
 commandtest_LDADD = $(LDADDS)
 
 commandhelper_SOURCES = \
        commandhelper.c
-commandhelper_CFLAGS = -Dabs_builddir="\"`pwd`\""
+commandhelper_CFLAGS = -Dabs_builddir="\"`pwd`\"" $(AM_CFLAGS)
 commandhelper_LDADD = $(LDADDS)
 
 virnetmessagetest_SOURCES = \
        virnetmessagetest.c testutils.h testutils.c
-virnetmessagetest_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\""
+virnetmessagetest_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\"" $(AM_CFLAGS)
 virnetmessagetest_LDADD = ../src/libvirt-net-rpc.la $(LDADDS)
 
 virnetsockettest_SOURCES = \
        virnetsockettest.c testutils.h testutils.c
-virnetsockettest_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\""
+virnetsockettest_CFLAGS = -Dabs_builddir="\"$(abs_builddir)\"" $(AM_CFLAGS)
 virnetsockettest_LDADD = ../src/libvirt-net-rpc.la $(LDADDS)