From 3b12f65e888a69f74dee291344eb636997111222 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 22 Feb 2012 16:37:38 -0500 Subject: [PATCH] build: Fix srcdir != builddir for new generated headers --- callouts/Makefile.am | 2 ++ callouts/tests/Makefile.am | 1 + cli/src/Makefile.am | 1 + examples/C/glib/Makefile.am | 1 + libnm-glib/Makefile.am | 1 + libnm-glib/tests/Makefile.am | 1 + libnm-util/tests/Makefile.am | 3 ++- src/Makefile.am | 2 ++ src/bluez-manager/Makefile.am | 2 ++ src/dhcp-manager/Makefile.am | 2 ++ src/dhcp-manager/tests/Makefile.am | 1 + src/dns-manager/Makefile.am | 1 + src/generated/Makefile.am | 1 + src/ip6-manager/Makefile.am | 2 ++ src/modem-manager/Makefile.am | 4 +++- src/ppp-manager/Makefile.am | 2 ++ src/settings/Makefile.am | 2 ++ src/settings/plugins/keyfile/Makefile.am | 3 ++- src/settings/plugins/keyfile/tests/Makefile.am | 1 + src/supplicant-manager/Makefile.am | 4 +++- src/supplicant-manager/tests/Makefile.am | 1 + src/tests/Makefile.am | 1 + src/vpn-manager/Makefile.am | 2 ++ test/Makefile.am | 1 + 24 files changed, 38 insertions(+), 4 deletions(-) diff --git a/callouts/Makefile.am b/callouts/Makefile.am index a3a2d26..6162785 100644 --- a/callouts/Makefile.am +++ b/callouts/Makefile.am @@ -60,6 +60,7 @@ nm_dispatcher_action_CPPFLAGS = \ -I${top_srcdir}/include \ -I${top_builddir}/include \ -I${top_srcdir}/libnm-util \ + -I${top_builddir}/libnm-util \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) \ -DG_DISABLE_DEPRECATED \ @@ -86,6 +87,7 @@ libtest_dispatcher_envp_la_CPPFLAGS = \ -I${top_srcdir}/include \ -I${top_builddir}/include \ -I${top_srcdir}/libnm-util \ + -I${top_builddir}/libnm-util \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) diff --git a/callouts/tests/Makefile.am b/callouts/tests/Makefile.am index 7121b92..93d3fae 100644 --- a/callouts/tests/Makefile.am +++ b/callouts/tests/Makefile.am @@ -2,6 +2,7 @@ INCLUDES = \ -I$(top_srcdir)/include \ -I${top_builddir}/include \ -I$(top_srcdir)/libnm-util \ + -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/callouts noinst_PROGRAMS = \ diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am index 742bf0f..ec62bfe 100644 --- a/cli/src/Makefile.am +++ b/cli/src/Makefile.am @@ -6,6 +6,7 @@ INCLUDES = \ -I${top_srcdir}/include \ -I${top_builddir}/include \ -I${top_srcdir}/libnm-util \ + -I${top_builddir}/libnm-util \ -I${top_srcdir}/libnm-glib nmcli_SOURCES = \ diff --git a/examples/C/glib/Makefile.am b/examples/C/glib/Makefile.am index a8821a9..428f6ad 100644 --- a/examples/C/glib/Makefile.am +++ b/examples/C/glib/Makefile.am @@ -1,4 +1,5 @@ INCLUDES = -I${top_srcdir}/libnm-util \ + -I${top_builddir}/libnm-util \ -I${top_srcdir}/libnm-glib \ -I${top_srcdir}/include \ -I${top_builddir}/include diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am index 0e9c0bd..5abd01a 100644 --- a/libnm-glib/Makefile.am +++ b/libnm-glib/Makefile.am @@ -6,6 +6,7 @@ INCLUDES = \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ + -I$(top_builddir)/libnm-util \ -I$(top_builddir)/marshallers BUILT_SOURCES = \ diff --git a/libnm-glib/tests/Makefile.am b/libnm-glib/tests/Makefile.am index 1564c59..0dba079 100644 --- a/libnm-glib/tests/Makefile.am +++ b/libnm-glib/tests/Makefile.am @@ -2,6 +2,7 @@ INCLUDES = \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ + -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/libnm-glib noinst_PROGRAMS = test-remote-settings-client diff --git a/libnm-util/tests/Makefile.am b/libnm-util/tests/Makefile.am index a3e12c3..46a4d14 100644 --- a/libnm-util/tests/Makefile.am +++ b/libnm-util/tests/Makefile.am @@ -3,7 +3,8 @@ SUBDIRS=certs INCLUDES = \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ - -I$(top_srcdir)/libnm-util + -I$(top_srcdir)/libnm-util \ + -I$(top_builddir)/libnm-util noinst_PROGRAMS = \ test-settings-defaults \ diff --git a/src/Makefile.am b/src/Makefile.am index 4112c73..c814e0a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,6 +24,7 @@ INCLUDES = -I${top_srcdir} \ -I${top_srcdir}/include \ -I${top_builddir}/include \ -I${top_srcdir}/src/generated \ + -I${top_builddir}/src/generated \ -I${top_srcdir}/src/logging \ -I${top_srcdir}/src/dns-manager \ -I${top_srcdir}/src/vpn-manager \ @@ -36,6 +37,7 @@ INCLUDES = -I${top_srcdir} \ -I$(top_srcdir)/src/firewall-manager \ -I$(top_srcdir)/src/settings \ -I${top_srcdir}/libnm-util \ + -I${top_builddir}/libnm-util \ -I${top_srcdir}/callouts ########################################### diff --git a/src/bluez-manager/Makefile.am b/src/bluez-manager/Makefile.am index 7bf00bd..10b32d2 100644 --- a/src/bluez-manager/Makefile.am +++ b/src/bluez-manager/Makefile.am @@ -3,8 +3,10 @@ INCLUDES = \ -I${top_srcdir}/include \ -I${top_builddir}/include \ -I${top_srcdir}/libnm-util \ + -I${top_builddir}/libnm-util \ -I${top_srcdir}/src \ -I${top_srcdir}/src/generated \ + -I${top_builddir}/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 fcea82e..ce34c41 100644 --- a/src/dhcp-manager/Makefile.am +++ b/src/dhcp-manager/Makefile.am @@ -5,8 +5,10 @@ INCLUDES = \ -I${top_srcdir}/include \ -I${top_builddir}/include \ -I${top_srcdir}/src/generated \ + -I${top_builddir}/src/generated \ -I${top_srcdir}/src/logging \ -I${top_srcdir}/libnm-util \ + -I${top_builddir}/libnm-util \ -I${top_srcdir}/src noinst_LTLIBRARIES = libdhcp-manager.la libdhcp-dhclient.la diff --git a/src/dhcp-manager/tests/Makefile.am b/src/dhcp-manager/tests/Makefile.am index d1b3c84..1feade8 100644 --- a/src/dhcp-manager/tests/Makefile.am +++ b/src/dhcp-manager/tests/Makefile.am @@ -2,6 +2,7 @@ INCLUDES = \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ -I${top_srcdir}/libnm-util \ + -I${top_builddir}/libnm-util \ -I$(top_srcdir)/src/dhcp-manager noinst_PROGRAMS = test-dhcp-dhclient diff --git a/src/dns-manager/Makefile.am b/src/dns-manager/Makefile.am index def8fe6..331f85c 100644 --- a/src/dns-manager/Makefile.am +++ b/src/dns-manager/Makefile.am @@ -1,6 +1,7 @@ INCLUDES = \ -I${top_srcdir}/src/logging \ -I${top_srcdir}/libnm-util \ + -I${top_builddir}/libnm-util \ -I${top_srcdir}/src \ -I${top_srcdir}/include \ -I${top_builddir}/include diff --git a/src/generated/Makefile.am b/src/generated/Makefile.am index 29e1525..83c867a 100644 --- a/src/generated/Makefile.am +++ b/src/generated/Makefile.am @@ -41,6 +41,7 @@ nm_marshal_sources = $(nm_daemon_sources) INCLUDES = \ -I${top_srcdir}/include \ + -I${top_builddir}/include \ -I${top_srcdir}/src \ -I${top_srcdir}/src/logging \ -I${top_srcdir}/src/dns-manager \ diff --git a/src/ip6-manager/Makefile.am b/src/ip6-manager/Makefile.am index fd3e929..016fc25 100644 --- a/src/ip6-manager/Makefile.am +++ b/src/ip6-manager/Makefile.am @@ -3,7 +3,9 @@ INCLUDES = \ -I${top_srcdir}/include \ -I${top_builddir}/include \ -I${top_srcdir}/libnm-util \ + -I${top_builddir}/libnm-util \ -I${top_srcdir}/src/generated \ + -I${top_builddir}/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 ad83e03..a5c6a66 100644 --- a/src/modem-manager/Makefile.am +++ b/src/modem-manager/Makefile.am @@ -3,10 +3,12 @@ include $(GLIB_MAKEFILE) INCLUDES = \ -I${top_srcdir}/src \ -I${top_srcdir}/src/generated \ + -I${top_builddir}/src/generated \ -I${top_srcdir}/src/logging \ -I${top_srcdir}/include \ -I${top_builddir}/include \ - -I${top_srcdir}/libnm-util + -I${top_srcdir}/libnm-util \ + -I${top_builddir}/libnm-util noinst_LTLIBRARIES = libmodem-manager.la diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am index 6eb77ef..8df2f58 100644 --- a/src/ppp-manager/Makefile.am +++ b/src/ppp-manager/Makefile.am @@ -3,8 +3,10 @@ INCLUDES = \ -I${top_srcdir}/include \ -I${top_builddir}/include \ -I${top_srcdir}/libnm-util \ + -I${top_builddir}/libnm-util \ -I${top_srcdir}/src \ -I${top_srcdir}/src/generated \ + -I${top_builddir}/src/generated \ -I${top_srcdir}/src/logging noinst_LTLIBRARIES = libppp-manager.la diff --git a/src/settings/Makefile.am b/src/settings/Makefile.am index 8094ac1..8024d54 100644 --- a/src/settings/Makefile.am +++ b/src/settings/Makefile.am @@ -4,7 +4,9 @@ INCLUDES = -I${top_srcdir} \ -I${top_srcdir}/include \ -I${top_builddir}/include \ -I${top_srcdir}/libnm-util \ + -I${top_builddir}/libnm-util \ -I${top_srcdir}/src/generated \ + -I${top_builddir}/src/generated \ -I${top_srcdir}/src/logging \ -I${top_srcdir}/src diff --git a/src/settings/plugins/keyfile/Makefile.am b/src/settings/plugins/keyfile/Makefile.am index e074873..e6af222 100644 --- a/src/settings/plugins/keyfile/Makefile.am +++ b/src/settings/plugins/keyfile/Makefile.am @@ -4,7 +4,8 @@ INCLUDES = \ -I$(top_srcdir)/src/settings \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ - -I$(top_srcdir)/libnm-util + -I$(top_srcdir)/libnm-util \ + -I$(top_builddir)/libnm-util noinst_LTLIBRARIES = \ libkeyfile-io.la \ diff --git a/src/settings/plugins/keyfile/tests/Makefile.am b/src/settings/plugins/keyfile/tests/Makefile.am index 90bc233..2adbf87 100644 --- a/src/settings/plugins/keyfile/tests/Makefile.am +++ b/src/settings/plugins/keyfile/tests/Makefile.am @@ -4,6 +4,7 @@ INCLUDES = \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ + -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/libnm-glib \ -I$(srcdir)/../ diff --git a/src/supplicant-manager/Makefile.am b/src/supplicant-manager/Makefile.am index 1c887b1..e8a2ce7 100644 --- a/src/supplicant-manager/Makefile.am +++ b/src/supplicant-manager/Makefile.am @@ -3,10 +3,12 @@ SUBDIRS=. tests INCLUDES = \ -I${top_srcdir}/src \ -I${top_srcdir}/src/generated \ + -I${top_builddir}/src/generated \ -I${top_srcdir}/src/logging \ -I${top_srcdir}/include \ -I${top_builddir}/include \ - -I${top_srcdir}/libnm-util + -I${top_srcdir}/libnm-util \ + -I${top_builddir}/libnm-util noinst_LTLIBRARIES = libsupplicant-manager.la diff --git a/src/supplicant-manager/tests/Makefile.am b/src/supplicant-manager/tests/Makefile.am index b236025..47ae66c 100644 --- a/src/supplicant-manager/tests/Makefile.am +++ b/src/supplicant-manager/tests/Makefile.am @@ -2,6 +2,7 @@ INCLUDES = \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ + -I$(top_builddir)/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 38a8d22..9048704 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -2,6 +2,7 @@ INCLUDES = \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ -I$(top_srcdir)/libnm-util \ + -I$(top_builddir)/libnm-util \ -I$(top_srcdir)/src/dhcp-manager \ -I$(top_builddir)/marshallers \ -I$(top_srcdir)/src \ diff --git a/src/vpn-manager/Makefile.am b/src/vpn-manager/Makefile.am index fdc4c89..c3c5b52 100644 --- a/src/vpn-manager/Makefile.am +++ b/src/vpn-manager/Makefile.am @@ -3,7 +3,9 @@ INCLUDES = \ -I${top_srcdir}/include \ -I${top_builddir}/include \ -I${top_srcdir}/libnm-util \ + -I${top_builddir}/libnm-util \ -I${top_srcdir}/src/generated \ + -I${top_builddir}/src/generated \ -I${top_srcdir}/src/logging \ -I${top_srcdir}/src \ -I${top_srcdir}/src/dns-manager \ diff --git a/test/Makefile.am b/test/Makefile.am index 952f8e7..b628536 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,5 +1,6 @@ INCLUDES = -I${top_srcdir} \ -I${top_srcdir}/libnm-util \ + -I${top_builddir}/libnm-util \ -I${top_srcdir}/libnm-glib \ -I${top_srcdir}/include \ -I${top_builddir}/include -- 1.7.6.5