build: fix srcdir != builddir

nm-version.h is in ${top_builddir}/include.

29 files changed, 34 insertions, 5 deletions

diff --git a/callouts/Makefile.am b/callouts/Makefile.am
index 4a1ea7ca55..a3a2d26d0e 100644
--- a/callouts/Makefile.am
+++ b/callouts/Makefile.am
@@ -58,6 +58,7 @@ nm_dispatcher_action_SOURCES = \
 nm_dispatcher_action_CPPFLAGS = \
 	-I${top_srcdir} \
 	-I${top_srcdir}/include \
+	-I${top_builddir}/include \
 	-I${top_srcdir}/libnm-util \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
@@ -83,6 +84,7 @@ libtest_dispatcher_envp_la_SOURCES = \
 
 libtest_dispatcher_envp_la_CPPFLAGS = \
 	-I${top_srcdir}/include \
+	-I${top_builddir}/include \
 	-I${top_srcdir}/libnm-util \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS)
diff --git a/callouts/tests/Makefile.am b/callouts/tests/Makefile.am
index 6a46b629f1..7121b92a3b 100644
--- a/callouts/tests/Makefile.am
+++ b/callouts/tests/Makefile.am
@@ -1,5 +1,6 @@
 INCLUDES = \
 	-I$(top_srcdir)/include \
+	-I${top_builddir}/include \
 	-I$(top_srcdir)/libnm-util \
 	-I$(top_srcdir)/callouts
 
diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am
index 9b1babe422..742bf0fb31 100644
--- a/cli/src/Makefile.am
+++ b/cli/src/Makefile.am
@@ -4,6 +4,7 @@ bin_PROGRAMS = \
 INCLUDES = \
 	-I${top_srcdir} \
 	-I${top_srcdir}/include \
+	-I${top_builddir}/include \
 	-I${top_srcdir}/libnm-util \
 	-I${top_srcdir}/libnm-glib
 
diff --git a/examples/C/glib/Makefile.am b/examples/C/glib/Makefile.am
index 1063d52008..332a3b36c0 100644
--- a/examples/C/glib/Makefile.am
+++ b/examples/C/glib/Makefile.am
@@ -1,6 +1,7 @@
 INCLUDES = -I${top_srcdir}/libnm-util         \
            -I${top_srcdir}/libnm-glib         \
-           -I${top_srcdir}/include
+           -I${top_srcdir}/include	      \
+           -I${top_builddir}/include
 
 AM_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
diff --git a/examples/C/qt/Makefile.am b/examples/C/qt/Makefile.am
index 5f0c6a1e35..cde7371f4c 100644
--- a/examples/C/qt/Makefile.am
+++ b/examples/C/qt/Makefile.am
@@ -1,4 +1,5 @@
-INCLUDES = -I${top_srcdir}/include
+INCLUDES = -I${top_srcdir}/include \
+	   -I${top_builddir}/include
 
 AM_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am
index abee1f8654..df98fa1537 100644
--- a/libnm-glib/Makefile.am
+++ b/libnm-glib/Makefile.am
@@ -2,6 +2,7 @@ SUBDIRS=. tests
 
 INCLUDES = \
 	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-util \
 	-I$(top_builddir)/marshallers
 
diff --git a/libnm-glib/tests/Makefile.am b/libnm-glib/tests/Makefile.am
index 06aee71252..1564c59a1b 100644
--- a/libnm-glib/tests/Makefile.am
+++ b/libnm-glib/tests/Makefile.am
@@ -1,5 +1,6 @@
 INCLUDES = \
 	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-util \
 	-I$(top_srcdir)/libnm-glib
 
diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am
index d0bf73adcf..1ccb5a6ebc 100644
--- a/libnm-util/Makefile.am
+++ b/libnm-util/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS=. tests
 
-INCLUDES = -I${top_srcdir} -I${top_srcdir}/include
+INCLUDES = -I${top_srcdir} -I${top_srcdir}/include -I${top_builddir}/include
 
 lib_LTLIBRARIES=libnm-util.la
 
diff --git a/libnm-util/tests/Makefile.am b/libnm-util/tests/Makefile.am
index 1d737d1aa4..a3e12c3f81 100644
--- a/libnm-util/tests/Makefile.am
+++ b/libnm-util/tests/Makefile.am
@@ -2,6 +2,7 @@ SUBDIRS=certs
 
 INCLUDES = \
 	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-util
 
 noinst_PROGRAMS = \
diff --git a/src/Makefile.am b/src/Makefile.am
index 2318166ef5..37e6b9c7b3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,6 +21,7 @@ SUBDIRS += . tests
 
 INCLUDES = -I${top_srcdir} \
            -I${top_srcdir}/include \
+           -I${top_builddir}/include \
            -I${top_builddir}/marshallers \
            -I${top_srcdir}/src/logging \
            -I${top_srcdir}/src/dns-manager \
diff --git a/src/backends/Makefile.am b/src/backends/Makefile.am
index e9260f6040..11a154a0db 100644
--- a/src/backends/Makefile.am
+++ b/src/backends/Makefile.am
@@ -2,6 +2,7 @@ INCLUDES = \
 	-I${top_srcdir} \
 	-I${top_srcdir}/src/logging \
 	-I${top_srcdir}/include \
+	-I${top_builddir}/include \
 	-I${top_srcdir}/src \
 	-I${top_srcdir}/libnm-util
 
diff --git a/src/bluez-manager/Makefile.am b/src/bluez-manager/Makefile.am
index 623c1060bf..c720b0147c 100644
--- a/src/bluez-manager/Makefile.am
+++ b/src/bluez-manager/Makefile.am
@@ -1,6 +1,7 @@
 INCLUDES = \
 	-I${top_srcdir} \
 	-I${top_srcdir}/include \
+	-I${top_builddir}/include \
 	-I${top_srcdir}/libnm-util \
 	-I${top_srcdir}/src \
 	-I${top_srcdir}/src/logging \
diff --git a/src/dhcp-manager/Makefile.am b/src/dhcp-manager/Makefile.am
index 14ddde0bd2..849b8ef1e1 100644
--- a/src/dhcp-manager/Makefile.am
+++ b/src/dhcp-manager/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS=. tests
 INCLUDES = \
 	-I${top_srcdir} \
 	-I${top_srcdir}/include \
+	-I${top_builddir}/include \
 	-I${top_builddir}/marshallers \
 	-I${top_srcdir}/src/logging \
 	-I${top_srcdir}/libnm-util \
diff --git a/src/dhcp-manager/tests/Makefile.am b/src/dhcp-manager/tests/Makefile.am
index b075fd683a..d1b3c84cf4 100644
--- a/src/dhcp-manager/tests/Makefile.am
+++ b/src/dhcp-manager/tests/Makefile.am
@@ -1,5 +1,6 @@
 INCLUDES = \
 	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
 	-I${top_srcdir}/libnm-util \
 	-I$(top_srcdir)/src/dhcp-manager
 
diff --git a/src/dns-manager/Makefile.am b/src/dns-manager/Makefile.am
index b51f667bdb..def8fe664b 100644
--- a/src/dns-manager/Makefile.am
+++ b/src/dns-manager/Makefile.am
@@ -2,7 +2,8 @@ INCLUDES = \
 	-I${top_srcdir}/src/logging \
 	-I${top_srcdir}/libnm-util \
 	-I${top_srcdir}/src \
-	-I${top_srcdir}/include
+	-I${top_srcdir}/include \
+	-I${top_builddir}/include
 
 noinst_LTLIBRARIES = libdns-manager.la
 
diff --git a/src/ip6-manager/Makefile.am b/src/ip6-manager/Makefile.am
index b98d6def7e..c88a9cc1df 100644
--- a/src/ip6-manager/Makefile.am
+++ b/src/ip6-manager/Makefile.am
@@ -1,6 +1,7 @@
 INCLUDES = \
 	-I${top_srcdir} \
 	-I${top_srcdir}/include \
+	-I${top_builddir}/include \
 	-I${top_builddir}/marshallers \
 	-I${top_srcdir}/libnm-util \
 	-I${top_srcdir}/src/logging \
diff --git a/src/modem-manager/Makefile.am b/src/modem-manager/Makefile.am
index 3c3af16c5f..2060866939 100644
--- a/src/modem-manager/Makefile.am
+++ b/src/modem-manager/Makefile.am
@@ -2,6 +2,7 @@ INCLUDES = \
 	-I${top_srcdir}/src \
 	-I${top_srcdir}/src/logging \
 	-I${top_srcdir}/include \
+	-I${top_builddir}/include \
 	-I${top_srcdir}/libnm-util \
 	-I${top_builddir}/marshallers
 
diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am
index 540e58559b..22deb41dd9 100644
--- a/src/ppp-manager/Makefile.am
+++ b/src/ppp-manager/Makefile.am
@@ -1,6 +1,7 @@
 INCLUDES = \
 	-I${top_srcdir} \
 	-I${top_srcdir}/include \
+	-I${top_builddir}/include \
 	-I${top_srcdir}/libnm-util \
 	-I${top_srcdir}/src \
 	-I${top_srcdir}/src/logging \
diff --git a/src/settings/Makefile.am b/src/settings/Makefile.am
index 21dc5bb0ed..d87f713aae 100644
--- a/src/settings/Makefile.am
+++ b/src/settings/Makefile.am
@@ -2,6 +2,7 @@ SUBDIRS=plugins . tests
 
 INCLUDES = -I${top_srcdir} \
            -I${top_srcdir}/include \
+           -I${top_builddir}/include \
            -I${top_srcdir}/libnm-util \
            -I${top_srcdir}/src/logging \
            -I${top_srcdir}/src \
diff --git a/src/settings/plugins/ifcfg-rh/Makefile.am b/src/settings/plugins/ifcfg-rh/Makefile.am
index 9874d352ba..0bf8d19dee 100644
--- a/src/settings/plugins/ifcfg-rh/Makefile.am
+++ b/src/settings/plugins/ifcfg-rh/Makefile.am
@@ -25,6 +25,7 @@ libifcfg_rh_io_la_SOURCES = \
 INCLUDES = \
 	-I$(top_srcdir)/src/settings \
 	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-glib \
 	-I$(top_srcdir)/libnm-util \
 	-I$(top_builddir)/marshallers
diff --git a/src/settings/plugins/ifcfg-rh/tests/Makefile.am b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
index 1b76a4742f..6b99561144 100644
--- a/src/settings/plugins/ifcfg-rh/tests/Makefile.am
+++ b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
@@ -2,6 +2,7 @@ SUBDIRS=network-scripts
 
 INCLUDES = \
 	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-util \
 	-I$(top_srcdir)/libnm-glib \
 	-I$(srcdir)/../
diff --git a/src/settings/plugins/keyfile/Makefile.am b/src/settings/plugins/keyfile/Makefile.am
index 3b24214220..e941e9b97c 100644
--- a/src/settings/plugins/keyfile/Makefile.am
+++ b/src/settings/plugins/keyfile/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS=. tests
 INCLUDES = \
 	-I$(top_srcdir)/src/settings \
 	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-util
 
 noinst_LTLIBRARIES = \
diff --git a/src/settings/plugins/keyfile/tests/Makefile.am b/src/settings/plugins/keyfile/tests/Makefile.am
index affe8dcae4..90bc2331b1 100644
--- a/src/settings/plugins/keyfile/tests/Makefile.am
+++ b/src/settings/plugins/keyfile/tests/Makefile.am
@@ -2,6 +2,7 @@ SUBDIRS=keyfiles
 
 INCLUDES = \
 	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-util \
 	-I$(top_srcdir)/libnm-glib \
 	-I$(srcdir)/../
diff --git a/src/settings/tests/Makefile.am b/src/settings/tests/Makefile.am
index 4a45139867..57d56fc480 100644
--- a/src/settings/tests/Makefile.am
+++ b/src/settings/tests/Makefile.am
@@ -1,5 +1,6 @@
 INCLUDES = \
 	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-util \
 	-I$(top_srcdir)/src/settings
 
diff --git a/src/supplicant-manager/Makefile.am b/src/supplicant-manager/Makefile.am
index 359fc70ae5..58c174dd17 100644
--- a/src/supplicant-manager/Makefile.am
+++ b/src/supplicant-manager/Makefile.am
@@ -4,6 +4,7 @@ INCLUDES = \
 	-I${top_srcdir}/src \
 	-I${top_srcdir}/src/logging \
 	-I${top_srcdir}/include \
+	-I${top_builddir}/include \
 	-I${top_srcdir}/libnm-util \
 	-I${top_builddir}/marshallers
 
diff --git a/src/supplicant-manager/tests/Makefile.am b/src/supplicant-manager/tests/Makefile.am
index b5e4db61d5..b2360259cc 100644
--- a/src/supplicant-manager/tests/Makefile.am
+++ b/src/supplicant-manager/tests/Makefile.am
@@ -1,5 +1,6 @@
 INCLUDES = \
 	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-util \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/supplicant-manager
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 296668aa9d..38a8d22094 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,5 +1,6 @@
 INCLUDES = \
 	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
 	-I$(top_srcdir)/libnm-util \
 	-I$(top_srcdir)/src/dhcp-manager \
 	-I$(top_builddir)/marshallers \
diff --git a/src/vpn-manager/Makefile.am b/src/vpn-manager/Makefile.am
index ce99728edc..c4c7b3ed48 100644
--- a/src/vpn-manager/Makefile.am
+++ b/src/vpn-manager/Makefile.am
@@ -1,6 +1,7 @@
 INCLUDES = \
 	-I${top_srcdir} \
 	-I${top_srcdir}/include \
+	-I${top_builddir}/include \
 	-I${top_srcdir}/libnm-util \
 	-I${top_srcdir}/src/logging \
 	-I${top_srcdir}/src \
diff --git a/test/Makefile.am b/test/Makefile.am
index 7bdaf0db96..952f8e78cb 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,7 +1,8 @@
 INCLUDES = -I${top_srcdir}                    \
            -I${top_srcdir}/libnm-util         \
            -I${top_srcdir}/libnm-glib         \
-           -I${top_srcdir}/include
+           -I${top_srcdir}/include            \
+	   -I${top_builddir}/include
 
 AM_CPPFLAGS = \
 	$(DBUS_CFLAGS) \