Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
NetworkManager
NetworkManager
Commits
dab7dfaf
Commit
dab7dfaf
authored
Jan 08, 2012
by
Colin Walters
Committed by
Dan Williams
Jan 09, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build: fix srcdir != builddir
nm-version.h is in ${top_builddir}/include.
parent
d4a68687
Changes
29
Hide whitespace changes
Inline
Side-by-side
Showing
29 changed files
with
34 additions
and
5 deletions
+34
-5
callouts/Makefile.am
callouts/Makefile.am
+2
-0
callouts/tests/Makefile.am
callouts/tests/Makefile.am
+1
-0
cli/src/Makefile.am
cli/src/Makefile.am
+1
-0
examples/C/glib/Makefile.am
examples/C/glib/Makefile.am
+2
-1
examples/C/qt/Makefile.am
examples/C/qt/Makefile.am
+2
-1
libnm-glib/Makefile.am
libnm-glib/Makefile.am
+1
-0
libnm-glib/tests/Makefile.am
libnm-glib/tests/Makefile.am
+1
-0
libnm-util/Makefile.am
libnm-util/Makefile.am
+1
-1
libnm-util/tests/Makefile.am
libnm-util/tests/Makefile.am
+1
-0
src/Makefile.am
src/Makefile.am
+1
-0
src/backends/Makefile.am
src/backends/Makefile.am
+1
-0
src/bluez-manager/Makefile.am
src/bluez-manager/Makefile.am
+1
-0
src/dhcp-manager/Makefile.am
src/dhcp-manager/Makefile.am
+1
-0
src/dhcp-manager/tests/Makefile.am
src/dhcp-manager/tests/Makefile.am
+1
-0
src/dns-manager/Makefile.am
src/dns-manager/Makefile.am
+2
-1
src/ip6-manager/Makefile.am
src/ip6-manager/Makefile.am
+1
-0
src/modem-manager/Makefile.am
src/modem-manager/Makefile.am
+1
-0
src/ppp-manager/Makefile.am
src/ppp-manager/Makefile.am
+1
-0
src/settings/Makefile.am
src/settings/Makefile.am
+1
-0
src/settings/plugins/ifcfg-rh/Makefile.am
src/settings/plugins/ifcfg-rh/Makefile.am
+1
-0
src/settings/plugins/ifcfg-rh/tests/Makefile.am
src/settings/plugins/ifcfg-rh/tests/Makefile.am
+1
-0
src/settings/plugins/keyfile/Makefile.am
src/settings/plugins/keyfile/Makefile.am
+1
-0
src/settings/plugins/keyfile/tests/Makefile.am
src/settings/plugins/keyfile/tests/Makefile.am
+1
-0
src/settings/tests/Makefile.am
src/settings/tests/Makefile.am
+1
-0
src/supplicant-manager/Makefile.am
src/supplicant-manager/Makefile.am
+1
-0
src/supplicant-manager/tests/Makefile.am
src/supplicant-manager/tests/Makefile.am
+1
-0
src/tests/Makefile.am
src/tests/Makefile.am
+1
-0
src/vpn-manager/Makefile.am
src/vpn-manager/Makefile.am
+1
-0
test/Makefile.am
test/Makefile.am
+2
-1
No files found.
callouts/Makefile.am
View file @
dab7dfaf
...
...
@@ -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)
...
...
callouts/tests/Makefile.am
View file @
dab7dfaf
INCLUDES
=
\
-I
$(top_srcdir)
/include
\
-I
${top_builddir}
/include
\
-I
$(top_srcdir)
/libnm-util
\
-I
$(top_srcdir)
/callouts
...
...
cli/src/Makefile.am
View file @
dab7dfaf
...
...
@@ -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
...
...
examples/C/glib/Makefile.am
View file @
dab7dfaf
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)
\
...
...
examples/C/qt/Makefile.am
View file @
dab7dfaf
INCLUDES
=
-I
${top_srcdir}
/include
INCLUDES
=
-I
${top_srcdir}
/include
\
-I
${top_builddir}
/include
AM_CPPFLAGS
=
\
$(DBUS_CFLAGS)
\
...
...
libnm-glib/Makefile.am
View file @
dab7dfaf
...
...
@@ -2,6 +2,7 @@ SUBDIRS=. tests
INCLUDES
=
\
-I
$(top_srcdir)
/include
\
-I
$(top_builddir)
/include
\
-I
$(top_srcdir)
/libnm-util
\
-I
$(top_builddir)
/marshallers
...
...
libnm-glib/tests/Makefile.am
View file @
dab7dfaf
INCLUDES
=
\
-I
$(top_srcdir)
/include
\
-I
$(top_builddir)
/include
\
-I
$(top_srcdir)
/libnm-util
\
-I
$(top_srcdir)
/libnm-glib
...
...
libnm-util/Makefile.am
View file @
dab7dfaf
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
...
...
libnm-util/tests/Makefile.am
View file @
dab7dfaf
...
...
@@ -2,6 +2,7 @@ SUBDIRS=certs
INCLUDES
=
\
-I
$(top_srcdir)
/include
\
-I
$(top_builddir)
/include
\
-I
$(top_srcdir)
/libnm-util
noinst_PROGRAMS
=
\
...
...
src/Makefile.am
View file @
dab7dfaf
...
...
@@ -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
\
...
...
src/backends/Makefile.am
View file @
dab7dfaf
...
...
@@ -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
...
...
src/bluez-manager/Makefile.am
View file @
dab7dfaf
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
\
...
...
src/dhcp-manager/Makefile.am
View file @
dab7dfaf
...
...
@@ -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
\
...
...
src/dhcp-manager/tests/Makefile.am
View file @
dab7dfaf
INCLUDES
=
\
-I
$(top_srcdir)
/include
\
-I
$(top_builddir)
/include
\
-I
${top_srcdir}
/libnm-util
\
-I
$(top_srcdir)
/src/dhcp-manager
...
...
src/dns-manager/Makefile.am
View file @
dab7dfaf
...
...
@@ -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
...
...
src/ip6-manager/Makefile.am
View file @
dab7dfaf
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
\
...
...
src/modem-manager/Makefile.am
View file @
dab7dfaf
...
...
@@ -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
...
...
src/ppp-manager/Makefile.am
View file @
dab7dfaf
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
\
...
...
src/settings/Makefile.am
View file @
dab7dfaf
...
...
@@ -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
\
...
...
src/settings/plugins/ifcfg-rh/Makefile.am
View file @
dab7dfaf
...
...
@@ -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
...
...
src/settings/plugins/ifcfg-rh/tests/Makefile.am
View file @
dab7dfaf
...
...
@@ -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)
/../
...
...
src/settings/plugins/keyfile/Makefile.am
View file @
dab7dfaf
...
...
@@ -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
=
\
...
...
src/settings/plugins/keyfile/tests/Makefile.am
View file @
dab7dfaf
...
...
@@ -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)
/../
...
...
src/settings/tests/Makefile.am
View file @
dab7dfaf
INCLUDES
=
\
-I
$(top_srcdir)
/include
\
-I
$(top_builddir)
/include
\
-I
$(top_srcdir)
/libnm-util
\
-I
$(top_srcdir)
/src/settings
...
...
src/supplicant-manager/Makefile.am
View file @
dab7dfaf
...
...
@@ -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
...
...
src/supplicant-manager/tests/Makefile.am
View file @
dab7dfaf
INCLUDES
=
\
-I
$(top_srcdir)
/include
\
-I
$(top_builddir)
/include
\
-I
$(top_srcdir)
/libnm-util
\
-I
$(top_srcdir)
/src
\
-I
$(top_srcdir)
/src/supplicant-manager
...
...
src/tests/Makefile.am
View file @
dab7dfaf
INCLUDES
=
\
-I
$(top_srcdir)
/include
\
-I
$(top_builddir)
/include
\
-I
$(top_srcdir)
/libnm-util
\
-I
$(top_srcdir)
/src/dhcp-manager
\
-I
$(top_builddir)
/marshallers
\
...
...
src/vpn-manager/Makefile.am
View file @
dab7dfaf
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
\
...
...
test/Makefile.am
View file @
dab7dfaf
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)
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment