From 1d7949e66c7949b7cca2705fc30f371d56f5fced Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 6 Aug 2012 17:27:17 -0500 Subject: [PATCH] build: fix up includes; prefer builddir over srcdir WiMAX failed distcheck if the iwmxsdk devel files were installed but --enable-wimax=no was used, since the distcheck configure bits found the iwmxsdk headers, defaulted WiMAX support to 'on', and then proceeded to use the generated headers from the top srcdir, where of course wimax was turned off (due to --enable-wimax=no). Instead, everything should use the headers from the builddir, which reflects the options that 'make distcheck' actually selects. At the same time, re-order various includes everywhere to ensure that the builddir paths come before the srcdir paths to prevent this from happening in the future. --- src/Makefile.am | 4 ++-- src/bluez-manager/Makefile.am | 6 +++--- src/dhcp-manager/Makefile.am | 6 +++--- src/ip6-manager/Makefile.am | 6 +++--- src/modem-manager/Makefile.am | 8 ++++---- src/ppp-manager/Makefile.am | 6 +++--- src/settings/Makefile.am | 6 +++--- src/supplicant-manager/Makefile.am | 8 ++++---- src/vpn-manager/Makefile.am | 6 +++--- src/wimax/Makefile.am | 3 +++ 10 files changed, 31 insertions(+), 28 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 7930c286b7..7310434515 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,10 +23,10 @@ endif SUBDIRS += . tests INCLUDES = -I${top_srcdir} \ - -I${top_srcdir}/include \ -I${top_builddir}/include \ - -I${top_srcdir}/src/generated \ + -I${top_srcdir}/include \ -I${top_builddir}/src/generated \ + -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging \ -I${top_srcdir}/src/posix-signals \ -I${top_srcdir}/src/dns-manager \ diff --git a/src/bluez-manager/Makefile.am b/src/bluez-manager/Makefile.am index 10b32d255d..63c6d3def2 100644 --- a/src/bluez-manager/Makefile.am +++ b/src/bluez-manager/Makefile.am @@ -1,12 +1,12 @@ 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}/libnm-util \ -I${top_srcdir}/src \ - -I${top_srcdir}/src/generated \ -I${top_builddir}/src/generated \ + -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging noinst_LTLIBRARIES = libbluez-manager.la diff --git a/src/dhcp-manager/Makefile.am b/src/dhcp-manager/Makefile.am index 11560fde83..6028670390 100644 --- a/src/dhcp-manager/Makefile.am +++ b/src/dhcp-manager/Makefile.am @@ -2,14 +2,14 @@ SUBDIRS=. tests INCLUDES = \ -I${top_srcdir} \ - -I${top_srcdir}/include \ -I${top_builddir}/include \ - -I${top_srcdir}/src/generated \ + -I${top_srcdir}/include \ -I${top_builddir}/src/generated \ + -I${top_srcdir}/src/generated \ -I${top_srcdir}/src/logging \ -I${top_srcdir}/src/posix-signals \ - -I${top_srcdir}/libnm-util \ -I${top_builddir}/libnm-util \ + -I${top_srcdir}/libnm-util \ -I${top_srcdir}/src noinst_LTLIBRARIES = libdhcp-manager.la libdhcp-dhclient.la diff --git a/src/ip6-manager/Makefile.am b/src/ip6-manager/Makefile.am index 016fc25dd6..be4b971342 100644 --- a/src/ip6-manager/Makefile.am +++ b/src/ip6-manager/Makefile.am @@ -1,11 +1,11 @@ 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 diff --git a/src/modem-manager/Makefile.am b/src/modem-manager/Makefile.am index a5c6a66817..b9cc764497 100644 --- a/src/modem-manager/Makefile.am +++ b/src/modem-manager/Makefile.am @@ -2,13 +2,13 @@ include $(GLIB_MAKEFILE) 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 = libmodem-manager.la diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am index 36e54ec931..9de581692b 100644 --- a/src/ppp-manager/Makefile.am +++ b/src/ppp-manager/Makefile.am @@ -1,12 +1,12 @@ 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}/libnm-util \ -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}/src/posix-signals diff --git a/src/settings/Makefile.am b/src/settings/Makefile.am index 8024d54142..eb6190bbcf 100644 --- a/src/settings/Makefile.am +++ b/src/settings/Makefile.am @@ -1,12 +1,12 @@ 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 diff --git a/src/supplicant-manager/Makefile.am b/src/supplicant-manager/Makefile.am index e8a2ce743e..1c24d0ef51 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/vpn-manager/Makefile.am b/src/vpn-manager/Makefile.am index 12e316d89f..06e04734ca 100644 --- a/src/vpn-manager/Makefile.am +++ b/src/vpn-manager/Makefile.am @@ -1,11 +1,11 @@ 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/posix-signals \ -I${top_srcdir}/src \ diff --git a/src/wimax/Makefile.am b/src/wimax/Makefile.am index 63c95dc71f..caf017d8ca 100644 --- a/src/wimax/Makefile.am +++ b/src/wimax/Makefile.am @@ -1,8 +1,11 @@ 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