colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: rename directory "include" to "shared"

Browse Source 
Up to now, the "include" directory contained (only) header files that were
used project-wide by libs, core, clients, et al.

Since the directory now also contains a non-header file, the "include"
name is misleading. Instead of adding yet another directory that is
project-wide, with non-header-only content, rename the "include"
directory to "shared".
This commit is contained in:
Thomas Haller
2015-12-22 12:18:22 +01:00
parent bc06dd9332
commit db80ec05ab
58 changed files with 107 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -137,7 +137,7 @@ test-*.trs
/examples/C/qt/list-connections /examples/C/qt/list-connections
/examples/C/qt/change-ipv4-addresses /examples/C/qt/change-ipv4-addresses
/include/nm-version-macros.h /shared/nm-version-macros.h
/introspection/all.xml /introspection/all.xml
/introspection/nmdbus-*.c /introspection/nmdbus-*.c

4
Makefile.am
View File

@@ -2,7 +2,7 @@ include $(GLIB_MAKEFILE)
SUBDIRS = \ SUBDIRS = \
. \ . \
include \ shared \
introspection \ introspection \
libnm-core \ libnm-core \
libnm \ libnm \
@@ -67,6 +67,6 @@ pkgconfig_DATA = NetworkManager.pc
CLEANFILES = cscope.in.out cscope.out cscope.po.out CLEANFILES = cscope.in.out cscope.out cscope.po.out
cscope: cscope:
cscope -b -q -R -Iinclude -ssrc -slibnm-core -slibnm -slibnm-glib -slibnm-util -sclients; cscope -b -q -R -sshared -ssrc -slibnm-core -slibnm -slibnm-glib -slibnm-util -sclients;
.PHONY: cscope .PHONY: cscope

4
callouts/Makefile.am
View File

@@ -1,8 +1,8 @@
SUBDIRS = . tests SUBDIRS = . tests
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I${top_srcdir}/include \ -I${top_srcdir}/shared \
-I${top_builddir}/include \ -I${top_builddir}/shared \
-I${top_srcdir}/libnm-core \ -I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \ -I${top_builddir}/libnm-core \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \

4
callouts/tests/Makefile.am
View File

@@ -1,8 +1,8 @@
if ENABLE_TESTS if ENABLE_TESTS
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
-I$(top_srcdir)/callouts \ -I$(top_srcdir)/callouts \

4
clients/Makefile.am
View File

@@ -1,8 +1,8 @@
SUBDIRS = cli tui SUBDIRS = cli tui
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I${top_srcdir}/include \ -I${top_srcdir}/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I${top_srcdir}/libnm-core \ -I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \ -I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm \ -I${top_srcdir}/libnm \

4
clients/cli/Makefile.am
View File

@@ -6,8 +6,8 @@ bin_PROGRAMS = \
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I${top_srcdir} \ -I${top_srcdir} \
-I${top_builddir} \ -I${top_builddir} \
-I${top_srcdir}/include \ -I${top_srcdir}/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I${top_srcdir}/libnm-core \ -I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \ -I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm \ -I${top_srcdir}/libnm \

4
clients/tui/Makefile.am
View File

@@ -4,8 +4,8 @@ SUBDIRS = newt .
AM_CPPFLAGS= \ AM_CPPFLAGS= \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
-I$(top_srcdir)/libnm \ -I$(top_srcdir)/libnm \

4
clients/tui/newt/Makefile.am
View File

@@ -1,6 +1,6 @@
AM_CPPFLAGS= \ AM_CPPFLAGS= \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
-DG_LOG_DOMAIN=\""nmtui"\" \ -DG_LOG_DOMAIN=\""nmtui"\" \

4
configure.ac
View File

