build: more srcdir!=builddir fixes

nm-version.h was getting disted, making srcdir!=builddir work for
tarball builds, but not for git builds.

Also, remove "-I${top_builddir}/include" from all Makefile.ams, since
there's nothing generated in include/ any more.

diff --git a/callouts/Makefile.am b/callouts/Makefile.am
index a8c9026..3ec4581 100644 (file)
--- a/callouts/Makefile.am
+++ b/callouts/Makefile.am
@@ -2,7 +2,6 @@ SUBDIRS = . tests
 
 AM_CPPFLAGS = \
        -I${top_srcdir}/include \
-       -I${top_builddir}/include \
        -I${top_srcdir}/libnm-util \
        -I${top_builddir}/libnm-util \
        $(GLIB_CFLAGS) \

diff --git a/callouts/tests/Makefile.am b/callouts/tests/Makefile.am
index de4b5f5..67af4d9 100644 (file)
--- a/callouts/tests/Makefile.am
+++ b/callouts/tests/Makefile.am
@@ -2,7 +2,6 @@ if ENABLE_TESTS
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
-       -I${top_builddir}/include \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
        -I$(top_srcdir)/callouts \

diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am
index 2dc67b5..70dbd97 100644 (file)
--- a/cli/src/Makefile.am
+++ b/cli/src/Makefile.am
@@ -5,7 +5,6 @@ AM_CPPFLAGS = \
        -I${top_srcdir} \
        -I${top_builddir} \
        -I${top_srcdir}/include \
-       -I${top_builddir}/include \
        -I${top_srcdir}/libnm-util \
        -I${top_builddir}/libnm-util \
        -I${top_srcdir}/libnm-glib \

diff --git a/examples/C/glib/Makefile.am b/examples/C/glib/Makefile.am
index 1f4785d..7289c50 100644 (file)
--- a/examples/C/glib/Makefile.am
+++ b/examples/C/glib/Makefile.am
@@ -3,7 +3,6 @@ AM_CPPFLAGS = \
        -I${top_builddir}/libnm-util \
        -I${top_srcdir}/libnm-glib \
        -I${top_srcdir}/include \
-       -I${top_builddir}/include \
        $(DBUS_CFLAGS) \
        $(GLIB_CFLAGS)
 

diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am
index c43dab8..57eff9a 100644 (file)
--- a/libnm-glib/Makefile.am
+++ b/libnm-glib/Makefile.am
@@ -4,7 +4,6 @@ SUBDIRS = . tests
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
        -DG_LOG_DOMAIN=\""libnm-glib"\" \

diff --git a/libnm-glib/tests/Makefile.am b/libnm-glib/tests/Makefile.am
index b287147..0bdd61a 100644 (file)
--- a/libnm-glib/tests/Makefile.am
+++ b/libnm-glib/tests/Makefile.am
@@ -2,7 +2,6 @@ if ENABLE_TESTS
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
        -I$(top_srcdir)/libnm-glib \

diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am
index cb08a14..79c3706 100644 (file)
--- a/libnm-util/Makefile.am
+++ b/libnm-util/Makefile.am
@@ -5,7 +5,6 @@ SUBDIRS = . tests
 AM_CPPFLAGS = \
        -I${top_srcdir} \
        -I${top_srcdir}/include \
-       -I${top_builddir}/include \
        -DG_LOG_DOMAIN=\""libnm-util"\" \
        -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
        $(GLIB_CFLAGS) \
@@ -53,8 +52,10 @@ libnm_util_include_HEADERS =                 \
        nm-setting-wireless.h           \
        nm-setting-wireless-security.h  \
        nm-setting-vpn.h                \
+       nm-utils.h
+
+nodist_libnm_util_include_HEADERS = \
        nm-utils-enum-types.h           \
-       nm-utils.h                      \
        nm-version.h
 
 libnm_util_la_private_headers = \
@@ -163,7 +164,7 @@ INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
 INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 
 if HAVE_INTROSPECTION
-introspection_sources = $(libnm_util_include_HEADERS) $(libnm_util_la_csources)
+introspection_sources = $(libnm_util_include_HEADERS) $(nodist_libnm_util_include_HEADERS) $(libnm_util_la_csources)
 
 NetworkManager-1.0.gir: libnm-util.la
 NetworkManager_1_0_gir_INCLUDES = GObject-2.0 DBusGLib-1.0

diff --git a/libnm-util/tests/Makefile.am b/libnm-util/tests/Makefile.am
index 6d3d225..2b3366f 100644 (file)
--- a/libnm-util/tests/Makefile.am
+++ b/libnm-util/tests/Makefile.am
@@ -4,7 +4,6 @@ SUBDIRS=certs
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
        -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \

diff --git a/src/Makefile.am b/src/Makefile.am
index 244574a..0a0b52d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -38,7 +38,6 @@ endif
 
 AM_CPPFLAGS =                          \
        -I$(top_srcdir)/include         \
