build: rename directory "include" to "shared"

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".

diff --git a/.gitignore b/.gitignore
index 6629338..d6c22ae 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -137,7 +137,7 @@ test-*.trs
 /examples/C/qt/list-connections
 /examples/C/qt/change-ipv4-addresses
 
-/include/nm-version-macros.h
+/shared/nm-version-macros.h
 
 /introspection/all.xml
 /introspection/nmdbus-*.c

diff --git a/Makefile.am b/Makefile.am
index 00e703c..a79bddc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ include $(GLIB_MAKEFILE)
 
 SUBDIRS = \
        . \
-       include \
+       shared \
        introspection \
        libnm-core \
        libnm \
@@ -67,6 +67,6 @@ pkgconfig_DATA = NetworkManager.pc
 CLEANFILES = cscope.in.out cscope.out cscope.po.out
 
 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

diff --git a/callouts/Makefile.am b/callouts/Makefile.am
index 3708aeb..6440a4d 100644 (file)
--- a/callouts/Makefile.am
+++ b/callouts/Makefile.am
@@ -1,8 +1,8 @@
 SUBDIRS = . tests
 
 AM_CPPFLAGS = \
-       -I${top_srcdir}/include \
-       -I${top_builddir}/include \
+       -I${top_srcdir}/shared \
+       -I${top_builddir}/shared \
        -I${top_srcdir}/libnm-core \
        -I${top_builddir}/libnm-core \
        $(GLIB_CFLAGS) \

diff --git a/callouts/tests/Makefile.am b/callouts/tests/Makefile.am
index 30b73b1..ee3f647 100644 (file)
--- a/callouts/tests/Makefile.am
+++ b/callouts/tests/Makefile.am
@@ -1,8 +1,8 @@
 if ENABLE_TESTS
 
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
+       -I$(top_srcdir)/shared \
+       -I$(top_builddir)/shared \
        -I$(top_srcdir)/libnm-core \
        -I$(top_builddir)/libnm-core \
        -I$(top_srcdir)/callouts \

diff --git a/clients/Makefile.am b/clients/Makefile.am
index 8316dcc..9c30eea 100644 (file)
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -1,8 +1,8 @@
 SUBDIRS = cli tui
 
 AM_CPPFLAGS = \
-       -I${top_srcdir}/include \
-       -I$(top_builddir)/include \
+       -I${top_srcdir}/shared \
+       -I$(top_builddir)/shared \
        -I${top_srcdir}/libnm-core \
        -I${top_builddir}/libnm-core \
        -I${top_srcdir}/libnm \

diff --git a/clients/cli/Makefile.am b/clients/cli/Makefile.am
index 192920e..dfcb1e9 100644 (file)
--- a/clients/cli/Makefile.am
+++ b/clients/cli/Makefile.am
@@ -6,8 +6,8 @@ bin_PROGRAMS = \
 AM_CPPFLAGS = \
        -I${top_srcdir} \
        -I${top_builddir} \
-       -I${top_srcdir}/include \
-       -I$(top_builddir)/include \
+       -I${top_srcdir}/shared \
+       -I$(top_builddir)/shared \
        -I${top_srcdir}/libnm-core \
        -I${top_builddir}/libnm-core \
        -I${top_srcdir}/libnm \

diff --git a/clients/tui/Makefile.am b/clients/tui/Makefile.am
index 305f08b..ba2bbcd 100644 (file)
--- a/clients/tui/Makefile.am
+++ b/clients/tui/Makefile.am
@@ -4,8 +4,8 @@ SUBDIRS = newt .
 
 AM_CPPFLAGS= \
        -I$(top_srcdir) \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
+       -I$(top_srcdir)/shared \
+       -I$(top_builddir)/shared \
        -I$(top_srcdir)/libnm-core \
        -I$(top_builddir)/libnm-core \
        -I$(top_srcdir)/libnm \

diff --git a/clients/tui/newt/Makefile.am b/clients/tui/newt/Makefile.am
index 9413e96..e07f9be 100644 (file)
--- a/clients/tui/newt/Makefile.am
+++ b/clients/tui/newt/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS= \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
+       -I$(top_srcdir)/shared \
+       -I$(top_builddir)/shared \
        -I$(top_srcdir)/libnm-core \
        -I$(top_builddir)/libnm-core \
        -DG_LOG_DOMAIN=\""nmtui"\" \

