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/generated/Makefile.am | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'src/generated/Makefile.am') diff --git a/src/generated/Makefile.am b/src/generated/Makefile.am index 307766e1..b313e454 100644 --- a/src/generated/Makefile.am +++ b/src/generated/Makefile.am @@ -50,7 +50,7 @@ GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM GLIB_GENERATED += nm-marshal.h nm-marshal.c nm_marshal_sources = $(nm_daemon_sources) -INCLUDES = \ +libnm_generated_la_CPPFLAGS = \ -I${top_srcdir}/include \ -I${top_builddir}/include \ -I${top_srcdir}/src \ @@ -67,13 +67,7 @@ INCLUDES = \ -I$(top_srcdir)/src/firewall-manager \ -I$(top_srcdir)/src/settings \ -I$(top_srcdir)/src/wifi \ - -I$(top_srcdir)/libnm-util - -if WITH_WIMAX -INCLUDES += -I$(top_srcdir)/src/wimax -endif - -libnm_generated_la_CPPFLAGS = \ + -I$(top_srcdir)/libnm-util \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) \ $(GUDEV_CFLAGS) \ @@ -82,8 +76,12 @@ libnm_generated_la_CPPFLAGS = \ $(SYSTEMD_LOGIN_CFLAGS) \ $(IWMX_SDK_CFLAGS) +if WITH_WIMAX +libnm_generated_la_CPPFLAGS += -I$(top_srcdir)/src/wimax +endif + if WITH_MODEM_MANAGER_1 - libnm_generated_la_CPPFLAGS += $(MM_GLIB_CFLAGS) +libnm_generated_la_CPPFLAGS += $(MM_GLIB_CFLAGS) endif libnm_generated_la_LIBADD = \ -- cgit 1.3.0-6-gf8a5