From 1104c3ed216f3f46cfe62afbe70bb95f90787f69 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Thu, 2 Feb 2012 13:20:09 -0700 Subject: build: clean up CPPFLAGS/INCLUDES usage Our syntax checker missed all-lower-case variables (this will be fixed by the next .gnulib update). Additionally, anywhere that we mix in-tree files with generated files, automake recommends listing builddir prior to srcdir for VPATH builds. * src/Makefile.am (*_la_CFLAGS): Favor $(top_srcdir). (INCLUDES): Likewise, and follow automake recommendations on builddir before srcdir. * python/Makefile.am (INCLUDES): Swap directory order. * tests/Makefile.am (INCLUDES): Likewise. * tools/Makefile.am (INCLUDES): Likewise. * daemon/Makefile.am (INCLUDES): Likewise. (libvirtd.init, libvirtd.service): Favor $(). * examples/hellolibvirt/Makefile.am (hellolibvirt_LDADD): Likewise. * examples/openauth/Makefile.am (openauth_LDADD): Likewise. * examples/dominfo/Makefile.am (INCLUDES): Drop dead include. * examples/domsuspend/Makefile.am (INCLUDES): Likewise. --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 3068eee..81b160a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,14 +1,14 @@ # Makefile for libvirt python library -## Copyright (C) 2005-2011 Red Hat, Inc. +## Copyright (C) 2005-2012 Red Hat, Inc. ## See COPYING.LIB for the License of this software SUBDIRS= . tests INCLUDES = \ $(PYTHON_INCLUDES) \ - -I$(top_srcdir)/include \ -I$(top_builddir)/include \ + -I$(top_srcdir)/include \ -I$(top_builddir)/$(subdir) \ $(GETTEXT_CPPFLAGS) -- cgit