mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-26 06:30:08 +01:00
build: fix srcdir != builddir
nm-version.h is in ${top_builddir}/include.
This commit is contained in:
parent
d4a6868735
commit
dab7dfaf35
29 changed files with 34 additions and 5 deletions
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
INCLUDES = \
|
||||
-I$(top_srcdir)/include \
|
||||
-I${top_builddir}/include \
|
||||
-I$(top_srcdir)/libnm-util \
|
||||
-I$(top_srcdir)/callouts
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
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) \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
INCLUDES = -I${top_srcdir}/include
|
||||
INCLUDES = -I${top_srcdir}/include \
|
||||
-I${top_builddir}/include
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
$(DBUS_CFLAGS) \
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ SUBDIRS=. tests
|
|||
|
||||
INCLUDES = \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_builddir)/include \
|
||||
-I$(top_srcdir)/libnm-util \
|
||||
-I$(top_builddir)/marshallers
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
INCLUDES = \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_builddir)/include \
|
||||
-I$(top_srcdir)/libnm-util \
|
||||
-I$(top_srcdir)/libnm-glib
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
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
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ SUBDIRS=certs
|
|||
|
||||
INCLUDES = \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_builddir)/include \
|
||||
-I$(top_srcdir)/libnm-util
|
||||
|
||||
noinst_PROGRAMS = \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
INCLUDES = \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_builddir)/include \
|
||||
-I${top_srcdir}/libnm-util \
|
||||
-I$(top_srcdir)/src/dhcp-manager
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
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 \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
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 \
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)/../
|
||||
|
|
|
|||
|
|
@ -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 = \
|
||||
|
|
|
|||
|
|
@ -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)/../
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
INCLUDES = \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_builddir)/include \
|
||||
-I$(top_srcdir)/libnm-util \
|
||||
-I$(top_srcdir)/src/settings
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
INCLUDES = \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_builddir)/include \
|
||||
-I$(top_srcdir)/libnm-util \
|
||||
-I$(top_srcdir)/src \
|
||||
-I$(top_srcdir)/src/supplicant-manager
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
INCLUDES = \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_builddir)/include \
|
||||
-I$(top_srcdir)/libnm-util \
|
||||
-I$(top_srcdir)/src/dhcp-manager \
|
||||
-I$(top_builddir)/marshallers \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
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 \
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
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) \
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue