about summary refs log tree commit diff
path: root/src/settings/Makefile.in
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/settings/Makefile.in
parent9a8ff86a032d1e4dd04238fcde856b145406df6f (diff)
parent8c98b34228abb4dfde822ad89106b4d8b2287639 (diff)
Merge tag 'upstream/0.9.6.0' into experimental
Upstream version 0.9.6.0
Diffstat (limited to 'src/settings/Makefile.in')
-rw-r--r--src/settings/Makefile.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/settings/Makefile.in b/src/settings/Makefile.in
index 7cce8254..682b8796 100644
--- a/src/settings/Makefile.in
+++ b/src/settings/Makefile.in
@@ -394,12 +394,12 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = plugins . tests
 INCLUDES = -I${top_srcdir} \
-           -I${top_srcdir}/include \
            -I${top_builddir}/include \
-           -I${top_srcdir}/libnm-util \
+           -I${top_srcdir}/include \
            -I${top_builddir}/libnm-util \
-           -I${top_srcdir}/src/generated \
+           -I${top_srcdir}/libnm-util \
            -I${top_builddir}/src/generated \
+           -I${top_srcdir}/src/generated \
            -I${top_srcdir}/src/logging \
            -I${top_srcdir}/src