@@ -1007,8 +1007,8 @@ AM_CONDITIONAL(SETTING_DOCS_AVAILABLE, test "$build_setting_docs" = "yes" -o "$h
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
include/Makefile shared/Makefile
include/nm-version-macros.h shared/nm-version-macros.h
src/Makefile src/Makefile
src/tests/Makefile src/tests/Makefile
src/tests/config/Makefile src/tests/config/Makefile

2
contrib/fedora/rpm/build_clean.sh
View File

@@ -76,7 +76,7 @@ fi
./autogen.sh --enable-gtk-doc || die "Error autogen.sh" ./autogen.sh --enable-gtk-doc || die "Error autogen.sh"
if [[ $QUICK == 1 ]]; then if [[ $QUICK == 1 ]]; then
make -C include || die "Error make -C include" make -C shared || die "Error make -C shared"
make -C introspection || die "Error make -C introspection" make -C introspection || die "Error make -C introspection"
make -C libnm-core || die "Error make -C libnm-core" make -C libnm-core || die "Error make -C libnm-core"
make -C libnm || die "Error make -C libnm" make -C libnm || die "Error make -C libnm"

4
docs/libnm-glib/Makefile.am
View File

@@ -53,8 +53,8 @@ extra_files = libnm-glib.png
# CFLAGS and LDFLAGS for compiling scan program. Only needed # CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty. # if $(DOC_MODULE).types is non-empty.
GTKDOC_CFLAGS = \ GTKDOC_CFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-util \ -I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \ -I$(top_builddir)/libnm-util \
-I$(top_srcdir)/libnm-glib \ -I$(top_srcdir)/libnm-glib \

4
examples/C/glib/Makefile.am
View File

@@ -1,6 +1,6 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I${top_srcdir}/include \ -I${top_srcdir}/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I${top_srcdir}/libnm-core \ -I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \ -I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm \ -I${top_srcdir}/libnm \

4
libnm-core/Makefile.am
View File

@@ -3,8 +3,8 @@ include $(GLIB_MAKEFILE)
SUBDIRS = . tests SUBDIRS = . tests
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I${top_srcdir}/include \ -I${top_srcdir}/shared \
-I${top_builddir}/include \ -I${top_builddir}/shared \
-DG_LOG_DOMAIN=\""libnm"\" \ -DG_LOG_DOMAIN=\""libnm"\" \
-DLOCALEDIR=\"$(datadir)/locale\" \ -DLOCALEDIR=\"$(datadir)/locale\" \
-DNMCONFDIR=\"$(nmconfdir)\" \ -DNMCONFDIR=\"$(nmconfdir)\" \

2
libnm-core/Makefile.libnm-core
View File

@@ -6,7 +6,7 @@ core = $(top_srcdir)/libnm-core
core_build = $(top_builddir)/libnm-core core_build = $(top_builddir)/libnm-core
libnm_core_headers = \ libnm_core_headers = \
$(top_builddir)/include/nm-version-macros.h \ $(top_builddir)/shared/nm-version-macros.h \
$(core_build)/nm-core-enum-types.h \ $(core_build)/nm-core-enum-types.h \
$(core)/nm-connection.h \ $(core)/nm-connection.h \
$(core)/nm-core-types.h \ $(core)/nm-core-types.h \

4
libnm-core/tests/Makefile.am
View File

@@ -12,8 +12,8 @@ if ENABLE_TESTS
certsdir = $(srcdir)/certs certsdir = $(srcdir)/certs
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I${top_srcdir}/include \ -I${top_srcdir}/shared \
-I${top_builddir}/include \ -I${top_builddir}/shared \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
-DNETWORKMANAGER_COMPILATION \ -DNETWORKMANAGER_COMPILATION \

4
libnm-glib/Makefile.am
View File

@@ -3,8 +3,8 @@ include $(GLIB_MAKEFILE)
SUBDIRS = . tests SUBDIRS = . tests
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-util \ -I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \ -I$(top_builddir)/libnm-util \
-DG_LOG_DOMAIN=\""libnm-glib"\" \ -DG_LOG_DOMAIN=\""libnm-glib"\" \

12
libnm-glib/tests/Makefile.am
View File

@@ -1,8 +1,8 @@
if ENABLE_TESTS if ENABLE_TESTS
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-util \ -I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \ -I$(top_builddir)/libnm-util \
-I$(top_srcdir)/libnm-glib \ -I$(top_srcdir)/libnm-glib \
@@ -24,8 +24,8 @@ TESTS = test-nm-client test-remote-settings-client
####### NMClient and non-settings tests ####### ####### NMClient and non-settings tests #######
test_nm_client_SOURCES = \ test_nm_client_SOURCES = \
$(top_builddir)/include/nm-test-utils-impl.c \ $(top_builddir)/shared/nm-test-utils-impl.c \
$(top_builddir)/include/nm-test-libnm-utils.h \ $(top_builddir)/shared/nm-test-libnm-utils.h \
test-nm-client.c test-nm-client.c
test_nm_client_LDADD = \ test_nm_client_LDADD = \
@@ -37,8 +37,8 @@ test_nm_client_LDADD = \
####### remote settings client test ####### ####### remote settings client test #######
test_remote_settings_client_SOURCES = \ test_remote_settings_client_SOURCES = \
$(top_builddir)/include/nm-test-utils-impl.c \ $(top_builddir)/shared/nm-test-utils-impl.c \
$(top_builddir)/include/nm-test-libnm-utils.h \ $(top_builddir)/shared/nm-test-libnm-utils.h \
test-remote-settings-client.c test-remote-settings-client.c
test_remote_settings_client_LDADD = \ test_remote_settings_client_LDADD = \

6
libnm-util/Makefile.am
View File

@@ -4,8 +4,8 @@ SUBDIRS = . tests
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I${top_srcdir} \ -I${top_srcdir} \
-I${top_srcdir}/include \ -I${top_srcdir}/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-DG_LOG_DOMAIN=\""libnm-util"\" \ -DG_LOG_DOMAIN=\""libnm-util"\" \
-DLOCALEDIR=\"$(datadir)/locale\" \ -DLOCALEDIR=\"$(datadir)/locale\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
@@ -25,7 +25,7 @@ endif
lib_LTLIBRARIES=libnm-util.la lib_LTLIBRARIES=libnm-util.la
libnm_util_include_HEADERS = \ libnm_util_include_HEADERS = \
$(top_builddir)/include/nm-version-macros.h \ $(top_builddir)/shared/nm-version-macros.h \
NetworkManager.h \ NetworkManager.h \
NetworkManagerVPN.h \ NetworkManagerVPN.h \
nm-connection.h \ nm-connection.h \

4
libnm-util/tests/Makefile.am
View File

@@ -1,8 +1,8 @@
if ENABLE_TESTS if ENABLE_TESTS
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-util \ -I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \ -I$(top_builddir)/libnm-util \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \

6
libnm/Makefile.am
View File

@@ -3,8 +3,8 @@ include $(GLIB_MAKEFILE)
SUBDIRS = . tests SUBDIRS = . tests
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I$(top_builddir)/introspection \ -I$(top_builddir)/introspection \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
@@ -26,7 +26,7 @@ lib_LTLIBRARIES = libnm.la
libnmincludedir = $(includedir)/libnm libnmincludedir = $(includedir)/libnm
libnminclude_hfiles = \ libnminclude_hfiles = \
$(top_builddir)/include/nm-version-macros.h \ $(top_builddir)/shared/nm-version-macros.h \
NetworkManager.h \ NetworkManager.h \
nm-access-point.h \ nm-access-point.h \
nm-active-connection.h \ nm-active-connection.h \

16
libnm/tests/Makefile.am
View File

@@ -1,8 +1,8 @@
if ENABLE_TESTS if ENABLE_TESTS
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm \ -I$(top_srcdir)/libnm \
-I$(top_builddir)/libnm \ -I$(top_builddir)/libnm \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
@@ -26,18 +26,18 @@ endif
TESTS = test-nm-client test-remote-settings-client test-secret-agent TESTS = test-nm-client test-remote-settings-client test-secret-agent
test_nm_client_SOURCES = \ test_nm_client_SOURCES = \
$(top_builddir)/include/nm-test-utils-impl.c \ $(top_builddir)/shared/nm-test-utils-impl.c \
$(top_builddir)/include/nm-test-libnm-utils.h \ $(top_builddir)/shared/nm-test-libnm-utils.h \
test-nm-client.c test-nm-client.c
test_remote_settings_client_SOURCES = \ test_remote_settings_client_SOURCES = \
$(top_builddir)/include/nm-test-utils-impl.c \ $(top_builddir)/shared/nm-test-utils-impl.c \
$(top_builddir)/include/nm-test-libnm-utils.h \ $(top_builddir)/shared/nm-test-libnm-utils.h \
test-remote-settings-client.c test-remote-settings-client.c
test_secret_agent_SOURCES = \ test_secret_agent_SOURCES = \
$(top_builddir)/include/nm-test-utils-impl.c \ $(top_builddir)/shared/nm-test-utils-impl.c \
$(top_builddir)/include/nm-test-libnm-utils.h \ $(top_builddir)/shared/nm-test-libnm-utils.h \
test-secret-agent.c test-secret-agent.c
endif endif

0
include/Makefile.am → shared/Makefile.am
View File

0
include/gsystem-local-alloc.h → shared/gsystem-local-alloc.h
View File

0
include/nm-dbus-compat.h → shared/nm-dbus-compat.h
View File

0
include/nm-default.h → shared/nm-default.h
View File

0
include/nm-glib.h → shared/nm-glib.h
View File

0
include/nm-macros-internal.h → shared/nm-macros-internal.h
View File

0
include/nm-test-libnm-utils.h → shared/nm-test-libnm-utils.h
View File

0
include/nm-test-utils-impl.c → shared/nm-test-utils-impl.c
View File

0
include/nm-test-utils.h → shared/nm-test-utils.h
View File

0
include/nm-version-macros.h.in → shared/nm-version-macros.h.in
View File

8
src/Makefile.am
View File

@@ -33,8 +33,8 @@ SUBDIRS += \
endif endif
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I$(top_builddir)/introspection \ -I$(top_builddir)/introspection \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
@@ -173,8 +173,8 @@ libsystemd_nm_la_SOURCES = \
systemd/src/systemd/sd-ndisc.h systemd/src/systemd/sd-ndisc.h
libsystemd_nm_la_CPPFLAGS = \ libsystemd_nm_la_CPPFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
$(SYSTEMD_NM_CFLAGS_PATHS) \ $(SYSTEMD_NM_CFLAGS_PATHS) \

4
src/devices/adsl/Makefile.am
View File

@@ -8,8 +8,8 @@ AM_CPPFLAGS = \
-I${top_srcdir}/src/devices \ -I${top_srcdir}/src/devices \
-I${top_srcdir}/src/platform \ -I${top_srcdir}/src/platform \
-I${top_builddir}/introspection \ -I${top_builddir}/introspection \
-I${top_srcdir}/include \ -I${top_srcdir}/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I${top_builddir}/libnm-core \ -I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm-core \ -I${top_srcdir}/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager-adsl"\" \ -DG_LOG_DOMAIN=\""NetworkManager-adsl"\" \

4
src/devices/bluetooth/Makefile.am
View File

@@ -10,8 +10,8 @@ AM_CPPFLAGS = \
-I${top_srcdir}/src/platform \ -I${top_srcdir}/src/platform \
-I${top_srcdir}/src/devices/wwan \ -I${top_srcdir}/src/devices/wwan \
-I${top_builddir}/introspection \ -I${top_builddir}/introspection \
-I${top_srcdir}/include \ -I${top_srcdir}/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I${top_builddir}/libnm-core \ -I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm-core \ -I${top_srcdir}/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager-bluetooth"\" \ -DG_LOG_DOMAIN=\""NetworkManager-bluetooth"\" \

4
src/devices/team/Makefile.am
View File

@@ -8,8 +8,8 @@ AM_CPPFLAGS = \
-I${top_srcdir}/src/devices \ -I${top_srcdir}/src/devices \
-I${top_srcdir}/src/platform \ -I${top_srcdir}/src/platform \
-I${top_builddir}/introspection \ -I${top_builddir}/introspection \
-I${top_srcdir}/include \ -I${top_srcdir}/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I${top_builddir}/libnm-core \ -I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm-core \ -I${top_srcdir}/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager-team"\" \ -DG_LOG_DOMAIN=\""NetworkManager-team"\" \

4
src/devices/tests/Makefile.am
View File

@@ -1,6 +1,6 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src/platform \ -I$(top_srcdir)/src/platform \

4
src/devices/wifi/Makefile.am
View File

@@ -14,8 +14,8 @@ AM_CPPFLAGS = \
-I${top_srcdir}/src/platform \ -I${top_srcdir}/src/platform \
-I${top_srcdir}/src/supplicant-manager \ -I${top_srcdir}/src/supplicant-manager \
-I${top_builddir}/introspection \ -I${top_builddir}/introspection \
-I${top_srcdir}/include \ -I${top_srcdir}/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I${top_builddir}/libnm-core \ -I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm-core \ -I${top_srcdir}/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager-wifi"\" \ -DG_LOG_DOMAIN=\""NetworkManager-wifi"\" \

4
src/devices/wifi/tests/Makefile.am
View File

@@ -1,7 +1,7 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_builddir)/introspection \ -I$(top_builddir)/introspection \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
-I${top_srcdir}/src/platform \ -I${top_srcdir}/src/platform \