diff --git a/configure.ac b/configure.ac
index c2c48d2..63f2db1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1007,8 +1007,8 @@ AM_CONDITIONAL(SETTING_DOCS_AVAILABLE, test "$build_setting_docs" = "yes" -o "$h
 
 AC_CONFIG_FILES([
 Makefile
-include/Makefile
-include/nm-version-macros.h
+shared/Makefile
+shared/nm-version-macros.h
 src/Makefile
 src/tests/Makefile
 src/tests/config/Makefile

diff --git a/contrib/fedora/rpm/build_clean.sh b/contrib/fedora/rpm/build_clean.sh
index b57b709..8b09868 100755 (executable)
--- a/contrib/fedora/rpm/build_clean.sh
+++ b/contrib/fedora/rpm/build_clean.sh
@@ -76,7 +76,7 @@ fi
 ./autogen.sh --enable-gtk-doc || die "Error autogen.sh"
 
 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 libnm-core || die "Error make -C libnm-core"
     make -C libnm || die "Error make -C libnm"

diff --git a/docs/libnm-glib/Makefile.am b/docs/libnm-glib/Makefile.am
index 2d78856..c38e6e3 100644 (file)
--- a/docs/libnm-glib/Makefile.am
+++ b/docs/libnm-glib/Makefile.am
@@ -53,8 +53,8 @@ extra_files = libnm-glib.png
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
 GTKDOC_CFLAGS =                                \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
+       -I$(top_srcdir)/shared  \
+       -I$(top_builddir)/shared \
        -I$(top_srcdir)/libnm-util      \
        -I$(top_builddir)/libnm-util    \
        -I$(top_srcdir)/libnm-glib      \

diff --git a/examples/C/glib/Makefile.am b/examples/C/glib/Makefile.am
index 4b03d87..3e442c3 100644 (file)
--- a/examples/C/glib/Makefile.am
+++ b/examples/C/glib/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = \
-       -I${top_srcdir}/include \
-       -I$(top_builddir)/include \
+       -I${top_srcdir}/shared \
+       -I$(top_builddir)/shared \
        -I${top_srcdir}/libnm-core \
        -I${top_builddir}/libnm-core \
        -I${top_srcdir}/libnm \

diff --git a/libnm-core/Makefile.am b/libnm-core/Makefile.am
index 55ed2f6..527a1c2 100644 (file)
--- a/libnm-core/Makefile.am
+++ b/libnm-core/Makefile.am
@@ -3,8 +3,8 @@ include $(GLIB_MAKEFILE)
 SUBDIRS = . tests
 
 AM_CPPFLAGS = \
-       -I${top_srcdir}/include \
-       -I${top_builddir}/include \
+       -I${top_srcdir}/shared \
+       -I${top_builddir}/shared \
        -DG_LOG_DOMAIN=\""libnm"\" \
        -DLOCALEDIR=\"$(datadir)/locale\" \
        -DNMCONFDIR=\"$(nmconfdir)\" \

diff --git a/libnm-core/Makefile.libnm-core b/libnm-core/Makefile.libnm-core
index df21929..fe8cc8a 100644 (file)
--- a/libnm-core/Makefile.libnm-core
+++ b/libnm-core/Makefile.libnm-core
@@ -6,7 +6,7 @@ core = $(top_srcdir)/libnm-core
 core_build = $(top_builddir)/libnm-core
 
 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)/nm-connection.h                 \
        $(core)/nm-core-types.h                 \

diff --git a/libnm-core/tests/Makefile.am b/libnm-core/tests/Makefile.am
index 9949241..92c816f 100644 (file)
--- a/libnm-core/tests/Makefile.am
+++ b/libnm-core/tests/Makefile.am
@@ -12,8 +12,8 @@ if ENABLE_TESTS
 certsdir = $(srcdir)/certs
 
 AM_CPPFLAGS = \
-       -I${top_srcdir}/include \
-       -I${top_builddir}/include \
+       -I${top_srcdir}/shared \
+       -I${top_builddir}/shared \
        -I$(top_srcdir)/libnm-core \
        -I$(top_builddir)/libnm-core \
        -DNETWORKMANAGER_COMPILATION \

diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am
index 7a815ee..676b067 100644 (file)
--- a/libnm-glib/Makefile.am
+++ b/libnm-glib/Makefile.am
@@ -3,8 +3,8 @@ include $(GLIB_MAKEFILE)
 SUBDIRS = . tests
 
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
+       -I$(top_srcdir)/shared \
+       -I$(top_builddir)/shared \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
        -DG_LOG_DOMAIN=\""libnm-glib"\" \

diff --git a/libnm-glib/tests/Makefile.am b/libnm-glib/tests/Makefile.am
index 9afbf6f..a1b25f6 100644 (file)
--- a/libnm-glib/tests/Makefile.am
+++ b/libnm-glib/tests/Makefile.am
@@ -1,8 +1,8 @@
 if ENABLE_TESTS
 
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
+       -I$(top_srcdir)/shared \
+       -I$(top_builddir)/shared \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
        -I$(top_srcdir)/libnm-glib \
@@ -24,8 +24,8 @@ TESTS = test-nm-client test-remote-settings-client
 ####### NMClient and non-settings tests #######
 
 test_nm_client_SOURCES = \
-       $(top_builddir)/include/nm-test-utils-impl.c \
-       $(top_builddir)/include/nm-test-libnm-utils.h \
+       $(top_builddir)/shared/nm-test-utils-impl.c \
+       $(top_builddir)/shared/nm-test-libnm-utils.h \
        test-nm-client.c
 
 test_nm_client_LDADD = \
@@ -37,8 +37,8 @@ test_nm_client_LDADD = \
 ####### remote settings client test #######
 
 test_remote_settings_client_SOURCES = \
-       $(top_builddir)/include/nm-test-utils-impl.c \
-       $(top_builddir)/include/nm-test-libnm-utils.h \
+       $(top_builddir)/shared/nm-test-utils-impl.c \
+       $(top_builddir)/shared/nm-test-libnm-utils.h \
        test-remote-settings-client.c
 
 test_remote_settings_client_LDADD = \

diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am
index 4c08b94..6e63790 100644 (file)
--- a/libnm-util/Makefile.am
+++ b/libnm-util/Makefile.am
@@ -4,8 +4,8 @@ SUBDIRS = . tests
 
 AM_CPPFLAGS = \
        -I${top_srcdir} \
-       -I${top_srcdir}/include \
-       -I$(top_builddir)/include \
+       -I${top_srcdir}/shared \
+       -I$(top_builddir)/shared \
        -DG_LOG_DOMAIN=\""libnm-util"\" \
        -DLOCALEDIR=\"$(datadir)/locale\" \
        -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
@@ -25,7 +25,7 @@ endif
 lib_LTLIBRARIES=libnm-util.la
 
 libnm_util_include_HEADERS =           \
-       $(top_builddir)/include/nm-version-macros.h \
+       $(top_builddir)/shared/nm-version-macros.h \
        NetworkManager.h                \
        NetworkManagerVPN.h             \
        nm-connection.h                 \

diff --git a/libnm-util/tests/Makefile.am b/libnm-util/tests/Makefile.am
index e580a13..eda212e 100644 (file)
--- a/libnm-util/tests/Makefile.am
+++ b/libnm-util/tests/Makefile.am
@@ -1,8 +1,8 @@
 if ENABLE_TESTS
 
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
+       -I$(top_srcdir)/shared \
+       -I$(top_builddir)/shared \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
        -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \

diff --git a/libnm/Makefile.am b/libnm/Makefile.am
index 253e109..80cdccb 100644 (file)
--- a/libnm/Makefile.am
+++ b/libnm/Makefile.am
@@ -3,8 +3,8 @@ include $(GLIB_MAKEFILE)
 SUBDIRS = . tests
 
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
+       -I$(top_srcdir)/shared \
+       -I$(top_builddir)/shared \
        -I$(top_builddir)/introspection \
        -I$(top_srcdir)/libnm-core \
        -I$(top_builddir)/libnm-core \
@@ -26,7 +26,7 @@ lib_LTLIBRARIES = libnm.la
 libnmincludedir = $(includedir)/libnm
 
 libnminclude_hfiles =                  \
-       $(top_builddir)/include/nm-version-macros.h \
+       $(top_builddir)/shared/nm-version-macros.h \
        NetworkManager.h                \
        nm-access-point.h               \
        nm-active-connection.h          \

diff --git a/libnm/tests/Makefile.am b/libnm/tests/Makefile.am
index 99a4b8a..ddcf50b 100644 (file)
--- a/libnm/tests/Makefile.am
+++ b/libnm/tests/Makefile.am
@@ -1,8 +1,8 @@
 if ENABLE_TESTS
 
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
+       -I$(top_srcdir)/shared \
+       -I$(top_builddir)/shared \
        -I$(top_srcdir)/libnm \
        -I$(top_builddir)/libnm \
        -I$(top_srcdir)/libnm-core \
@@ -26,18 +26,18 @@ endif
 TESTS = test-nm-client test-remote-settings-client test-secret-agent
 
 test_nm_client_SOURCES = \
-       $(top_builddir)/include/nm-test-utils-impl.c \
-       $(top_builddir)/include/nm-test-libnm-utils.h \
+       $(top_builddir)/shared/nm-test-utils-impl.c \
+       $(top_builddir)/shared/nm-test-libnm-utils.h \
        test-nm-client.c
 
 test_remote_settings_client_SOURCES = \
-       $(top_builddir)/include/nm-test-utils-impl.c \
-       $(top_builddir)/include/nm-test-libnm-utils.h \
+       $(top_builddir)/shared/nm-test-utils-impl.c \
+       $(top_builddir)/shared/nm-test-libnm-utils.h \
        test-remote-settings-client.c
 
 test_secret_agent_SOURCES = \
-       $(top_builddir)/include/nm-test-utils-impl.c \
-       $(top_builddir)/include/nm-test-libnm-utils.h \
+       $(top_builddir)/shared/nm-test-utils-impl.c \
+       $(top_builddir)/shared/nm-test-libnm-utils.h \
        test-secret-agent.c
 endif
 

diff --git a/include/Makefile.am b/shared/Makefile.am
similarity index 100%
rename from include/Makefile.am
rename to shared/Makefile.am

diff --git a/include/gsystem-local-alloc.h b/shared/gsystem-local-alloc.h
similarity index 100%
rename from include/gsystem-local-alloc.h
rename to shared/gsystem-local-alloc.h

diff --git a/include/nm-dbus-compat.h b/shared/nm-dbus-compat.h
similarity index 100%
rename from include/nm-dbus-compat.h
rename to shared/nm-dbus-compat.h

diff --git a/include/nm-default.h b/shared/nm-default.h
similarity index 100%
rename from include/nm-default.h
rename to shared/nm-default.h

diff --git a/include/nm-glib.h b/shared/nm-glib.h
similarity index 100%
rename from include/nm-glib.h
rename to shared/nm-glib.h

diff --git a/include/nm-macros-internal.h b/shared/nm-macros-internal.h
similarity index 100%
rename from include/nm-macros-internal.h
rename to shared/nm-macros-internal.h

diff --git a/include/nm-test-libnm-utils.h b/shared/nm-test-libnm-utils.h
similarity index 100%
rename from include/nm-test-libnm-utils.h
rename to shared/nm-test-libnm-utils.h

diff --git a/include/nm-test-utils-impl.c b/shared/nm-test-utils-impl.c
similarity index 100%
rename from include/nm-test-utils-impl.c
rename to shared/nm-test-utils-impl.c

diff --git a/include/nm-test-utils.h b/shared/nm-test-utils.h
similarity index 100%
rename from include/nm-test-utils.h
rename to shared/nm-test-utils.h

diff --git a/include/nm-version-macros.h.in b/shared/nm-version-macros.h.in
similarity index 100%
rename from include/nm-version-macros.h.in
rename to shared/nm-version-macros.h.in

diff --git a/src/Makefile.am b/src/Makefile.am
index e4b2cb0..c37b058 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,8 +33,8 @@ SUBDIRS += \
 endif
 
 AM_CPPFLAGS =                          \
-       -I$(top_srcdir)/include         \
-       -I$(top_builddir)/include \
+       -I$(top_srcdir)/shared          \
+       -I$(top_builddir)/shared \
        -I$(top_builddir)/introspection \
        -I$(top_srcdir)/libnm-core      \
        -I$(top_builddir)/libnm-core    \
@@ -173,8 +173,8 @@ libsystemd_nm_la_SOURCES = \
        systemd/src/systemd/sd-ndisc.h
 
 libsystemd_nm_la_CPPFLAGS = \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
+       -I$(top_srcdir)/shared \
+       -I$(top_builddir)/shared \
        -I$(top_srcdir)/libnm-core \
        -I$(top_builddir)/libnm-core \
        $(SYSTEMD_NM_CFLAGS_PATHS) \

diff --git a/src/devices/adsl/Makefile.am b/src/devices/adsl/Makefile.am
index b082ffc..e7034fa 100644 (file)
--- a/src/devices/adsl/Makefile.am
+++ b/src/devices/adsl/Makefile.am
@@ -8,8 +8,8 @@ AM_CPPFLAGS = \
        -I${top_srcdir}/src/devices \
        -I${top_srcdir}/src/platform \
        -I${top_builddir}/introspection \
-       -I${top_srcdir}/include \
-       -I$(top_builddir)/include \
+       -I${top_srcdir}/shared \
+       -I$(top_builddir)/shared \
        -I${top_builddir}/libnm-core \
        -I${top_srcdir}/libnm-core \
        -DG_LOG_DOMAIN=\""NetworkManager-adsl"\" \

diff --git a/src/devices/bluetooth/Makefile.am b/src/devices/bluetooth/Makefile.am
index 37217df..2054ea0 100644 (file)
--- a/src/devices/bluetooth/Makefile.am
+++ b/src/devices/bluetooth/Makefile.am
@@ -10,8 +10,8 @@ AM_CPPFLAGS = \
        -I${top_srcdir}/src/platform \
        -I${top_srcdir}/src/devices/wwan \
        -I${top_builddir}/introspection \
-       -I${top_srcdir}/include \
-       -I$(top_builddir)/include \
+       -I${top_srcdir}/shared \
+       -I$(top_builddir)/shared \
        -I${top_builddir}/libnm-core \
        -I${top_srcdir}/libnm-core \
        -DG_LOG_DOMAIN=\""NetworkManager-bluetooth"\" \

diff --git a/src/devices/team/Makefile.am b/src/devices/team/Makefile.am
index 3df1386..a664583 100644 (file)
--- a/src/devices/team/Makefile.am
+++ b/src/devices/team/Makefile.am
@@ -8,8 +8,8 @@ AM_CPPFLAGS = \
        -I${top_srcdir}/src/devices \
        -I${top_srcdir}/src/platform \
        -I${top_builddir}/introspection \
-       -I${top_srcdir}/include \
-       -I$(top_builddir)/include \
+       -I${top_srcdir}/shared \
+       -I$(top_builddir)/shared \
        -I${top_builddir}/libnm-core \
        -I${top_srcdir}/libnm-core \
        -DG_LOG_DOMAIN=\""NetworkManager-team"\" \

diff --git a/src/devices/tests/Makefile.am b/src/devices/tests/Makefile.am
index 4b1595e..330377b 100644 (file)
--- a/src/devices/tests/Makefile.am
+++ b/src/devices/tests/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
+       -I$(top_srcdir)/shared \
+       -I$(top_builddir)/shared \
        -I$(top_srcdir)/libnm-core \
        -I$(top_builddir)/libnm-core \
        -I$(top_srcdir)/src/platform \

diff --git a/src/devices/wifi/Makefile.am b/src/devices/wifi/Makefile.am
index df21597..b0919ef 100644 (file)
--- a/src/devices/wifi/Makefile.am
+++ b/src/devices/wifi/Makefile.am
@@ -14,8 +14,8 @@ AM_CPPFLAGS = \
        -I${top_srcdir}/src/platform \
        -I${top_srcdir}/src/supplicant-manager \
        -I${top_builddir}/introspection \
-       -I${top_srcdir}/include \
-       -I$(top_builddir)/include \
+       -I${top_srcdir}/shared \
+       -I$(top_builddir)/shared \
        -I${top_builddir}/libnm-core \
        -I${top_srcdir}/libnm-core \
        -DG_LOG_DOMAIN=\""NetworkManager-wifi"\" \

diff --git a/src/devices/wifi/tests/Makefile.am b/src/devices/wifi/tests/Makefile.am
index 2e25dc4..dee8e79 100644 (file)
--- a/src/devices/wifi/tests/Makefile.am
+++ b/src/devices/wifi/tests/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = \
        -I$(top_builddir)/introspection \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
+       -I$(top_srcdir)/shared \
+       -I$(top_builddir)/shared \
        -I$(top_srcdir)/libnm-core \
        -I$(top_builddir)/libnm-core \
        -I${top_srcdir}/src/platform \

diff --git a/src/devices/wwan/Makefile.am b/src/devices/wwan/Makefile.am
index 1d2dcb6..107f630 100644 (file)
--- a/src/devices/wwan/Makefile.am
+++ b/src/devices/wwan/Makefile.am
@@ -9,8 +9,8 @@ AM_CPPFLAGS = \
        -I${top_srcdir}/src/settings \
        -I${top_srcdir}/src/platform \
        -I${top_builddir}/introspection \
-       -I${top_srcdir}/include \
-       -I$(top_builddir)/include \
+       -I${top_srcdir}/shared \
+       -I$(top_builddir)/shared \
        -I${top_srcdir}/libnm-core \
        -I${top_builddir}/libnm-core \
        -DG_LOG_DOMAIN=\""NetworkManager-wwan"\" \

diff --git a/src/dhcp-manager/Makefile.am b/src/dhcp-manager/Makefile.am
index b07bbc6..3199ab0 100644 (file)
--- a/src/dhcp-manager/Makefile.am
+++ b/src/dhcp-manager/Makefile.am
@@ -4,8 +4,8 @@ nm_dhcp_helper_SOURCES = nm-dhcp-helper.c
 
 nm_dhcp_helper_CPPFLAGS = \
        $(GLIB_CFLAGS) \
-       -I$(top_srcdir)/include \
-       -I${top_builddir}/include \
+       -I$(top_srcdir)/shared \
+       -I${top_builddir}/shared \
        -I$(top_srcdir)/libnm-core \
        -I$(top_builddir)/libnm-core \
        -DG_LOG_DOMAIN=\""nm-dhcp-helper"\" \

diff --git a/src/dhcp-manager/tests/Makefile.am b/src/dhcp-manager/tests/Makefile.am
index 578f714..5c7f9ba 100644 (file)
--- a/src/dhcp-manager/tests/Makefile.am
+++ b/src/dhcp-manager/tests/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/include \
-       -I${top_builddir}/include \
+       -I$(top_srcdir)/shared \
+       -I${top_builddir}/shared \
        -I${top_srcdir}/libnm-core \
        -I${top_builddir}/libnm-core \
        -I$(top_srcdir)/src/dhcp-manager \

diff --git a/src/dnsmasq-manager/tests/Makefile.am b/src/dnsmasq-manager/tests/Makefile.am
index 0ddaa38..2c5e8e4 100644 (file)
--- a/src/dnsmasq-manager/tests/Makefile.am
+++ b/src/dnsmasq-manager/tests/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/include \
-       -I${top_builddir}/include \
+       -I$(top_srcdir)/shared \
+       -I${top_builddir}/shared \
        -I${top_srcdir}/libnm-core \
        -I${top_builddir}/libnm-core \
        -I$(top_srcdir)/src/dnsmasq-manager \

diff --git a/src/platform/tests/Makefile.am b/src/platform/tests/Makefile.am
index 5996f34..b097fcf 100644 (file)
--- a/src/platform/tests/Makefile.am
+++ b/src/platform/tests/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = \
        -I${top_srcdir} \
-       -I${top_srcdir}/include \
-       -I${top_builddir}/include \
+       -I${top_srcdir}/shared \
+       -I${top_builddir}/shared \
        -I${top_srcdir}/src \
        -I${top_builddir}/src \
        -I${top_srcdir}/libnm-core \

diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am
index 650c430..5cf908d 100644 (file)
--- a/src/ppp-manager/Makefile.am
+++ b/src/ppp-manager/Makefile.am
@@ -1,8 +1,8 @@
 if WITH_PPP
 
 AM_CPPFLAGS = \
-       -I${top_srcdir}/include \
-       -I${top_builddir}/include \
+       -I${top_srcdir}/shared \
+       -I${top_builddir}/shared \
        -I${top_srcdir}/libnm-core \
        -I${top_srcdir}/src \
        -I${top_builddir}/libnm-core \

diff --git a/src/rdisc/tests/Makefile.am b/src/rdisc/tests/Makefile.am
index cf302ad..d520e41 100644 (file)
--- a/src/rdisc/tests/Makefile.am
+++ b/src/rdisc/tests/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = \
        -I${top_srcdir} \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
+       -I$(top_srcdir)/shared \
+       -I$(top_builddir)/shared \
        -I${top_srcdir}/src \
        -I${top_srcdir}/src/platform \
        -I${top_srcdir}/libnm-core \

diff --git a/src/settings/plugins/ibft/Makefile.am b/src/settings/plugins/ibft/Makefile.am
index 49d7831..a994808 100644 (file)
--- a/src/settings/plugins/ibft/Makefile.am
+++ b/src/settings/plugins/ibft/Makefile.am
@@ -14,8 +14,8 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/ \
        -I$(top_srcdir)/src/platform \
        -I$(top_srcdir)/src/settings \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
+       -I$(top_srcdir)/shared \
+       -I$(top_builddir)/shared \
        -I$(top_srcdir)/libnm-core \
        -I$(top_builddir)/libnm-core \
        -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \

diff --git a/src/settings/plugins/ibft/tests/Makefile.am b/src/settings/plugins/ibft/tests/Makefile.am
index 3c3b5cf..29881e8 100644 (file)
--- a/src/settings/plugins/ibft/tests/Makefile.am
+++ b/src/settings/plugins/ibft/tests/Makefile.am
@@ -5,8 +5,8 @@ if ENABLE_TESTS
 AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(CODE_COVERAGE_CFLAGS) \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
+       -I$(top_srcdir)/shared \
+       -I$(top_builddir)/shared \
        -I$(top_srcdir)/libnm-core \
        -I$(top_builddir)/libnm-core \
        -I$(top_srcdir)/src/ \

diff --git a/src/settings/plugins/ifcfg-rh/Makefile.am b/src/settings/plugins/ifcfg-rh/Makefile.am
index ebae637..ab96a32 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/Makefile.am
+++ b/src/settings/plugins/ifcfg-rh/Makefile.am
@@ -43,8 +43,8 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/ \
        -I$(top_srcdir)/src/platform \
        -I$(top_srcdir)/src/settings \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
+       -I$(top_srcdir)/shared \
+       -I$(top_builddir)/shared \
        -I$(top_srcdir)/libnm-core \
        -I$(top_builddir)/libnm-core \
        -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \

diff --git a/src/settings/plugins/ifcfg-rh/tests/Makefile.am b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
index 4f942d2..25d2719 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/tests/Makefile.am
+++ b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
@@ -7,8 +7,8 @@ SUBDIRS=network-scripts
 AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(CODE_COVERAGE_CFLAGS) \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
+       -I$(top_srcdir)/shared \
+       -I$(top_builddir)/shared \
        -I$(top_srcdir)/libnm-core \
        -I$(top_builddir)/libnm-core \
        -I$(top_srcdir)/src/ \

diff --git a/src/settings/plugins/ifnet/Makefile.am b/src/settings/plugins/ifnet/Makefile.am
index 5e1713a..ffd8ab3 100644 (file)
--- a/src/settings/plugins/ifnet/Makefile.am
+++ b/src/settings/plugins/ifnet/Makefile.am
@@ -6,8 +6,8 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/platform \
        -I$(top_srcdir)/src/settings \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
+       -I$(top_srcdir)/shared \
+       -I$(top_builddir)/shared \
        -I$(top_srcdir)/libnm-core \
        -I$(top_builddir)/libnm-core \
        -DG_LOG_DOMAIN=\""NetworkManager-ifnet"\" \

diff --git a/src/settings/plugins/ifnet/tests/Makefile.am b/src/settings/plugins/ifnet/tests/Makefile.am
index 9c1bcbf..1919f14 100644 (file)
--- a/src/settings/plugins/ifnet/tests/Makefile.am
+++ b/src/settings/plugins/ifnet/tests/Makefile.am
@@ -4,8 +4,8 @@ if ENABLE_TESTS
 
 AM_CPPFLAGS= \
        -I$(srcdir)/../ \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
+       -I$(top_srcdir)/shared \
+       -I$(top_builddir)/shared \
        -I$(top_srcdir)/libnm-core \
        -I$(top_builddir)/libnm-core \
        -I$(top_srcdir)/src \

diff --git a/src/settings/plugins/ifupdown/Makefile.am b/src/settings/plugins/ifupdown/Makefile.am
index b3ab2ef..c5c645d 100644 (file)
--- a/src/settings/plugins/ifupdown/Makefile.am
+++ b/src/settings/plugins/ifupdown/Makefile.am
@@ -5,8 +5,8 @@ SUBDIRS = . tests
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/settings \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
+       -I$(top_srcdir)/shared \
+       -I$(top_builddir)/shared \
        -I$(top_srcdir)/libnm-core \
        -I$(top_builddir)/libnm-core \
        -DG_LOG_DOMAIN=\""NetworkManager-ifupdown"\" \

diff --git a/src/settings/plugins/ifupdown/tests/Makefile.am b/src/settings/plugins/ifupdown/tests/Makefile.am
index 55d9f88..29e9a7e 100644 (file)
--- a/src/settings/plugins/ifupdown/tests/Makefile.am
+++ b/src/settings/plugins/ifupdown/tests/Makefile.am
@@ -1,8 +1,8 @@
 if ENABLE_TESTS
 
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
+       -I$(top_srcdir)/shared \
+       -I$(top_builddir)/shared \
        -I$(top_srcdir)/libnm-core \
        -I$(top_builddir)/libnm-core \
        -I$(top_srcdir)/src \

diff --git a/src/settings/plugins/keyfile/Makefile.am b/src/settings/plugins/keyfile/Makefile.am
index 1278b2f..ddcd15b 100644 (file)
--- a/src/settings/plugins/keyfile/Makefile.am
+++ b/src/settings/plugins/keyfile/Makefile.am
@@ -5,8 +5,8 @@ SUBDIRS = . tests
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/settings \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
+       -I$(top_srcdir)/shared \
+       -I$(top_builddir)/shared \
        -I$(top_srcdir)/libnm-core \
        -I$(top_builddir)/libnm-core \
        -DG_LOG_DOMAIN=\""NetworkManager-keyfile"\" \

diff --git a/src/settings/plugins/keyfile/tests/Makefile.am b/src/settings/plugins/keyfile/tests/Makefile.am
index 34331e1..4d85f09 100644 (file)
--- a/src/settings/plugins/keyfile/tests/Makefile.am
+++ b/src/settings/plugins/keyfile/tests/Makefile.am
@@ -5,8 +5,8 @@ SUBDIRS=keyfiles
 @GNOME_CODE_COVERAGE_RULES@
 
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
+       -I$(top_srcdir)/shared \
+       -I$(top_builddir)/shared \
        -I$(top_srcdir)/libnm-core \
        -I$(top_builddir)/libnm-core \
        -I$(top_srcdir)/src \

diff --git a/src/supplicant-manager/tests/Makefile.am b/src/supplicant-manager/tests/Makefile.am
index 66bd7d5..9ac0387 100644 (file)
--- a/src/supplicant-manager/tests/Makefile.am
+++ b/src/supplicant-manager/tests/Makefile.am
@@ -1,8 +1,8 @@
 SUBDIRS=certs
 
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
+       -I$(top_srcdir)/shared \
+       -I$(top_builddir)/shared \
        -I$(top_srcdir)/libnm-core \
        -I$(top_builddir)/libnm-core \
        -I$(top_srcdir)/src \

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 18fce10..26c2ed7 100644 (file)
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,8 +1,8 @@
 SUBDIRS = config
 
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
+       -I$(top_srcdir)/shared \
+       -I$(top_builddir)/shared \
        -I$(top_srcdir)/libnm-core \
        -I$(top_builddir)/libnm-core \
        -I$(top_srcdir)/src/platform \

diff --git a/src/tests/config/Makefile.am b/src/tests/config/Makefile.am
index 80f923c..5d4aed5 100644 (file)
--- a/src/tests/config/Makefile.am
+++ b/src/tests/config/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir)/include \
+       -I$(top_srcdir)/shared \
+       -I$(top_builddir)/shared \
        -I$(top_srcdir)/libnm-core \
        -I$(top_builddir)/libnm-core \
        -I$(top_srcdir)/src/ \