build: switch from $(INCLUDES) to $(AM_CPPFLAGS) to make automake happy
authorDan Winship <danw@gnome.org>
Thu, 22 Aug 2013 14:47:21 +0000 (10:47 -0400)
committerDan Winship <danw@gnome.org>
Thu, 22 Aug 2013 15:49:16 +0000 (11:49 -0400)
commitbfce3f7dc8859eef5ba46f3eec463bd591ee8686
tree8f16f9b781ce447a2f2f22728154b3ed5979dfee
parent1a3c2ed1cb6d96bb71b2f12711281c9153f4223b
build: switch from $(INCLUDES) to $(AM_CPPFLAGS) to make automake happy

Unfortunately, $(AM_CPPFLAGS) gets overridden by per-target _CPPFLAGS
variables, which $(INCLUDES) did not, so this requires some additional
changes.

In most places, I have just gotten rid of the per-target _CPPFLAGS
variables; in directories with a single target, the per-target
variable is unnecessary, and in directories with multiple targets, the
per-target variable is often undesirable, since it forces some files
to be compiled twice, even though there ends up being no difference
between the two files.
30 files changed:
callouts/Makefile.am
callouts/tests/Makefile.am
cli/src/Makefile.am
examples/C/glib/Makefile.am
examples/C/qt/Makefile.am
libnm-glib/Makefile.am
libnm-glib/tests/Makefile.am
libnm-util/Makefile.am
libnm-util/tests/Makefile.am
src/Makefile.am
src/config/tests/Makefile.am
src/devices/wimax/Makefile.am
src/dhcp-manager/tests/Makefile.am
src/platform/tests/Makefile.am
src/ppp-manager/Makefile.am
src/settings/plugins/example/Makefile.am
src/settings/plugins/ifcfg-rh/Makefile.am
src/settings/plugins/ifcfg-rh/tests/Makefile.am
src/settings/plugins/ifcfg-suse/Makefile.am
src/settings/plugins/ifnet/Makefile.am
src/settings/plugins/ifnet/tests/Makefile.am
src/settings/plugins/ifupdown/Makefile.am
src/settings/plugins/ifupdown/tests/Makefile.am
src/settings/plugins/keyfile/Makefile.am
src/settings/plugins/keyfile/tests/Makefile.am
src/settings/tests/Makefile.am
src/supplicant-manager/tests/Makefile.am
src/tests/Makefile.am
test/Makefile.am
tools/Makefile.am