4
src/devices/wwan/Makefile.am
View File

@@ -9,8 +9,8 @@ AM_CPPFLAGS = \
-I${top_srcdir}/src/settings \ -I${top_srcdir}/src/settings \
-I${top_srcdir}/src/platform \ -I${top_srcdir}/src/platform \
-I${top_builddir}/introspection \ -I${top_builddir}/introspection \
-I${top_srcdir}/include \ -I${top_srcdir}/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I${top_srcdir}/libnm-core \ -I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \ -I${top_builddir}/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager-wwan"\" \ -DG_LOG_DOMAIN=\""NetworkManager-wwan"\" \

4
src/dhcp-manager/Makefile.am
View File

@@ -4,8 +4,8 @@ nm_dhcp_helper_SOURCES = nm-dhcp-helper.c
nm_dhcp_helper_CPPFLAGS = \ nm_dhcp_helper_CPPFLAGS = \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I${top_builddir}/include \ -I${top_builddir}/shared \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
-DG_LOG_DOMAIN=\""nm-dhcp-helper"\" \ -DG_LOG_DOMAIN=\""nm-dhcp-helper"\" \

4
src/dhcp-manager/tests/Makefile.am
View File

@@ -1,6 +1,6 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I${top_builddir}/include \ -I${top_builddir}/shared \
-I${top_srcdir}/libnm-core \ -I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \ -I${top_builddir}/libnm-core \
-I$(top_srcdir)/src/dhcp-manager \ -I$(top_srcdir)/src/dhcp-manager \