-       -I$(top_builddir)/include       \
        -I${top_srcdir}/libgsystem      \
        -I$(top_srcdir)/libnm-util      \
        -I$(top_builddir)/libnm-util    \

diff --git a/src/config/tests/Makefile.am b/src/config/tests/Makefile.am
index 6e64812..8d5a5b6 100644 (file)
--- a/src/config/tests/Makefile.am
+++ b/src/config/tests/Makefile.am
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
        -I$(top_srcdir)/src/config \

diff --git a/src/devices/adsl/Makefile.am b/src/devices/adsl/Makefile.am
index 0430f47..50024b3 100644 (file)
--- a/src/devices/adsl/Makefile.am
+++ b/src/devices/adsl/Makefile.am
@@ -10,7 +10,6 @@ AM_CPPFLAGS = \
        -I${top_srcdir}/src/settings \
        -I${top_srcdir}/src/platform \
        -I${top_srcdir}/src/ppp-manager \
-       -I${top_builddir}/include \
        -I${top_srcdir}/include \
        -I${top_builddir}/libnm-util \
        -I${top_srcdir}/libnm-util \

diff --git a/src/devices/bluetooth/Makefile.am b/src/devices/bluetooth/Makefile.am
index 639a1ad..fa1a40f 100644 (file)
--- a/src/devices/bluetooth/Makefile.am
+++ b/src/devices/bluetooth/Makefile.am
@@ -10,7 +10,6 @@ AM_CPPFLAGS = \
        -I${top_srcdir}/src/settings \
        -I${top_srcdir}/src/platform \
        -I${top_srcdir}/src/devices/wwan \
-       -I${top_builddir}/include \
        -I${top_srcdir}/include \
        -I${top_builddir}/libnm-util \
        -I${top_srcdir}/libnm-util \

diff --git a/src/devices/team/Makefile.am b/src/devices/team/Makefile.am
index e2bfd0a..f54de6b 100644 (file)
--- a/src/devices/team/Makefile.am
+++ b/src/devices/team/Makefile.am
@@ -10,7 +10,6 @@ AM_CPPFLAGS = \
        -I${top_srcdir}/src/settings \
        -I${top_srcdir}/src/platform \
        -I${top_srcdir}/src/posix-signals \
-       -I${top_builddir}/include \
        -I${top_srcdir}/include \
        -I${top_builddir}/libnm-util \
        -I${top_srcdir}/libnm-util \

diff --git a/src/devices/wifi/Makefile.am b/src/devices/wifi/Makefile.am
index 5f3ce28..211e38f 100644 (file)
--- a/src/devices/wifi/Makefile.am
+++ b/src/devices/wifi/Makefile.am
@@ -12,7 +12,6 @@ AM_CPPFLAGS = \
        -I${top_srcdir}/src/settings \
        -I${top_srcdir}/src/platform \
        -I${top_srcdir}/src/supplicant-manager \
-       -I${top_builddir}/include \
        -I${top_srcdir}/include \
        -I${top_builddir}/libnm-util \
        -I${top_srcdir}/libnm-util \

diff --git a/src/devices/wifi/tests/Makefile.am b/src/devices/wifi/tests/Makefile.am
index 2667c5f..e90fd23 100644 (file)
--- a/src/devices/wifi/tests/Makefile.am
+++ b/src/devices/wifi/tests/Makefile.am
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
        -I$(top_srcdir)/src/platform \

diff --git a/src/devices/wimax/Makefile.am b/src/devices/wimax/Makefile.am
index def8bf6..28a0758 100644 (file)
--- a/src/devices/wimax/Makefile.am
+++ b/src/devices/wimax/Makefile.am
@@ -4,7 +4,6 @@ AM_CPPFLAGS = \
        -I${top_srcdir}/src/logging \
        -I${top_srcdir}/src/devices \
        -I${top_srcdir}/src/platform \
-       -I${top_builddir}/include \
        -I${top_srcdir}/include \
        -I${top_builddir}/libnm-util \
        -I${top_srcdir}/libnm-util \

diff --git a/src/devices/wwan/Makefile.am b/src/devices/wwan/Makefile.am
index 7e83f53..b8c079e 100644 (file)
--- a/src/devices/wwan/Makefile.am
+++ b/src/devices/wwan/Makefile.am
@@ -9,7 +9,6 @@ AM_CPPFLAGS = \
        -I${top_srcdir}/src/devices \
        -I${top_srcdir}/src/settings \
        -I${top_srcdir}/src/platform \
-       -I${top_builddir}/include \
        -I${top_srcdir}/include \
        -I${top_builddir}/libnm-util \
        -I${top_srcdir}/libnm-util \

