diff options
| author | Dan Winship <danw@gnome.org> | 2013-08-22 10:47:21 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2013-08-22 11:49:16 -0400 |
| commit | bfce3f7dc8859eef5ba46f3eec463bd591ee8686 (patch) | |
| tree | 8f16f9b781ce447a2f2f22728154b3ed5979dfee /examples | |
| parent | 1a3c2ed1cb6d96bb71b2f12711281c9153f4223b (diff) | |
| download | NetworkManager-bfce3f7dc8859eef5ba46f3eec463bd591ee8686.tar.gz | |
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.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/C/glib/Makefile.am | 11 | ||||
| -rw-r--r-- | examples/C/qt/Makefile.am | 5 |
2 files changed, 7 insertions, 9 deletions
diff --git a/examples/C/glib/Makefile.am b/examples/C/glib/Makefile.am index 1511f60765..1f4785dad8 100644 --- a/examples/C/glib/Makefile.am +++ b/examples/C/glib/Makefile.am @@ -1,10 +1,9 @@ -INCLUDES = -I${top_srcdir}/libnm-util \ - -I${top_builddir}/libnm-util \ - -I${top_srcdir}/libnm-glib \ - -I${top_srcdir}/include \ - -I${top_builddir}/include - AM_CPPFLAGS = \ + -I${top_srcdir}/libnm-util \ + -I${top_builddir}/libnm-util \ + -I${top_srcdir}/libnm-glib \ + -I${top_srcdir}/include \ + -I${top_builddir}/include \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) diff --git a/examples/C/qt/Makefile.am b/examples/C/qt/Makefile.am index a0cf8f4dbb..15b6bf4521 100644 --- a/examples/C/qt/Makefile.am +++ b/examples/C/qt/Makefile.am @@ -1,7 +1,6 @@ -INCLUDES = -I${top_srcdir}/include \ - -I${top_builddir}/include - AM_CPPFLAGS = \ + -I${top_srcdir}/include \ + -I${top_builddir}/include \ $(DBUS_CFLAGS) \ $(QT_CFLAGS) |