about summary refs log tree commit diff
path: root/src/supplicant-manager
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2012-08-07 22:16:17 +0200
committerMichael Biebl <biebl@debian.org>2012-08-07 22:16:17 +0200
commit44826499c23720be3d74ab674c4fd38912c5b8c2 (patch)
tree613bec9c2242e5e0700bef1ba87ca2d25d755795 /src/supplicant-manager
parent9a8ff86a032d1e4dd04238fcde856b145406df6f (diff)
parent8c98b34228abb4dfde822ad89106b4d8b2287639 (diff)
Merge tag 'upstream/0.9.6.0' into experimental
Upstream version 0.9.6.0
Diffstat (limited to 'src/supplicant-manager')
-rw-r--r--src/supplicant-manager/Makefile.am8
-rw-r--r--src/supplicant-manager/Makefile.in8
2 files changed, 8 insertions, 8 deletions
diff --git a/src/supplicant-manager/Makefile.am b/src/supplicant-manager/Makefile.am
index e8a2ce74..1c24d0ef 100644
--- a/src/supplicant-manager/Makefile.am
+++ b/src/supplicant-manager/Makefile.am
@@ -2,13 +2,13 @@ SUBDIRS=. tests
 
 INCLUDES = \
 	-I${top_srcdir}/src \
-	-I${top_srcdir}/src/generated \
 	-I${top_builddir}/src/generated \
+	-I${top_srcdir}/src/generated \
 	-I${top_srcdir}/src/logging \
-	-I${top_srcdir}/include \
 	-I${top_builddir}/include \
-	-I${top_srcdir}/libnm-util \
-	-I${top_builddir}/libnm-util
+	-I${top_srcdir}/include \
+	-I${top_builddir}/libnm-util \
+	-I${top_srcdir}/libnm-util
 
 noinst_LTLIBRARIES = libsupplicant-manager.la
 
diff --git a/src/supplicant-manager/Makefile.in b/src/supplicant-manager/Makefile.in
index 90448667..9fb8b1fd 100644
--- a/src/supplicant-manager/Makefile.in
+++ b/src/supplicant-manager/Makefile.in
@@ -375,13 +375,13 @@ top_srcdir = @top_srcdir@
 SUBDIRS = . tests
 INCLUDES = \
 	-I${top_srcdir}/src \
-	-I${top_srcdir}/src/generated \
 	-I${top_builddir}/src/generated \
+	-I${top_srcdir}/src/generated \
 	-I${top_srcdir}/src/logging \
-	-I${top_srcdir}/include \
 	-I${top_builddir}/include \
-	-I${top_srcdir}/libnm-util \
-	-I${top_builddir}/libnm-util
+	-I${top_srcdir}/include \
+	-I${top_builddir}/libnm-util \
+	-I${top_srcdir}/libnm-util
 
 noinst_LTLIBRARIES = libsupplicant-manager.la
 libsupplicant_manager_la_SOURCES = \