4
src/dnsmasq-manager/tests/Makefile.am
View File

@@ -1,6 +1,6 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I${top_builddir}/include \ -I${top_builddir}/shared \
-I${top_srcdir}/libnm-core \ -I${top_srcdir}/libnm-core \
-I${top_builddir}/libnm-core \ -I${top_builddir}/libnm-core \
-I$(top_srcdir)/src/dnsmasq-manager \ -I$(top_srcdir)/src/dnsmasq-manager \

4
src/platform/tests/Makefile.am
View File

@@ -1,7 +1,7 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I${top_srcdir} \ -I${top_srcdir} \
-I${top_srcdir}/include \ -I${top_srcdir}/shared \
-I${top_builddir}/include \ -I${top_builddir}/shared \
-I${top_srcdir}/src \ -I${top_srcdir}/src \
-I${top_builddir}/src \ -I${top_builddir}/src \
-I${top_srcdir}/libnm-core \ -I${top_srcdir}/libnm-core \

4
src/ppp-manager/Makefile.am
View File

@@ -1,8 +1,8 @@
if WITH_PPP if WITH_PPP
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I${top_srcdir}/include \ -I${top_srcdir}/shared \
-I${top_builddir}/include \ -I${top_builddir}/shared \
-I${top_srcdir}/libnm-core \ -I${top_srcdir}/libnm-core \
-I${top_srcdir}/src \ -I${top_srcdir}/src \
-I${top_builddir}/libnm-core \ -I${top_builddir}/libnm-core \

