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 /callouts | |
| parent | 1a3c2ed1cb6d96bb71b2f12711281c9153f4223b (diff) | |
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 'callouts')
| -rw-r--r-- | callouts/Makefile.am | 35 | ||||
| -rw-r--r-- | callouts/tests/Makefile.am | 10 |
2 files changed, 16 insertions, 29 deletions
diff --git a/callouts/Makefile.am b/callouts/Makefile.am index 79f6af54a9..e3579489a0 100644 --- a/callouts/Makefile.am +++ b/callouts/Makefile.am @@ -1,5 +1,16 @@ SUBDIRS = . tests +AM_CPPFLAGS = \ + -I${top_srcdir}/include \ + -I${top_builddir}/include \ + -I${top_srcdir}/libnm-util \ + -I${top_builddir}/libnm-util \ + $(GLIB_CFLAGS) \ + $(DBUS_CFLAGS) \ + -DNMCONFDIR=\"$(nmconfdir)\" \ + -DSYSCONFDIR=\"$(sysconfdir)\" \ + -DLIBEXECDIR=\"$(libexecdir)\" + ########################################### # Test libraries ########################################### @@ -21,12 +32,6 @@ libexec_PROGRAMS = \ nm_avahi_autoipd_action_SOURCES = \ nm-avahi-autoipd-action.c -nm_avahi_autoipd_action_CPPFLAGS = \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DLIBEXECDIR=\"$(libexecdir)\" - nm_avahi_autoipd_action_LDADD = \ $(DBUS_LIBS) \ $(GLIB_LIBS) @@ -38,17 +43,6 @@ nm_dispatcher_action_SOURCES = \ nm-dispatcher-utils.c \ nm-dispatcher-utils.h -nm_dispatcher_action_CPPFLAGS = \ - -I${top_srcdir} \ - -I${top_srcdir}/include \ - -I${top_builddir}/include \ - -I${top_srcdir}/libnm-util \ - -I${top_builddir}/libnm-util \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) \ - -DNMCONFDIR=\"$(nmconfdir)\" \ - -DLIBEXECDIR=\"$(libexecdir)\" - nm_dispatcher_action_LDADD = \ $(top_builddir)/libnm-util/libnm-util.la \ $(DBUS_LIBS) \ @@ -66,12 +60,7 @@ libtest_dispatcher_envp_la_SOURCES = \ nm-dispatcher-utils.h libtest_dispatcher_envp_la_CPPFLAGS = \ - -I${top_srcdir}/include \ - -I${top_builddir}/include \ - -I${top_srcdir}/libnm-util \ - -I${top_builddir}/libnm-util \ - $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) + $(AM_CPPFLAGS) libtest_dispatcher_envp_la_LIBADD = \ $(top_builddir)/libnm-util/libnm-util.la \ diff --git a/callouts/tests/Makefile.am b/callouts/tests/Makefile.am index e8a13fc6ea..3243d9efef 100644 --- a/callouts/tests/Makefile.am +++ b/callouts/tests/Makefile.am @@ -1,11 +1,13 @@ if ENABLE_TESTS -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/include \ -I${top_builddir}/include \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ - -I$(top_srcdir)/callouts + -I$(top_srcdir)/callouts \ + $(GLIB_CFLAGS) \ + $(DBUS_CFLAGS) noinst_PROGRAMS = \ test-dispatcher-envp @@ -15,10 +17,6 @@ noinst_PROGRAMS = \ test_dispatcher_envp_SOURCES = \ test-dispatcher-envp.c -test_dispatcher_envp_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) - test_dispatcher_envp_LDADD = \ $(top_builddir)/libnm-util/libnm-util.la \ $(top_builddir)/callouts/libtest-dispatcher-envp.la \ |