From 59c3714a494c3b3765657c0551ad82842d98a7d2 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Sat, 26 Apr 2014 20:55:09 +0200 Subject: Imported Upstream version 0.9.8.10 --- src/Makefile.am | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 3ca5a7da..3ea6241c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,7 +21,8 @@ endif SUBDIRS += . tests -INCLUDES = -I${top_srcdir} \ +AM_CPPFLAGS = \ + -I${top_srcdir} \ -I${top_builddir}/include \ -I${top_srcdir}/include \ -I${top_builddir}/src/generated \ @@ -65,7 +66,8 @@ libtest_dhcp_la_SOURCES = \ libtest_dhcp_la_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ - $(LIBNL_CFLAGS) + $(LIBNL_CFLAGS) \ + $(AM_CPPFLAGS) libtest_dhcp_la_LIBADD = \ $(top_builddir)/src/generated/libnm-generated.la \ @@ -84,7 +86,8 @@ libtest_policy_hosts_la_SOURCES = \ libtest_policy_hosts_la_CPPFLAGS = \ -DSYSCONFDIR=\"$(sysconfdir)\" \ - $(GLIB_CFLAGS) + $(GLIB_CFLAGS) \ + $(AM_CPPFLAGS) libtest_policy_hosts_la_LIBADD = \ ${top_builddir}/src/logging/libnm-logging.la \ @@ -100,7 +103,8 @@ libtest_wifi_ap_utils_la_SOURCES = \ nm-wifi-ap-utils.h libtest_wifi_ap_utils_la_CPPFLAGS = \ - $(GLIB_CFLAGS) + $(GLIB_CFLAGS) \ + $(AM_CPPFLAGS) libtest_wifi_ap_utils_la_LIBADD = \ ${top_builddir}/libnm-util/libnm-util.la \ @@ -301,6 +305,7 @@ NetworkManager_CPPFLAGS = \ $(POLKIT_CFLAGS) \ $(SYSTEMD_LOGIN_CFLAGS) \ $(LIBSOUP_CFLAGS) \ + $(AM_CPPFLAGS) \ -DBINDIR=\"$(bindir)\" \ -DSBINDIR=\"$(sbindir)\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ @@ -361,5 +366,8 @@ install-data-hook: $(mkinstalldirs) -m 0700 $(DESTDIR)$(statedir) $(mkinstalldirs) -m 0755 $(DESTDIR)$(pkglibdir) -CLEANFILES = $(BUILT_SOURCES) +CLEANFILES = \ + $(BUILT_SOURCES) \ + nm-enum-types.c \ + nm-enum-types.h -- cgit 1.3.0-6-gf8a5