diff options
| author | Sjoerd Simons <sjoerd@luon.net> | 2014-04-26 20:55:09 +0200 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd@luon.net> | 2014-04-26 20:55:09 +0200 |
| commit | 59c3714a494c3b3765657c0551ad82842d98a7d2 (patch) | |
| tree | e4dcdf9791fc40581f02bfaf870c30b102b3133a /src/settings/Makefile.am | |
| parent | a4256940da049f91bbbea5e53e469a59ea9c10f7 (diff) | |
Imported Upstream version 0.9.8.10 upstream/0.9.8.10
Diffstat (limited to 'src/settings/Makefile.am')
| -rw-r--r-- | src/settings/Makefile.am | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/settings/Makefile.am b/src/settings/Makefile.am index 6ca7633f..ea81a7c4 100644 --- a/src/settings/Makefile.am +++ b/src/settings/Makefile.am @@ -1,6 +1,7 @@ SUBDIRS = plugins . tests -INCLUDES = -I${top_srcdir} \ +AM_CPPFLAGS = \ + -I${top_srcdir} \ -I${top_builddir}/include \ -I${top_srcdir}/include \ -I${top_builddir}/libnm-util \ @@ -8,7 +9,9 @@ INCLUDES = -I${top_srcdir} \ -I${top_builddir}/src/generated \ -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging \ - -I${top_srcdir}/src + -I${top_srcdir}/src \ + $(DBUS_CFLAGS) \ + $(GLIB_CFLAGS) noinst_LTLIBRARIES = libsettings.la libtest-settings-utils.la @@ -16,10 +19,6 @@ libtest_settings_utils_la_SOURCES = \ nm-settings-utils.c \ nm-settings-utils.h -libtest_settings_utils_la_CPPFLAGS = \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) - libtest_settings_utils_la_LIBADD = \ $(top_builddir)/libnm-util/libnm-util.la \ $(DBUS_LIBS) \ @@ -51,8 +50,7 @@ libsettings_la_SOURCES = \ nm-settings-utils.c libsettings_la_CPPFLAGS = \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) \ + $(AM_CPPFLAGS) \ $(POLKIT_CFLAGS) \ -DBINDIR=\"$(bindir)\" \ -DSBINDIR=\"$(sbindir)\" \ |