fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-04 02:30:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: fix srcdir != builddir for new generated headers

Browse source
This commit is contained in:
Colin Walters 2012-02-22 16:37:38 -05:00 • committed by Dan Williams
parent 7902787263
commit 74ec56d956
24 changed files with 38 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
callouts/Makefile.am
View file

@ -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)

1
callouts/tests/Makefile.am
View file

@ -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 = \

1
cli/src/Makefile.am
View file

@ -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 = \

1
examples/C/glib/Makefile.am
View file

@ -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

1
libnm-glib/Makefile.am
View file

@ -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 = \

1
libnm-glib/tests/Makefile.am
View file

@ -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

3
libnm-util/tests/Makefile.am
View file

@ -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 \

2
src/Makefile.am
View file

@ -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
###########################################

2
src/bluez-manager/Makefile.am
View file

@ -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

2
src/dhcp-manager/Makefile.am
View file

@ -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

1
src/dhcp-manager/tests/Makefile.am
View file

@ -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

1
src/dns-manager/Makefile.am
View file

@ -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

1
src/generated/Makefile.am
View file

@ -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 \

2
src/ip6-manager/Makefile.am
View file

@ -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

4
src/modem-manager/Makefile.am
View file

@ -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

2
src/ppp-manager/Makefile.am
View file

@ -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

2
src/settings/Makefile.am
View file

@ -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

3
src/settings/plugins/keyfile/Makefile.am
View file

@ -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 \

1
src/settings/plugins/keyfile/tests/Makefile.am
View file

@ -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)/../

4
src/supplicant-manager/Makefile.am
View file

@ -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

1
src/supplicant-manager/tests/Makefile.am
View file

@ -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

1
src/tests/Makefile.am
View file

@ -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 \

2
src/vpn-manager/Makefile.am
View file

@ -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 \

1
test/Makefile.am
View file

@ -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