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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/Makefile.am | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index a6c14ef807..812100c529 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,10 +1,12 @@ GENERATE_SETTINGS_SPEC_SOURCE = generate-settings-spec.c -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ - -I$(top_builddir)/libnm-util + -I$(top_builddir)/libnm-util \ + $(GLIB_CFLAGS) \ + $(DBUS_CFLAGS) noinst_PROGRAMS = \ generate-settings-spec @@ -12,10 +14,6 @@ noinst_PROGRAMS = \ generate_settings_spec_SOURCES = \ $(GENERATE_SETTINGS_SPEC_SOURCE) -generate_settings_spec_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) - generate_settings_spec_LDADD = \ $(top_builddir)/libnm-util/libnm-util.la \ $(GLIB_LIBS) \ |