summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2011-05-31 16:15:28 -0600
committerEric Blake <eblake@redhat.com>2011-07-01 10:44:17 -0600
commit5d64c2d212eea666416d254e3540c4b181c0290e (patch)
tree9f049e2080fa061235cfa840f0366b11c4aebe08 /Makefile.am
parent55e3c6b17c34d0c00e544d1368180f07109b7189 (diff)
downloadlibvirt-python-split-5d64c2d212eea666416d254e3540c4b181c0290e.zip
libvirt-python-split-5d64c2d212eea666416d254e3540c4b181c0290e.tar.gz
libvirt-python-split-5d64c2d212eea666416d254e3540c4b181c0290e.tar.xz
build: consistently use CFLAGSv0.9.3
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.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 432ad70..0edb3e4 100644
--- a/Makefile.am
+++ b/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