summary refs log tree commit diff
path: root/src/wimax
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd@luon.net>2014-04-26 20:55:09 +0200
committerSjoerd Simons <sjoerd@luon.net>2014-04-26 20:55:09 +0200
commit59c3714a494c3b3765657c0551ad82842d98a7d2 (patch)
treee4dcdf9791fc40581f02bfaf870c30b102b3133a /src/wimax
parenta4256940da049f91bbbea5e53e469a59ea9c10f7 (diff)
Imported Upstream version 0.9.8.10 upstream/0.9.8.10
Diffstat (limited to 'src/wimax')
-rw-r--r--src/wimax/Makefile.am18
-rw-r--r--src/wimax/Makefile.in20
2 files changed, 18 insertions, 20 deletions
diff --git a/src/wimax/Makefile.am b/src/wimax/Makefile.am
index caf017d8..55c7046b 100644
--- a/src/wimax/Makefile.am
+++ b/src/wimax/Makefile.am
@@ -1,13 +1,3 @@
-INCLUDES = \
-	-I${top_srcdir}/src \
-	-I${top_builddir}/src/generated \
-	-I${top_srcdir}/src/generated \
-	-I${top_srcdir}/src/logging \
-	-I${top_builddir}/include \
-	-I${top_srcdir}/include \
-	-I${top_builddir}/libnm-util \
-	-I${top_srcdir}/libnm-util
-
 pkglib_LTLIBRARIES = libnm-device-plugin-wimax.la
 
 libnm_device_plugin_wimax_la_SOURCES = \
@@ -23,6 +13,14 @@ libnm_device_plugin_wimax_la_SOURCES = \
 	iwmxsdk.h
 
 libnm_device_plugin_wimax_la_CPPFLAGS = \
+	-I${top_srcdir}/src \
+	-I${top_builddir}/src/generated \
+	-I${top_srcdir}/src/generated \
+	-I${top_srcdir}/src/logging \
+	-I${top_builddir}/include \
+	-I${top_srcdir}/include \
+	-I${top_builddir}/libnm-util \
+	-I${top_srcdir}/libnm-util \
 	$(DBUS_CFLAGS) \
 	$(IWMX_SDK_CFLAGS) \
 	$(LIBNL_CFLAGS) \
diff --git a/src/wimax/Makefile.in b/src/wimax/Makefile.in
index aacd5abb..5210414d 100644
--- a/src/wimax/Makefile.in
+++ b/src/wimax/Makefile.in
@@ -242,6 +242,7 @@ DEPDIR = @DEPDIR@
 DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCPCD_PATH = @DHCPCD_PATH@
 DLLTOOL = @DLLTOOL@
+DNSMASQ_PATH = @DNSMASQ_PATH@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -264,6 +265,7 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -448,16 +450,6 @@ with_dhclient = @with_dhclient@
 with_dhcpcd = @with_dhcpcd@
 with_netconfig = @with_netconfig@
 with_resolvconf = @with_resolvconf@
-INCLUDES = \
-	-I${top_srcdir}/src \
-	-I${top_builddir}/src/generated \
-	-I${top_srcdir}/src/generated \
-	-I${top_srcdir}/src/logging \
-	-I${top_builddir}/include \
-	-I${top_srcdir}/include \
-	-I${top_builddir}/libnm-util \
-	-I${top_srcdir}/libnm-util
-
 pkglib_LTLIBRARIES = libnm-device-plugin-wimax.la
 libnm_device_plugin_wimax_la_SOURCES = \
 	nm-wimax-factory.c \
@@ -472,6 +464,14 @@ libnm_device_plugin_wimax_la_SOURCES = \
 	iwmxsdk.h
 
 libnm_device_plugin_wimax_la_CPPFLAGS = \
+	-I${top_srcdir}/src \
+	-I${top_builddir}/src/generated \
+	-I${top_srcdir}/src/generated \
+	-I${top_srcdir}/src/logging \
+	-I${top_builddir}/include \
+	-I${top_srcdir}/include \
+	-I${top_builddir}/libnm-util \
+	-I${top_srcdir}/libnm-util \
 	$(DBUS_CFLAGS) \
 	$(IWMX_SDK_CFLAGS) \
 	$(LIBNL_CFLAGS) \