4
src/rdisc/tests/Makefile.am
View File

@@ -1,7 +1,7 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I${top_srcdir} \ -I${top_srcdir} \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I${top_srcdir}/src \ -I${top_srcdir}/src \
-I${top_srcdir}/src/platform \ -I${top_srcdir}/src/platform \
-I${top_srcdir}/libnm-core \ -I${top_srcdir}/libnm-core \

4
src/settings/plugins/ibft/Makefile.am
View File

@@ -14,8 +14,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/ \ -I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/platform \ -I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings \ -I$(top_srcdir)/src/settings \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \

4
src/settings/plugins/ibft/tests/Makefile.am
View File

@@ -5,8 +5,8 @@ if ENABLE_TESTS
AM_CPPFLAGS = \ AM_CPPFLAGS = \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(CODE_COVERAGE_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src/ \ -I$(top_srcdir)/src/ \

4
src/settings/plugins/ifcfg-rh/Makefile.am
View File

@@ -43,8 +43,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/ \ -I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/platform \ -I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings \ -I$(top_srcdir)/src/settings \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \

4
src/settings/plugins/ifcfg-rh/tests/Makefile.am
View File

@@ -7,8 +7,8 @@ SUBDIRS=network-scripts
AM_CPPFLAGS = \ AM_CPPFLAGS = \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(CODE_COVERAGE_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src/ \ -I$(top_srcdir)/src/ \

4
src/settings/plugins/ifnet/Makefile.am
View File

@@ -6,8 +6,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/platform \ -I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings \ -I$(top_srcdir)/src/settings \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager-ifnet"\" \ -DG_LOG_DOMAIN=\""NetworkManager-ifnet"\" \

4
src/settings/plugins/ifnet/tests/Makefile.am
View File

@@ -4,8 +4,8 @@ if ENABLE_TESTS
AM_CPPFLAGS= \ AM_CPPFLAGS= \
-I$(srcdir)/../ \ -I$(srcdir)/../ \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \

4
src/settings/plugins/ifupdown/Makefile.am
View File

@@ -5,8 +5,8 @@ SUBDIRS = . tests
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/settings \ -I$(top_srcdir)/src/settings \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager-ifupdown"\" \ -DG_LOG_DOMAIN=\""NetworkManager-ifupdown"\" \

4
src/settings/plugins/ifupdown/tests/Makefile.am
View File

@@ -1,8 +1,8 @@
if ENABLE_TESTS if ENABLE_TESTS
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \

4
src/settings/plugins/keyfile/Makefile.am
View File

@@ -5,8 +5,8 @@ SUBDIRS = . tests
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/settings \ -I$(top_srcdir)/src/settings \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager-keyfile"\" \ -DG_LOG_DOMAIN=\""NetworkManager-keyfile"\" \

4
src/settings/plugins/keyfile/tests/Makefile.am
View File

@@ -5,8 +5,8 @@ SUBDIRS=keyfiles
@GNOME_CODE_COVERAGE_RULES@ @GNOME_CODE_COVERAGE_RULES@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \

4
src/supplicant-manager/tests/Makefile.am
View File

@@ -1,8 +1,8 @@
SUBDIRS=certs SUBDIRS=certs
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \

4
src/tests/Makefile.am
View File

@@ -1,8 +1,8 @@
SUBDIRS = config SUBDIRS = config
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src/platform \ -I$(top_srcdir)/src/platform \

4
src/tests/config/Makefile.am
View File

@@ -1,6 +1,6 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/shared \
-I$(top_builddir)/include \ -I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src/ \ -I$(top_srcdir)/src/ \