diff --git a/src/dhcp-manager/tests/Makefile.am b/src/dhcp-manager/tests/Makefile.am
index 6ef828d..4701b3f 100644 (file)
--- a/src/dhcp-manager/tests/Makefile.am
+++ b/src/dhcp-manager/tests/Makefile.am
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
        -I${top_srcdir}/libnm-util \
        -I${top_builddir}/libnm-util \
        -I$(top_srcdir)/src/dhcp-manager \

diff --git a/src/dnsmasq-manager/tests/Makefile.am b/src/dnsmasq-manager/tests/Makefile.am
index 9c7f4ab..ac7bd00 100644 (file)
--- a/src/dnsmasq-manager/tests/Makefile.am
+++ b/src/dnsmasq-manager/tests/Makefile.am
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
        -I${top_srcdir}/libnm-util \
        -I${top_builddir}/libnm-util \
        -I$(top_srcdir)/src/dnsmasq-manager \

diff --git a/src/platform/tests/Makefile.am b/src/platform/tests/Makefile.am
index 9b10ea7..26d2476 100644 (file)
--- a/src/platform/tests/Makefile.am
+++ b/src/platform/tests/Makefile.am
@@ -1,7 +1,6 @@
 AM_CPPFLAGS = \
        -I${top_srcdir} \
        -I${top_srcdir}/include \
-       -I${top_builddir}/include \
        -I${top_srcdir}/src \
        -I${top_builddir}/src \
        -I${top_srcdir}/src/logging \

diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am
index a504a6a..2d740f1 100644 (file)
--- a/src/ppp-manager/Makefile.am
+++ b/src/ppp-manager/Makefile.am
@@ -1,7 +1,6 @@
 if WITH_PPP
 
 AM_CPPFLAGS = \
-       -I${top_builddir}/include \
        -I${top_srcdir}/include \
        -I${top_srcdir}/libnm-util \
        -I${top_builddir}/libnm-util \

diff --git a/src/rdisc/tests/Makefile.am b/src/rdisc/tests/Makefile.am
index cf351d6..27a55da 100644 (file)
--- a/src/rdisc/tests/Makefile.am
+++ b/src/rdisc/tests/Makefile.am
@@ -1,13 +1,13 @@
 AM_CPPFLAGS = \
        -I${top_srcdir} \
        -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
        -I${top_srcdir}/src \
        -I${top_srcdir}/src/devices \
        -I${top_srcdir}/src/logging \
        -I${top_srcdir}/src/platform \
        -I${top_srcdir}/src/posix-signals \
        -I${top_srcdir}/libnm-util \
+       -I${top_builddir}/libnm-util \
        -I${srcdir}/.. \
        -DG_LOG_DOMAIN=\""NetworkManager"\" \
        -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \

diff --git a/src/settings/plugins/example/Makefile.am b/src/settings/plugins/example/Makefile.am
index 8233a71..c91977e 100644 (file)
--- a/src/settings/plugins/example/Makefile.am
+++ b/src/settings/plugins/example/Makefile.am
@@ -4,7 +4,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/logging \
        -I$(top_srcdir)/src/settings \
        -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
        -DG_LOG_DOMAIN=\""NetworkManager-example"\" \

diff --git a/src/settings/plugins/ifcfg-rh/Makefile.am b/src/settings/plugins/ifcfg-rh/Makefile.am
index c5e458a..b3cdbb6 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/Makefile.am
+++ b/src/settings/plugins/ifcfg-rh/Makefile.am
@@ -32,7 +32,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/posix-signals \
        -I$(top_srcdir)/src/config \
        -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
        -I$(top_srcdir)/libnm-glib \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \

diff --git a/src/settings/plugins/ifcfg-rh/tests/Makefile.am b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
index e758776..cd4dd76 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/tests/Makefile.am
+++ b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
@@ -9,7 +9,6 @@ AM_CPPFLAGS = \
        $(DBUS_CFLAGS) \
        $(CODE_COVERAGE_CFLAGS) \
        -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
        -I$(top_srcdir)/libnm-glib \

diff --git a/src/settings/plugins/ifcfg-suse/Makefile.am b/src/settings/plugins/ifcfg-suse/Makefile.am
index d4f1cf7..a9eef37 100644 (file)
--- a/src/settings/plugins/ifcfg-suse/Makefile.am
+++ b/src/settings/plugins/ifcfg-suse/Makefile.am
@@ -5,8 +5,8 @@ AM_CPPFLAGS = \
        -I${top_srcdir}/src \
        -I${top_srcdir}/src/settings \
        -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
        -I$(top_srcdir)/libnm-util \
+       -I$(top_builddir)/libnm-util \
        -I$(top_srcdir)/libnm-glib \
        -DG_LOG_DOMAIN=\""NetworkManager-ifcfg-suse"\" \
        -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \

diff --git a/src/settings/plugins/ifnet/Makefile.am b/src/settings/plugins/ifnet/Makefile.am
index a22ea55..1b317f6 100644 (file)
--- a/src/settings/plugins/ifnet/Makefile.am
+++ b/src/settings/plugins/ifnet/Makefile.am
@@ -9,7 +9,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/platform \
        -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)/libnm-util \

diff --git a/src/settings/plugins/ifnet/tests/Makefile.am b/src/settings/plugins/ifnet/tests/Makefile.am
index f66a6a3..93f7221 100644 (file)
--- a/src/settings/plugins/ifnet/tests/Makefile.am
+++ b/src/settings/plugins/ifnet/tests/Makefile.am
@@ -8,7 +8,6 @@ AM_CPPFLAGS= \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
        -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/config \
        -I$(top_srcdir)/src/logging \

diff --git a/src/settings/plugins/ifupdown/Makefile.am b/src/settings/plugins/ifupdown/Makefile.am
index fd98f8f..ec4196e 100644 (file)
--- a/src/settings/plugins/ifupdown/Makefile.am
+++ b/src/settings/plugins/ifupdown/Makefile.am
@@ -8,7 +8,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/config \
        -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)/libnm-util \

diff --git a/src/settings/plugins/ifupdown/tests/Makefile.am b/src/settings/plugins/ifupdown/tests/Makefile.am
index 160b332..2967413 100644 (file)
--- a/src/settings/plugins/ifupdown/tests/Makefile.am
+++ b/src/settings/plugins/ifupdown/tests/Makefile.am
@@ -2,7 +2,6 @@ if ENABLE_TESTS
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
        -I$(top_srcdir)/libnm-glib \

diff --git a/src/settings/plugins/keyfile/Makefile.am b/src/settings/plugins/keyfile/Makefile.am
index cac97e7..21e0cde 100644 (file)
--- a/src/settings/plugins/keyfile/Makefile.am
+++ b/src/settings/plugins/keyfile/Makefile.am
@@ -8,7 +8,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/logging \
        -I$(top_srcdir)/src/settings \
        -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
        -DG_LOG_DOMAIN=\""NetworkManager-keyfile"\" \

diff --git a/src/settings/plugins/keyfile/tests/Makefile.am b/src/settings/plugins/keyfile/tests/Makefile.am
index fae6e4e..7b148ca 100644 (file)
--- a/src/settings/plugins/keyfile/tests/Makefile.am
+++ b/src/settings/plugins/keyfile/tests/Makefile.am
@@ -6,7 +6,6 @@ SUBDIRS=keyfiles
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
        -I$(top_srcdir)/libnm-glib \

diff --git a/src/settings/tests/Makefile.am b/src/settings/tests/Makefile.am
index 4115d4b..5432724 100644 (file)
--- a/src/settings/tests/Makefile.am
+++ b/src/settings/tests/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
        -I$(top_srcdir)/libnm-util \
+       -I$(top_builddir)/libnm-util \
        -I$(top_srcdir)/src/settings \
        -DG_LOG_DOMAIN=\""NetworkManager"\" \
        $(GLIB_CFLAGS) \

diff --git a/src/supplicant-manager/tests/Makefile.am b/src/supplicant-manager/tests/Makefile.am
index 9defe66..6a32acd 100644 (file)
--- a/src/supplicant-manager/tests/Makefile.am
+++ b/src/supplicant-manager/tests/Makefile.am
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
        -I$(top_srcdir)/src \

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 87310a2..2370d57 100644 (file)
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,6 +1,5 @@
 AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
        -I$(top_srcdir)/src/logging \

diff --git a/test/Makefile.am b/test/Makefile.am
index 830019b..f577d8a 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -4,7 +4,6 @@ AM_CPPFLAGS = \
        -I${top_builddir}/libnm-util \
        -I${top_srcdir}/libnm-glib \
        -I${top_srcdir}/include \
-       -I${top_builddir}/include \
        $(DBUS_CFLAGS) \
        $(GLIB_CFLAGS) \
        -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \

diff --git a/tui/Makefile.am b/tui/Makefile.am
index 755b689..7ca1b91 100644 (file)
--- a/tui/Makefile.am
+++ b/tui/Makefile.am
@@ -5,7 +5,6 @@ SUBDIRS = newt .
 AM_CPPFLAGS= \
        -I$(top_srcdir) \
        -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
        -I$(top_srcdir)/libnm-glib \

diff --git a/tui/newt/Makefile.am b/tui/newt/Makefile.am
index 0db5525..e572238 100644 (file)
--- a/tui/newt/Makefile.am
+++ b/tui/newt/Makefile.am
@@ -1,6 +1,5 @@
 AM_CPPFLAGS= \
        -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
        -DG_LOG_DOMAIN=\""nmtui"\" \
        $(GLIB_CFLAGS) \
        $(NEWT_CFLAGS) \