Prevents automake warnings like:
callouts/tests/Makefile.am:3: warning: 'INCLUDES' is the old name for
'AM_CPPFLAGS' (or '*_CPPFLAGS')
Unfortunately, AM_CPPFLAGS is only used if the target has not
defined its own CPPFLAGS, which a lot of NM targets had. But
we can easily fix that by including AM_CPPFLAGS in the target
specific CPPFLAGS where needed, or collapse common CPPFLAGS
into AM_CPPFLAGS and remove per-target CPPFLAGS where
appropriate.
---
callouts/tests/Makefile.am | 5 ++--
cli/src/Makefile.am | 12 ++++------
examples/C/glib/Makefile.am | 11 ++++-----
examples/C/qt/Makefile.am | 5 ++--
libnm-glib/Makefile.am | 5 ++--
libnm-glib/tests/Makefile.am | 5 ++--
libnm-util/Makefile.am | 13 +++++++----
libnm-util/tests/Makefile.am | 24 ++++---------------
src/Makefile.am | 13 +++++++----
src/bluez-manager/Makefile.am | 26 ++++++++++-----------
src/dhcp-manager/Makefile.am | 4 +++-
src/dhcp-manager/tests/Makefile.am | 7 +++---
src/dns-manager/Makefile.am | 24 +++++++++----------
src/dnsmasq-manager/Makefile.am | 14 +++++------
src/firewall-manager/Makefile.am | 18 +++++++-------
src/generated/Makefile.am | 16 ++++++-------
src/ip6-manager/Makefile.am | 18 +++++++-------
src/modem-manager/Makefile.am | 14 +++++------
src/ppp-manager/Makefile.am | 12 ++++------
src/settings/Makefile.am | 14 +++++------
src/settings/plugins/example/Makefile.am | 18 +++++++-------
src/settings/plugins/ifcfg-rh/Makefile.am | 11 ++-------
src/settings/plugins/ifcfg-rh/tests/Makefile.am | 10 ++++----
src/settings/plugins/ifnet/Makefile.am | 26 +++++++++------------
src/settings/plugins/ifnet/tests/Makefile.am | 23 +++++++++---------
src/settings/plugins/ifupdown/Makefile.am | 16 +++++--------
src/settings/plugins/ifupdown/tests/Makefile.am | 16 ++++++-------
src/settings/plugins/keyfile/Makefile.am | 17 ++++----------
src/settings/plugins/keyfile/tests/Makefile.am | 16 ++++++-------
src/settings/tests/Makefile.am | 10 ++++----
src/supplicant-manager/Makefile.am | 18 +++++++-------
src/supplicant-manager/tests/Makefile.am | 16 ++++++-------
src/tests/Makefile.am | 16 ++++---------
src/vpn-manager/Makefile.am | 31 +++++++++++--------------
src/wifi/Makefile.am | 14 +++++------
src/wimax/Makefile.am | 18 +++++++-------
test/Makefile.am | 13 +++++------
tools/Makefile.am | 10 ++++----
38 files changed, 243 insertions(+), 316 deletions(-)
diff --git a/callouts/tests/Makefile.am b/callouts/tests/Makefile.am
index e8a13fc..d33d0f9 100644
--- a/callouts/tests/Makefile.am
+++ b/callouts/tests/Makefile.am
@@ -1,10 +1,10 @@
if ENABLE_TESTS
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I${top_builddir}/include \
-I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util \
-I$(top_srcdir)/callouts
noinst_PROGRAMS = \
@@ -13,15 +13,16 @@ noinst_PROGRAMS = \
####### dispatcher envp #######
test_dispatcher_envp_SOURCES = \
test-dispatcher-envp.c
test_dispatcher_envp_CPPFLAGS = \
$(GLIB_CFLAGS) \
- $(DBUS_CFLAGS)
+ $(DBUS_CFLAGS) \
+ $(AM_CPPFLAGS)
test_dispatcher_envp_LDADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(top_builddir)/callouts/libtest-dispatcher-envp.la \
$(GLIB_LIBS) \
$(DBUS_LIBS)
diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am
index 0f379c1..1cd2a00 100644
--- a/cli/src/Makefile.am
+++ b/cli/src/Makefile.am
@@ -1,17 +1,20 @@
bin_PROGRAMS = \
nmcli
-INCLUDES = \
+nmcli_CPPFLAGS = \
-I${top_srcdir} \
-I${top_srcdir}/include \
-I${top_builddir}/include \
-I${top_srcdir}/libnm-util \
-I${top_builddir}/libnm-util \
- -I${top_srcdir}/libnm-glib
+ -I${top_srcdir}/libnm-glib \
+ $(DBUS_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ -DNMCLI_LOCALEDIR=\"$(datadir)/locale\"
nmcli_SOURCES = \
common.c \
common.h \
connections.c \
connections.h \
devices.c \
@@ -21,19 +24,14 @@ nmcli_SOURCES = \
settings.c \
settings.h \
nmcli.c \
nmcli.h \
utils.c \
utils.h
-nmcli_CPPFLAGS = \
- $(DBUS_CFLAGS) \
- $(GLIB_CFLAGS) \
- -DNMCLI_LOCALEDIR=\"$(datadir)/locale\"
-
nmcli_LDADD = \
$(DBUS_LIBS) \
$(GLIB_LIBS) \
$(top_builddir)/libnm-util/libnm-util.la \
$(top_builddir)/libnm-glib/libnm-glib.la
diff --git a/examples/C/glib/Makefile.am b/examples/C/glib/Makefile.am
index 1511f60..1f4785d 100644
--- a/examples/C/glib/Makefile.am
+++ b/examples/C/glib/Makefile.am
@@ -1,14 +1,13 @@
-INCLUDES = -I${top_srcdir}/libnm-util \
- -I${top_builddir}/libnm-util \
- -I${top_srcdir}/libnm-glib \
- -I${top_srcdir}/include \
- -I${top_builddir}/include
-
AM_CPPFLAGS = \
+ -I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
+ -I${top_srcdir}/libnm-glib \
+ -I${top_srcdir}/include \
+ -I${top_builddir}/include \
$(DBUS_CFLAGS) \
$(GLIB_CFLAGS)
noinst_PROGRAMS = \
add-connection-dbus-glib \
add-connection-libnm-glib \
get-active-connections-dbus-glib \
diff --git a/examples/C/qt/Makefile.am b/examples/C/qt/Makefile.am
index a0cf8f4..15b6bf4 100644
--- a/examples/C/qt/Makefile.am
+++ b/examples/C/qt/Makefile.am
@@ -1,11 +1,10 @@
-INCLUDES = -I${top_srcdir}/include \
- -I${top_builddir}/include
-
AM_CPPFLAGS = \
+ -I${top_srcdir}/include \
+ -I${top_builddir}/include \
$(DBUS_CFLAGS) \
$(QT_CFLAGS)
noinst_PROGRAMS = \
add-connection-wired \
list-connections \
change-ipv4-addresses \
diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am
index c692a3c..410848a 100644
--- a/libnm-glib/Makefile.am
+++ b/libnm-glib/Makefile.am
@@ -1,12 +1,12 @@
include $(GLIB_MAKEFILE)
SUBDIRS = . tests
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/libnm-util \
-I$(top_builddir)/libnm-util
BUILT_SOURCES = \
nm-vpn-plugin-glue.h \
@@ -24,14 +24,15 @@ noinst_LTLIBRARIES = \
libdeprecated_nm_glib_la_SOURCES = \
libnm_glib.h \
libnm_glib.c
libdeprecated_nm_glib_la_CPPFLAGS = \
$(DBUS_CFLAGS) \
$(GLIB_CFLAGS) \
+ $(AM_CPPFLAGS) \
-Wno-deprecated-declarations \
-Wno-deprecated
libdeprecated_nm_glib_la_LIBADD = \
$(DBUS_LIBS) \
$(GLIB_LIBS)
@@ -215,15 +216,15 @@ INTROSPECTION_COMPILER_ARGS =
--includedir=$(top_builddir)/libnm-util
if HAVE_INTROSPECTION
introspection_sources = $(libnminclude_HEADERS) $(libnm_glib_la_csources)
NMClient-1.0.gir: libnm-glib.la
NMClient_1_0_gir_INCLUDES = Gio-2.0 DBusGLib-1.0
NMClient_1_0_gir_PACKAGES = gio-2.0 dbus-glib-1 gudev-1.0
NMClient_1_0_gir_EXPORT_PACKAGES = libnm-glib libnm-glib-vpn
-NMClient_1_0_gir_CFLAGS = $(INCLUDES) -I$(top_srcdir)/libnm-glib
-I$(top_srcdir)/libnm-util
+NMClient_1_0_gir_CFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/libnm-glib
-I$(top_srcdir)/libnm-util
NMClient_1_0_gir_LIBS = libnm-glib.la $(top_builddir)/libnm-util/libnm-util.la
NMClient_1_0_gir_FILES = $(introspection_sources)
NMClient_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM
--symbol-prefix=nm
--include-uninstalled=$(top_builddir)/libnm-util/NetworkManager-1.0.gir
INTROSPECTION_GIRS += NMClient-1.0.gir
girdir = $(datadir)/gir-1.0
gir_DATA = $(INTROSPECTION_GIRS)
diff --git a/libnm-glib/tests/Makefile.am b/libnm-glib/tests/Makefile.am
index 5fda5bd..0799448 100644
--- a/libnm-glib/tests/Makefile.am
+++ b/libnm-glib/tests/Makefile.am
@@ -1,10 +1,10 @@
if ENABLE_TESTS
-INCLUDES = \
+AM_CPPFLAGS = \
-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
@@ -12,15 +12,16 @@ noinst_PROGRAMS = test-remote-settings-client
####### remote settings client test #######
test_remote_settings_client_SOURCES = \
test-remote-settings-client.c
test_remote_settings_client_CPPFLAGS = \
$(GLIB_CFLAGS) \
- $(DBUS_CFLAGS)
+ $(DBUS_CFLAGS) \
+ $(AM_CPPFLAGS)
test_remote_settings_client_LDADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(top_builddir)/libnm-glib/libnm-glib-test.la \
$(GLIB_LIBS) \
$(DBUS_LIBS)
diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am
index 2222ec2..2d41164 100644
--- a/libnm-util/Makefile.am
+++ b/libnm-util/Makefile.am
@@ -1,19 +1,23 @@
include $(GLIB_MAKEFILE)
SUBDIRS = . tests
-INCLUDES = -I${top_srcdir} -I${top_srcdir}/include -I${top_builddir}/include
+AM_CPPFLAGS = \
+ -I${top_srcdir} \
+ -I${top_srcdir}/include \
+ -I${top_builddir}/include
lib_LTLIBRARIES=libnm-util.la
libnm_util_la_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
- $(UUID_CFLAGS)
+ $(UUID_CFLAGS) \
+ $(AM_CPPFLAGS)
libnm_util_include_HEADERS = \
nm-connection.h \
nm-setting.h \
nm-setting-8021x.h \
nm-setting-adsl.h \
nm-setting-bluetooth.h \
@@ -112,15 +116,16 @@ libnm_util_includedir=$(includedir)/NetworkManager
###########################################
noinst_LTLIBRARIES = libtest-crypto.la
libtest_crypto_la_SOURCES = crypto.c
libtest_crypto_la_CPPFLAGS = \
- $(GLIB_CFLAGS)
+ $(GLIB_CFLAGS) \
+ $(AM_CPPFLAGS)
libtest_crypto_la_LIBADD = \
$(GLIB_LIBS)
if WITH_GNUTLS
libtest_crypto_la_SOURCES += crypto_gnutls.c
libtest_crypto_la_CPPFLAGS += $(LIBGCRYPT_CFLAGS) $(GNUTLS_CFLAGS)
@@ -149,15 +154,15 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
if HAVE_INTROSPECTION
introspection_sources = $(libnm_util_include_HEADERS)
$(libnm_util_la_csources) $(top_srcdir)/include/NetworkManager.h
$(top_srcdir)/include/NetworkManagerVPN.h
NetworkManager-1.0.gir: libnm-util.la
NetworkManager_1_0_gir_INCLUDES = GObject-2.0 DBusGLib-1.0
NetworkManager_1_0_gir_PACKAGES = gobject-2.0 dbus-glib-1
NetworkManager_1_0_gir_EXPORT_PACKAGES = libnm-util
-NetworkManager_1_0_gir_CFLAGS = $(INCLUDES) -I$(top_srcdir)/libnm-util
+NetworkManager_1_0_gir_CFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/libnm-util
NetworkManager_1_0_gir_LIBS = libnm-util.la
NetworkManager_1_0_gir_FILES = $(introspection_sources)
NetworkManager_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM
--symbol-prefix=nm
INTROSPECTION_GIRS += NetworkManager-1.0.gir
girdir = $(datadir)/gir-1.0
gir_DATA = $(INTROSPECTION_GIRS)
diff --git a/libnm-util/tests/Makefile.am b/libnm-util/tests/Makefile.am
index 98f8aad..d49ef8c 100644
--- a/libnm-util/tests/Makefile.am
+++ b/libnm-util/tests/Makefile.am
@@ -1,79 +1,65 @@
if ENABLE_TESTS
SUBDIRS=certs
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/libnm-util \
- -I$(top_builddir)/libnm-util
+ -I$(top_builddir)/libnm-util \
+ $(GLIB_CFLAGS) \
+ $(DBUS_CFLAGS)
noinst_PROGRAMS = \
test-settings-defaults \
test-crypto \
test-secrets \
test-general \
test-setting-8021x
test_settings_defaults_SOURCES = \
test-settings-defaults.c
-test_settings_defaults_CPPFLAGS = \
- $(GLIB_CFLAGS) \
- $(DBUS_CFLAGS)
-
test_settings_defaults_LDADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(GLIB_LIBS) \
$(DBUS_LIBS)
test_crypto_SOURCES = \
test-crypto.c
-test_crypto_CPPFLAGS = \
- $(GLIB_CFLAGS)
-
test_crypto_LDADD = \
$(top_builddir)/libnm-util/libtest-crypto.la \
$(top_builddir)/libnm-util/libnm-util.la \
$(GLIB_LIBS)
test_secrets_SOURCES = \
test-secrets.c
test_secrets_CPPFLAGS = \
-DTEST_CERT_DIR=\"$(top_srcdir)/libnm-util/tests/certs/\" \
- $(GLIB_CFLAGS) \
- $(DBUS_CFLAGS)
+ $(AM_CPPFLAGS)
test_secrets_LDADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(GLIB_LIBS) \
$(DBUS_LIBS)
test_general_SOURCES = \
test-general.c
-test_general_CPPFLAGS = \
- $(GLIB_CFLAGS) \
- $(DBUS_CFLAGS)
-
test_general_LDADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(GLIB_LIBS) \
$(DBUS_LIBS)
test_setting_8021x_SOURCES = \
test-setting-8021x.c
-test_setting_8021x_CPPFLAGS = \
- $(GLIB_CFLAGS) \
- $(DBUS_CFLAGS)
-
test_setting_8021x_LDADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(GLIB_LIBS) \
$(DBUS_LIBS)
check-local: test-settings-defaults test-crypto test-secrets
$(abs_builddir)/test-settings-defaults
diff --git a/src/Makefile.am b/src/Makefile.am
index 1743161..3ea6241 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,15 +17,16 @@ SUBDIRS= \
if WITH_WIMAX
SUBDIRS += wimax
endif
SUBDIRS += . tests
-INCLUDES = -I${top_srcdir} \
+AM_CPPFLAGS = \
+ -I${top_srcdir} \
-I${top_builddir}/include \
-I${top_srcdir}/include \
-I${top_builddir}/src/generated \
-I${top_srcdir}/src/generated \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/src/posix-signals \
-I${top_srcdir}/src/dns-manager \
@@ -61,15 +62,16 @@ libtest_dhcp_la_SOURCES = \
nm-ip6-config.c \
nm-hostname-provider.c \
nm-dbus-manager.c
libtest_dhcp_la_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
- $(LIBNL_CFLAGS)
+ $(LIBNL_CFLAGS) \
+ $(AM_CPPFLAGS)
libtest_dhcp_la_LIBADD = \
$(top_builddir)/src/generated/libnm-generated.la \
$(top_builddir)/libnm-util/libnm-util.la \
$(GLIB_LIBS) \
$(DBUS_LIBS) \
$(LIBNL_LIBS)
@@ -80,15 +82,16 @@ libtest_dhcp_la_LIBADD = \
libtest_policy_hosts_la_SOURCES = \
nm-policy-hosts.c \
nm-policy-hosts.h
libtest_policy_hosts_la_CPPFLAGS = \
-DSYSCONFDIR=\"$(sysconfdir)\" \
- $(GLIB_CFLAGS)
+ $(GLIB_CFLAGS) \
+ $(AM_CPPFLAGS)
libtest_policy_hosts_la_LIBADD = \
${top_builddir}/src/logging/libnm-logging.la \
$(GLIB_LIBS)
###########################################
@@ -96,15 +99,16 @@ libtest_policy_hosts_la_LIBADD = \
###########################################
libtest_wifi_ap_utils_la_SOURCES = \
nm-wifi-ap-utils.c \
nm-wifi-ap-utils.h
libtest_wifi_ap_utils_la_CPPFLAGS = \
- $(GLIB_CFLAGS)
+ $(GLIB_CFLAGS) \
+ $(AM_CPPFLAGS)
libtest_wifi_ap_utils_la_LIBADD = \
${top_builddir}/libnm-util/libnm-util.la \
$(GLIB_LIBS)
###########################################
@@ -297,14 +301,15 @@ NetworkManager_CPPFLAGS = \
$(DBUS_CFLAGS) \
$(GLIB_CFLAGS) \
$(GUDEV_CFLAGS) \
$(LIBNL_CFLAGS) \
$(POLKIT_CFLAGS) \
$(SYSTEMD_LOGIN_CFLAGS) \
$(LIBSOUP_CFLAGS) \
+ $(AM_CPPFLAGS) \
-DBINDIR=\"$(bindir)\" \
-DSBINDIR=\"$(sbindir)\" \
-DLIBEXECDIR=\"$(libexecdir)\" \
-DDATADIR=\"$(datadir)\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DLOCALSTATEDIR=\"$(localstatedir)\" \
-DNMLOCALEDIR=\"$(datadir)/locale\" \
diff --git a/src/bluez-manager/Makefile.am b/src/bluez-manager/Makefile.am
index aee2721..fb836ab 100644
--- a/src/bluez-manager/Makefile.am
+++ b/src/bluez-manager/Makefile.am
@@ -1,19 +1,27 @@
-INCLUDES = \
+noinst_LTLIBRARIES = libbluez-manager.la
+
+libbluez_manager_la_CPPFLAGS = \
-I${top_srcdir} \
-I${top_builddir}/include \
-I${top_srcdir}/include \
-I${top_builddir}/libnm-util \
-I${top_srcdir}/libnm-util \
-I${top_srcdir}/src \
-I${top_builddir}/src/generated \
-I${top_srcdir}/src/generated \
- -I${top_srcdir}/src/logging
-
-noinst_LTLIBRARIES = libbluez-manager.la
+ -I${top_srcdir}/src/logging \
+ $(DBUS_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(BLUEZ_CFLAGS) \
+ -DBINDIR=\"$(bindir)\" \
+ -DDATADIR=\"$(datadir)\" \
+ -DSYSCONFDIR=\"$(sysconfdir)\" \
+ -DLIBEXECDIR=\"$(libexecdir)\" \
+ -DLOCALSTATEDIR=\"$(localstatedir)\"
libbluez_manager_la_SOURCES = \
nm-bluez-common.h \
nm-bluez-device.c \
nm-bluez-device.h \
nm-bluez-manager.h
@@ -23,24 +31,14 @@ libbluez_manager_la_SOURCES += \
nm-bluez4-adapter.c \
nm-bluez4-manager.c
else
libbluez_manager_la_SOURCES += \
nm-bluez-manager.c
endif
-libbluez_manager_la_CPPFLAGS = \
- $(DBUS_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(BLUEZ_CFLAGS) \
- -DBINDIR=\"$(bindir)\" \
- -DDATADIR=\"$(datadir)\" \
- -DSYSCONFDIR=\"$(sysconfdir)\" \
- -DLIBEXECDIR=\"$(libexecdir)\" \
- -DLOCALSTATEDIR=\"$(localstatedir)\"
-
libbluez_manager_la_LIBADD = \
$(top_builddir)/src/generated/libnm-generated.la \
$(top_builddir)/src/logging/libnm-logging.la \
$(DBUS_LIBS) \
$(GLIB_LIBS) \
$(BLUEZ_LIBS)
diff --git a/src/dhcp-manager/Makefile.am b/src/dhcp-manager/Makefile.am
index 40a0583..4dcac13 100644
--- a/src/dhcp-manager/Makefile.am
+++ b/src/dhcp-manager/Makefile.am
@@ -1,10 +1,10 @@
SUBDIRS = . tests
-INCLUDES = \
+AM_CPPFLAGS = \
-I${top_srcdir} \
-I${top_builddir}/include \
-I${top_srcdir}/include \
-I${top_builddir}/src/generated \
-I${top_srcdir}/src/generated \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/src/posix-signals \
@@ -21,14 +21,15 @@ libdhcp_dhclient_la_SOURCES = \
nm-dhcp-dhclient-utils.c \
nm-dhcp-dhclient.h \
nm-dhcp-dhclient.c
libdhcp_dhclient_la_CPPFLAGS = \
$(DBUS_CFLAGS) \
$(GLIB_CFLAGS) \
+ $(AM_CPPFLAGS) \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DLIBEXECDIR=\"$(libexecdir)\" \
-DLOCALSTATEDIR=\"$(localstatedir)\" \
-DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \
-DNMSTATEDIR=\"$(nmstatedir)\" \
-DNMCONFDIR=\"$(nmconfdir)\"
@@ -48,14 +49,15 @@ libdhcp_manager_la_SOURCES = \
nm-dhcp-manager.h \
nm-dhcp-dhcpcd.h \
nm-dhcp-dhcpcd.c
libdhcp_manager_la_CPPFLAGS = \
$(DBUS_CFLAGS) \
$(GLIB_CFLAGS) \
+ $(AM_CPPFLAGS) \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DLIBEXECDIR=\"$(libexecdir)\" \
-DLOCALSTATEDIR=\"$(localstatedir)\" \
-DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \
-DDHCPCD_PATH=\"$(DHCPCD_PATH)\" \
-DNMSTATEDIR=\"$(nmstatedir)\"
diff --git a/src/dhcp-manager/tests/Makefile.am
b/src/dhcp-manager/tests/Makefile.am
index 8c9d06c..bf859fe 100644
--- a/src/dhcp-manager/tests/Makefile.am
+++ b/src/dhcp-manager/tests/Makefile.am
@@ -1,25 +1,26 @@
if ENABLE_TESTS
-INCLUDES = \
+AM_CPPFLAGS = \
-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_srcdir)/src/dhcp-manager \
+ $(GLIB_CFLAGS)
noinst_PROGRAMS = test-dhcp-dhclient
####### policy /etc/hosts test #######
test_dhcp_dhclient_SOURCES = \
test-dhcp-dhclient.c
test_dhcp_dhclient_CPPFLAGS = \
- $(GLIB_CFLAGS) \
+ $(AM_CPPFLAGS) \
-DTESTDIR="\"$(abs_srcdir)\""
test_dhcp_dhclient_LDADD = \
-ldl \
$(top_builddir)/src/dhcp-manager/libdhcp-dhclient.la \
$(top_builddir)/libnm-util/libnm-util.la \
$(GLIB_LIBS)
diff --git a/src/dns-manager/Makefile.am b/src/dns-manager/Makefile.am
index e6c2ff2..4aa20c7 100644
--- a/src/dns-manager/Makefile.am
+++ b/src/dns-manager/Makefile.am
@@ -1,37 +1,35 @@
-INCLUDES = \
+noinst_LTLIBRARIES = libdns-manager.la
+
+libdns_manager_la_CPPFLAGS = \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/src/posix-signals \
-I${top_srcdir}/libnm-util \
-I${top_builddir}/libnm-util \
-I${top_srcdir}/src \
-I${top_srcdir}/include \
- -I${top_builddir}/include
-
-noinst_LTLIBRARIES = libdns-manager.la
+ -I${top_builddir}/include \
+ $(LIBNL_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ -DLOCALSTATEDIR=\"$(localstatedir)\" \
+ -DSYSCONFDIR=\"$(sysconfdir)\" \
+ -DNMCONFDIR=\"$(nmconfdir)\" \
+ -DNMRUNDIR=\"$(nmrundir)\"
libdns_manager_la_SOURCES = \
nm-dns-manager.h \
nm-dns-manager.c \
nm-dns-plugin.h \
nm-dns-plugin.c \
nm-dns-dnsmasq.h \
nm-dns-dnsmasq.c \
nm-dns-utils.h \
nm-dns-utils.c
-libdns_manager_la_CPPFLAGS = \
- $(LIBNL_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(GLIB_CFLAGS) \
- -DLOCALSTATEDIR=\"$(localstatedir)\" \
- -DSYSCONFDIR=\"$(sysconfdir)\" \
- -DNMCONFDIR=\"$(nmconfdir)\" \
- -DNMRUNDIR=\"$(nmrundir)\"
-
libdns_manager_la_LIBADD = \
$(top_builddir)/src/logging/libnm-logging.la \
$(top_builddir)/src/posix-signals/libnm-posix-signals.la \
$(LIBNL_LIBS) \
$(DBUS_LIBS) \
$(GLIB_LIBS)
diff --git a/src/dnsmasq-manager/Makefile.am b/src/dnsmasq-manager/Makefile.am
index 8b7dd68..42706cc 100644
--- a/src/dnsmasq-manager/Makefile.am
+++ b/src/dnsmasq-manager/Makefile.am
@@ -1,21 +1,19 @@
-INCLUDES = \
+noinst_LTLIBRARIES = libdnsmasq-manager.la
+
+libdnsmasq_manager_la_CPPFLAGS = \
-I${top_srcdir}/libnm-util \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/src/posix-signals \
-I${top_srcdir}/src \
- -I${top_srcdir}/include
-
-noinst_LTLIBRARIES = libdnsmasq-manager.la
+ -I${top_srcdir}/include \
+ $(GLIB_CFLAGS) \
+ -DLOCALSTATEDIR=\"$(localstatedir)\"
libdnsmasq_manager_la_SOURCES = \
nm-dnsmasq-manager.h \
nm-dnsmasq-manager.c
-libdnsmasq_manager_la_CPPFLAGS = \
- $(GLIB_CFLAGS) \
- -DLOCALSTATEDIR=\"$(localstatedir)\"
-
libdnsmasq_manager_la_LIBADD = \
$(top_builddir)/src/logging/libnm-logging.la \
$(top_builddir)/src/posix-signals/libnm-posix-signals.la \
$(GLIB_LIBS)
diff --git a/src/firewall-manager/Makefile.am b/src/firewall-manager/Makefile.am
index 2cfe32d..15bde51 100644
--- a/src/firewall-manager/Makefile.am
+++ b/src/firewall-manager/Makefile.am
@@ -1,23 +1,21 @@
-INCLUDES = \
+noinst_LTLIBRARIES = libfirewall-manager.la
+
+libfirewall_manager_la_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/include \
- -I${top_srcdir}/libnm-util
-
-noinst_LTLIBRARIES = libfirewall-manager.la
-
-libfirewall_manager_la_SOURCES = \
- nm-firewall-manager.h \
- nm-firewall-manager.c
-
-libfirewall_manager_la_CPPFLAGS = \
+ -I${top_srcdir}/libnm-util \
$(DBUS_CFLAGS) \
$(GLIB_CFLAGS) \
-DNM_PKGDATADIR=\"$(pkgdatadir)\" \
-DNM_LOCALSTATEDIR=\"$(localstatedir)\"
+libfirewall_manager_la_SOURCES = \
+ nm-firewall-manager.h \
+ nm-firewall-manager.c
+
libfirewall_manager_la_LIBADD = \
$(top_builddir)/src/logging/libnm-logging.la \
$(DBUS_LIBS) \
$(GLIB_LIBS)
diff --git a/src/generated/Makefile.am b/src/generated/Makefile.am
index 307766e..b313e45 100644
--- a/src/generated/Makefile.am
+++ b/src/generated/Makefile.am
@@ -46,15 +46,15 @@ GLIB_GENERATED = nm-enum-types.h nm-enum-types.c
nm_enum_types_sources = $(nm_daemon_sources)
GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
GLIB_GENERATED += nm-marshal.h nm-marshal.c
nm_marshal_sources = $(nm_daemon_sources)
-INCLUDES = \
+libnm_generated_la_CPPFLAGS = \
-I${top_srcdir}/include \
-I${top_builddir}/include \
-I${top_srcdir}/src \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/src/dns-manager \
-I${top_srcdir}/src/vpn-manager \
-I${top_srcdir}/src/dhcp-manager \
@@ -63,31 +63,29 @@ INCLUDES = \
-I${top_srcdir}/src/ppp-manager \
-I${top_srcdir}/src/dnsmasq-manager \
-I${top_srcdir}/src/modem-manager \
-I$(top_srcdir)/src/bluez-manager \
-I$(top_srcdir)/src/firewall-manager \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/src/wifi \
- -I$(top_srcdir)/libnm-util
-
-if WITH_WIMAX
-INCLUDES += -I$(top_srcdir)/src/wimax
-endif
-
-libnm_generated_la_CPPFLAGS = \
+ -I$(top_srcdir)/libnm-util \
$(DBUS_CFLAGS) \
$(GLIB_CFLAGS) \
$(GUDEV_CFLAGS) \
$(LIBNL_CFLAGS) \
$(POLKIT_CFLAGS) \
$(SYSTEMD_LOGIN_CFLAGS) \
$(IWMX_SDK_CFLAGS)
+if WITH_WIMAX
+libnm_generated_la_CPPFLAGS += -I$(top_srcdir)/src/wimax
+endif
+
if WITH_MODEM_MANAGER_1
- libnm_generated_la_CPPFLAGS += $(MM_GLIB_CFLAGS)
+libnm_generated_la_CPPFLAGS += $(MM_GLIB_CFLAGS)
endif
libnm_generated_la_LIBADD = \
$(GLIB_LIBS)
BUILT_SOURCES = $(GLIB_GENERATED)
diff --git a/src/ip6-manager/Makefile.am b/src/ip6-manager/Makefile.am
index eb73039..25f5749 100644
--- a/src/ip6-manager/Makefile.am
+++ b/src/ip6-manager/Makefile.am
@@ -1,29 +1,27 @@
-INCLUDES = \
+noinst_LTLIBRARIES = libip6-manager.la
+
+libip6_manager_la_CPPFLAGS = \
-I${top_srcdir} \
-I${top_builddir}/include \
-I${top_srcdir}/include \
-I${top_builddir}/libnm-util \
-I${top_srcdir}/libnm-util \
-I${top_builddir}/src/generated \
-I${top_srcdir}/src/generated \
-I${top_srcdir}/src/logging \
- -I${top_srcdir}/src
-
-noinst_LTLIBRARIES = libip6-manager.la
-
-libip6_manager_la_SOURCES = \
- nm-ip6-manager.c \
- nm-ip6-manager.h
-
-libip6_manager_la_CPPFLAGS = \
+ -I${top_srcdir}/src \
$(LIBNL_CFLAGS) \
$(DBUS_CFLAGS) \
$(GLIB_CFLAGS)
+libip6_manager_la_SOURCES = \
+ nm-ip6-manager.c \
+ nm-ip6-manager.h
+
libip6_manager_la_LIBADD = \
$(top_builddir)/src/generated/libnm-generated.la \
$(top_builddir)/src/logging/libnm-logging.la \
$(LIBNL_LIBS) \
$(DBUS_LIBS) \
$(GLIB_LIBS)
diff --git a/src/modem-manager/Makefile.am b/src/modem-manager/Makefile.am
index aa5534f..012d26e 100644
--- a/src/modem-manager/Makefile.am
+++ b/src/modem-manager/Makefile.am
@@ -1,38 +1,36 @@
include $(GLIB_MAKEFILE)
-INCLUDES = \
+noinst_LTLIBRARIES = libmodem-manager.la
+
+libmodem_manager_la_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_builddir}/src/generated \
-I${top_srcdir}/src/generated \
-I${top_srcdir}/src/logging \
-I${top_builddir}/include \
-I${top_srcdir}/include \
-I${top_builddir}/libnm-util \
- -I${top_srcdir}/libnm-util
-
-noinst_LTLIBRARIES = libmodem-manager.la
+ -I${top_srcdir}/libnm-util \
+ $(LIBNL_CFLAGS) \
+ $(DBUS_CFLAGS)
libmodem_manager_la_SOURCES = \
nm-modem.c \
nm-modem.h \
nm-modem-generic.c \
nm-modem-generic.h \
nm-modem-cdma.c \
nm-modem-cdma.h \
nm-modem-gsm.c \
nm-modem-gsm.h \
nm-modem-manager.h \
nm-modem-manager.c \
nm-modem-types.h
-libmodem_manager_la_CPPFLAGS = \
- $(LIBNL_CFLAGS) \
- $(DBUS_CFLAGS)
-
libmodem_manager_la_LIBADD = \
$(top_builddir)/src/generated/libnm-generated.la \
$(top_builddir)/src/logging/libnm-logging.la \
$(LIBNL_LIBS) \
$(DBUS_LIBS)
# Support for the new ModemManager1 interface
diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am
index 7e8102a..4ad4ff8 100644
--- a/src/ppp-manager/Makefile.am
+++ b/src/ppp-manager/Makefile.am
@@ -1,18 +1,20 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I${top_srcdir} \
-I${top_builddir}/include \
-I${top_srcdir}/include \
-I${top_builddir}/libnm-util \
-I${top_srcdir}/libnm-util \
-I${top_srcdir}/src \
-I${top_builddir}/src/generated \
-I${top_srcdir}/src/generated \
-I${top_srcdir}/src/logging \
- -I${top_srcdir}/src/posix-signals
+ -I${top_srcdir}/src/posix-signals \
+ $(DBUS_CFLAGS) \
+ $(GLIB_CFLAGS)
noinst_LTLIBRARIES = libppp-manager.la
libppp_manager_la_SOURCES = \
nm-ppp-manager.c \
nm-ppp-manager.h \
nm-ppp-status.h
@@ -21,15 +23,15 @@ nm-ppp-manager-glue.h:
$(top_srcdir)/introspection/nm-ppp-manager.xml
$(AM_V_GEN) dbus-binding-tool --prefix=nm_ppp_manager
--mode=glib-server --output=$@ $<
built_sources = nm-ppp-manager-glue.h
$(libppp_manager_la_OBJECTS): $(built_sources)
libppp_manager_la_CPPFLAGS = \
- $(DBUS_CFLAGS) \
+ $(AM_CPPFLAGS) \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DLIBDIR=\"$(libdir)\" \
-DPLUGINDIR=\"$(PPPD_PLUGIN_DIR)\"
libppp_manager_la_LIBADD = \
$(top_builddir)/src/generated/libnm-generated.la \
$(top_builddir)/src/logging/libnm-logging.la \
@@ -43,18 +45,14 @@ pppd_plugindir = $(PPPD_PLUGIN_DIR)
pppd_plugin_LTLIBRARIES = nm-pppd-plugin.la
nm_pppd_plugin_la_SOURCES = \
nm-pppd-plugin.c \
nm-pppd-plugin.h \
nm-ppp-status.h
-nm_pppd_plugin_la_CPPFLAGS = \
- $(DBUS_CFLAGS) \
- $(GLIB_CFLAGS)
-
nm_pppd_plugin_la_LDFLAGS = -module -avoid-version
nm_pppd_plugin_la_LIBADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(DBUS_LIBS) \
$(GLIB_LIBS)
diff --git a/src/settings/Makefile.am b/src/settings/Makefile.am
index 6ca7633..ea81a7c 100644
--- a/src/settings/Makefile.am
+++ b/src/settings/Makefile.am
@@ -1,29 +1,28 @@
SUBDIRS = plugins . tests
-INCLUDES = -I${top_srcdir} \
+AM_CPPFLAGS = \
+ -I${top_srcdir} \
-I${top_builddir}/include \
-I${top_srcdir}/include \
-I${top_builddir}/libnm-util \
-I${top_srcdir}/libnm-util \
-I${top_builddir}/src/generated \
-I${top_srcdir}/src/generated \
-I${top_srcdir}/src/logging \
- -I${top_srcdir}/src
+ -I${top_srcdir}/src \
+ $(DBUS_CFLAGS) \
+ $(GLIB_CFLAGS)
noinst_LTLIBRARIES = libsettings.la libtest-settings-utils.la
libtest_settings_utils_la_SOURCES = \
nm-settings-utils.c \
nm-settings-utils.h
-libtest_settings_utils_la_CPPFLAGS = \
- $(DBUS_CFLAGS) \
- $(GLIB_CFLAGS)
-
libtest_settings_utils_la_LIBADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(DBUS_LIBS) \
$(GLIB_LIBS)
BUILT_SOURCES = \
nm-settings-glue.h \
@@ -47,16 +46,15 @@ libsettings_la_SOURCES = \
nm-agent-manager.h \
nm-secret-agent.c \
nm-secret-agent.h \
nm-settings-utils.h \
nm-settings-utils.c
libsettings_la_CPPFLAGS = \
- $(DBUS_CFLAGS) \
- $(GLIB_CFLAGS) \
+ $(AM_CPPFLAGS) \
$(POLKIT_CFLAGS) \
-DBINDIR=\"$(bindir)\" \
-DSBINDIR=\"$(sbindir)\" \
-DLIBEXECDIR=\"$(libexecdir)\" \
-DDATADIR=\"$(datadir)\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DNMSTATEDIR=\"$(nmstatedir)\" \
diff --git a/src/settings/plugins/example/Makefile.am
b/src/settings/plugins/example/Makefile.am
index 95558b7..f3aa11b 100644
--- a/src/settings/plugins/example/Makefile.am
+++ b/src/settings/plugins/example/Makefile.am
@@ -1,16 +1,19 @@
-INCLUDES = \
+# 'noinst' here because this is an example plugin we don't want to install
+noinst_LTLIBRARIES = libnm-settings-plugin-example.la
+
+libnm_settings_plugin_example_la_CPPFLAGS = \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/libnm-util \
- -I$(top_builddir)/libnm-util
-
-# 'noinst' here because this is an example plugin we don't want to install
-noinst_LTLIBRARIES = libnm-settings-plugin-example.la
+ -I$(top_builddir)/libnm-util \
+ $(GLIB_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ -DNMCONFDIR=\"$(nmconfdir)\"
# The actual plugins typically pull reader.c and writer.c out into
# their own static library so that unit tests can use them without
# having to build the entire plugin. But since this is a simple
# plugin we don't do that yet.
libnm_settings_plugin_example_la_SOURCES = \
@@ -19,18 +22,13 @@ libnm_settings_plugin_example_la_SOURCES = \
plugin.c \
plugin.h \
errors.c \
common.h \
reader.c \
writer.c
-libnm_settings_plugin_example_la_CPPFLAGS = \
- $(GLIB_CFLAGS) \
- $(DBUS_CFLAGS) \
- -DNMCONFDIR=\"$(nmconfdir)\"
-
libnm_settings_plugin_example_la_LIBADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(GLIB_LIBS)
libnm_settings_plugin_example_la_LDFLAGS = -module -avoid-version
diff --git a/src/settings/plugins/ifcfg-rh/Makefile.am
b/src/settings/plugins/ifcfg-rh/Makefile.am
index a2c3f0f..3faa60d 100644
--- a/src/settings/plugins/ifcfg-rh/Makefile.am
+++ b/src/settings/plugins/ifcfg-rh/Makefile.am
@@ -18,25 +18,23 @@ libifcfg_rh_io_la_SOURCES = \
writer.c \
writer.h \
errors.c \
common.h \
utils.c \
utils.h
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/src/wifi \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/src/posix-signals \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/libnm-glib \
-I$(top_srcdir)/libnm-util \
- -I$(top_builddir)/libnm-util
-
-libifcfg_rh_io_la_CPPFLAGS = \
+ -I$(top_builddir)/libnm-util \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
$(NSS_CFLAGS) \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DSBINDIR=\"$(sbindir)\"
libifcfg_rh_io_la_LIBADD = \
@@ -48,19 +46,14 @@ libifcfg_rh_io_la_LIBADD = \
libnm_settings_plugin_ifcfg_rh_la_SOURCES = \
plugin.c \
plugin.h \
nm-ifcfg-connection.c \
nm-ifcfg-connection.h
-libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = \
- $(GLIB_CFLAGS) \
- $(DBUS_CFLAGS) \
- -DSYSCONFDIR=\"$(sysconfdir)\"
-
libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = -module -avoid-version
libnm_settings_plugin_ifcfg_rh_la_LIBADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(top_builddir)/libnm-glib/libnm-glib.la \
libifcfg-rh-io.la \
$(GLIB_LIBS)
diff --git a/src/settings/plugins/ifcfg-rh/tests/Makefile.am
b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
index 9aec92f..d1b75fc 100644
--- a/src/settings/plugins/ifcfg-rh/tests/Makefile.am
+++ b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
@@ -1,26 +1,27 @@
if ENABLE_TESTS
SUBDIRS=network-scripts
-INCLUDES = \
+AM_CPPFLAGS = \
-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)/../
+ -I$(srcdir)/../ \
+ $(GLIB_CFLAGS)
noinst_PROGRAMS = test-ifcfg-rh test-ifcfg-rh-utils
test_ifcfg_rh_SOURCES = \
test-ifcfg-rh.c
test_ifcfg_rh_CPPFLAGS = \
- $(GLIB_CFLAGS) \
+ $(AM_CPPFLAGS) \
$(DBUS_CFLAGS) \
-DTEST_IFCFG_DIR=\"$(abs_srcdir)\" \
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/\"
test_ifcfg_rh_LDADD = \
$(top_builddir)/libnm-glib/libnm-glib.la \
$(top_builddir)/libnm-util/libnm-util.la \
@@ -28,17 +29,14 @@ test_ifcfg_rh_LDADD = \
$(builddir)/../libifcfg-rh-io.la \
$(LIBM)
$(DBUS_LIBS)
test_ifcfg_rh_utils_SOURCES = \
test-ifcfg-rh-utils.c
-test_ifcfg_rh_utils_CPPFLAGS = \
- $(GLIB_CFLAGS)
-
test_ifcfg_rh_utils_LDADD = \
$(builddir)/../libifcfg-rh-io.la
check-local: test-ifcfg-rh
$(abs_builddir)/test-ifcfg-rh-utils
$(abs_builddir)/test-ifcfg-rh
diff --git a/src/settings/plugins/ifnet/Makefile.am
b/src/settings/plugins/ifnet/Makefile.am
index 9aaa06f..66d706b 100644
--- a/src/settings/plugins/ifnet/Makefile.am
+++ b/src/settings/plugins/ifnet/Makefile.am
@@ -1,33 +1,35 @@
SUBDIRS = . tests
-INCLUDES = \
+pkglib_LTLIBRARIES = libnm-settings-plugin-ifnet.la
+
+noinst_LTLIBRARIES = lib-ifnet-io.la
+
+AM_CPPFLAGS = \
-I$(top_srcdir)/src/wifi \
-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)/libnm-util
-
-pkglib_LTLIBRARIES = libnm-settings-plugin-ifnet.la
-
-noinst_LTLIBRARIES = lib-ifnet-io.la
+ -I$(top_builddir)/libnm-util \
+ $(GLIB_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ -DSYSCONFDIR=\"$(sysconfdir)\" \
+ -DSBINDIR=\"$(sbindir)\"
libnm_settings_plugin_ifnet_la_SOURCES = \
nm-ifnet-connection.c \
nm-ifnet-connection.h \
plugin.c \
plugin.h
libnm_settings_plugin_ifnet_la_CPPFLAGS = \
- $(GLIB_CFLAGS) \
- $(DBUS_CFLAGS) \
$(GUDEV_CFLAGS) \
- -DSYSCONFDIR=\"$(sysconfdir)\"
+ $(AM_CPPFLAGS)
libnm_settings_plugin_ifnet_la_LDFLAGS = -module -avoid-version
libnm_settings_plugin_ifnet_la_LIBADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(top_builddir)/libnm-glib/libnm-glib.la \
lib-ifnet-io.la\
@@ -40,17 +42,11 @@ lib_ifnet_io_la_SOURCES = \
connection_parser.c \
connection_parser.h \
net_utils.h\
net_utils.c\
wpa_parser.h\
wpa_parser.c
-lib_ifnet_io_la_CPPFLAGS = \
- $(GLIB_CFLAGS) \
- $(DBUS_CFLAGS) \
- -DSYSCONFDIR=\"$(sysconfdir)\" \
- -DSBINDIR=\"$(sbindir)\"
-
lib_ifnet_io_la_LIBADD = \
$(top_builddir)/src/wifi/libwifi-utils.la \
$(top_builddir)/libnm-util/libnm-util.la \
$(GLIB_LIBS)
diff --git a/src/settings/plugins/ifnet/tests/Makefile.am
b/src/settings/plugins/ifnet/tests/Makefile.am
index 23f96c8..8d80b73 100644
--- a/src/settings/plugins/ifnet/tests/Makefile.am
+++ b/src/settings/plugins/ifnet/tests/Makefile.am
@@ -1,25 +1,24 @@
if ENABLE_TESTS
-INCLUDES=-I$(srcdir)/../ \
- -I$(top_srcdir)/libnm-glib \
- -I$(top_srcdir)/libnm-util \
- -I$(top_builddir)/libnm-util \
- -I$(top_srcdir)/include \
- -I$(top_builddir)/include \
- -I$(top_srcdir)/src/settings
-
-noinst_PROGRAMS = check_ifnet
-check_ifnet_SOURCES = test_all.c
-
-check_ifnet_CPPFLAGS = \
+AM_CPPFLAGS= \
+ -I$(srcdir)/../ \
+ -I$(top_srcdir)/libnm-glib \
+ -I$(top_srcdir)/libnm-util \
+ -I$(top_builddir)/libnm-util \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir)/include \
+ -I$(top_srcdir)/src/settings \
$(CHECK_CFLAGS) \
$(GLIB_CFLAGS) \
-DTEST_WPA_SUPPLICANT_CONF='"$(srcdir)/wpa_supplicant.conf"'
+noinst_PROGRAMS = check_ifnet
+check_ifnet_SOURCES = test_all.c
+
check_ifnet_LDADD = $(top_builddir)/libnm-util/libnm-util.la \
$(builddir)/../lib-ifnet-io.la \
$(CHECK_LIBS) \
$(GLIB_LIBS) \
$(LIBM)
check-local: check_ifnet
$(abs_builddir)/check_ifnet $(abs_srcdir) $(abs_builddir)
diff --git a/src/settings/plugins/ifupdown/Makefile.am
b/src/settings/plugins/ifupdown/Makefile.am
index 9d0ad25..ae07f7b 100644
--- a/src/settings/plugins/ifupdown/Makefile.am
+++ b/src/settings/plugins/ifupdown/Makefile.am
@@ -1,48 +1,44 @@
SUBDIRS = . tests
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/src/logging \
-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)/libnm-util
+ -I$(top_builddir)/libnm-util \
+ $(GLIB_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ -DSYSCONFDIR=\"$(sysconfdir)\"
noinst_LTLIBRARIES = libifupdown-io.la
libifupdown_io_la_SOURCES = \
interface_parser.c \
interface_parser.h \
parser.c \
parser.h
-libifupdown_io_la_CPPFLAGS = \
- $(GLIB_CFLAGS) \
- $(DBUS_CFLAGS) \
- -DSYSCONFDIR=\"$(sysconfdir)\"
-
libifupdown_io_la_LIBADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(GLIB_LIBS)
pkglib_LTLIBRARIES = libnm-settings-plugin-ifupdown.la
libnm_settings_plugin_ifupdown_la_SOURCES = \
nm-ifupdown-connection.c \
nm-ifupdown-connection.h \
plugin.c \
plugin.h
libnm_settings_plugin_ifupdown_la_CPPFLAGS = \
- $(GLIB_CFLAGS) \
- $(DBUS_CFLAGS) \
$(GUDEV_CFLAGS) \
- -DSYSCONFDIR=\"$(sysconfdir)\"
+ $(AM_CPPFLAGS)
libnm_settings_plugin_ifupdown_la_LDFLAGS = -module -avoid-version
libnm_settings_plugin_ifupdown_la_LIBADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(top_builddir)/src/logging/libnm-logging.la \
libifupdown-io.la \
$(GLIB_LIBS) \
diff --git a/src/settings/plugins/ifupdown/tests/Makefile.am
b/src/settings/plugins/ifupdown/tests/Makefile.am
index 6bde26f..d828686 100644
--- a/src/settings/plugins/ifupdown/tests/Makefile.am
+++ b/src/settings/plugins/ifupdown/tests/Makefile.am
@@ -1,27 +1,25 @@
if ENABLE_TESTS
-INCLUDES = \
+noinst_PROGRAMS = test-ifupdown
+
+AM_CPPFLAGS = \
-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)/../
-
-noinst_PROGRAMS = test-ifupdown
-
-test_ifupdown_SOURCES = \
- test-ifupdown.c
-
-test_ifupdown_CPPFLAGS = \
+ -I$(srcdir)/../ \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
-DTEST_ENI_DIR=\"$(abs_srcdir)\"
+test_ifupdown_SOURCES = \
+ test-ifupdown.c
+
test_ifupdown_LDADD = \
$(top_builddir)/libnm-glib/libnm-glib.la \
$(top_builddir)/libnm-util/libnm-util.la \
$(builddir)/../libifupdown-io.la \
$(DBUS_LIBS)
check-local: test-ifupdown
diff --git a/src/settings/plugins/keyfile/Makefile.am
b/src/settings/plugins/keyfile/Makefile.am
index a9fbb66..b0cd688 100644
--- a/src/settings/plugins/keyfile/Makefile.am
+++ b/src/settings/plugins/keyfile/Makefile.am
@@ -1,15 +1,18 @@
SUBDIRS = . tests
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/libnm-util \
- -I$(top_builddir)/libnm-util
+ -I$(top_builddir)/libnm-util \
+ $(GLIB_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ -DNMCONFDIR=\"$(nmconfdir)\"
noinst_LTLIBRARIES = \
libkeyfile-io.la \
libnm-settings-plugin-keyfile.la
##### I/O library for testcases #####
@@ -19,34 +22,24 @@ libkeyfile_io_la_SOURCES = \
writer.c \
writer.h \
errors.c \
utils.c \
utils.h \
common.h
-libkeyfile_io_la_CPPFLAGS = \
- $(GLIB_CFLAGS) \
- $(DBUS_CFLAGS) \
- -DNMCONFDIR=\"$(nmconfdir)\"
-
libkeyfile_io_la_LIBADD = $(GLIB_LIBS)
#####################################
libnm_settings_plugin_keyfile_la_SOURCES = \
nm-keyfile-connection.c \
nm-keyfile-connection.h \
plugin.c \
plugin.h
-libnm_settings_plugin_keyfile_la_CPPFLAGS = \
- $(GLIB_CFLAGS) \
- $(DBUS_CFLAGS) \
- -DNMCONFDIR=\"$(nmconfdir)\"
-
libnm_settings_plugin_keyfile_la_LIBADD = \
$(top_builddir)/libnm-util/libnm-util.la \
libkeyfile-io.la \
$(GLIB_LIBS) \
$(DBUS_LIBS)
libnm_settings_plugin_keyfile_la_LDFLAGS = -rdynamic
diff --git a/src/settings/plugins/keyfile/tests/Makefile.am
b/src/settings/plugins/keyfile/tests/Makefile.am
index 26e8eaf..c2f5fe3 100644
--- a/src/settings/plugins/keyfile/tests/Makefile.am
+++ b/src/settings/plugins/keyfile/tests/Makefile.am
@@ -1,30 +1,28 @@
if ENABLE_TESTS
SUBDIRS=keyfiles
-INCLUDES = \
+noinst_PROGRAMS = test-keyfile
+
+AM_CPPFLAGS = \
-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)/../
-
-noinst_PROGRAMS = test-keyfile
-
-test_keyfile_SOURCES = \
- test-keyfile.c
-
-test_keyfile_CPPFLAGS = \
+ -I$(srcdir)/../ \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
-DTEST_KEYFILES_DIR=\"$(abs_srcdir)/keyfiles\" \
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/keyfiles\"
+test_keyfile_SOURCES = \
+ test-keyfile.c
+
test_keyfile_LDADD = \
$(builddir)/../libkeyfile-io.la \
$(top_builddir)/libnm-glib/libnm-glib.la \
$(top_builddir)/libnm-util/libnm-util.la \
$(DBUS_LIBS)
check-local: test-keyfile
diff --git a/src/settings/tests/Makefile.am b/src/settings/tests/Makefile.am
index 5c0c456..9471bcb 100644
--- a/src/settings/tests/Makefile.am
+++ b/src/settings/tests/Makefile.am
@@ -1,27 +1,25 @@
if ENABLE_TESTS
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/libnm-util \
- -I$(top_srcdir)/src/settings
+ -I$(top_srcdir)/src/settings \
+ $(GLIB_CFLAGS) \
+ $(DBUS_CFLAGS)
noinst_PROGRAMS = \
test-wired-defname
####### wired defname test #######
test_wired_defname_SOURCES = \
test-wired-defname.c
-test_wired_defname_CPPFLAGS = \
- $(GLIB_CFLAGS) \
- $(DBUS_CFLAGS)
-
test_wired_defname_LDADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(top_builddir)/src/settings/libtest-settings-utils.la \
$(GLIB_LIBS) \
$(DBUS_LIBS)
###########################################
diff --git a/src/supplicant-manager/Makefile.am
b/src/supplicant-manager/Makefile.am
index 74ec9c3..a4d2f25 100644
--- a/src/supplicant-manager/Makefile.am
+++ b/src/supplicant-manager/Makefile.am
@@ -1,36 +1,34 @@
SUBDIRS = . tests
-INCLUDES = \
+noinst_LTLIBRARIES = libsupplicant-manager.la
+
+libsupplicant_manager_la_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_builddir}/src/generated \
-I${top_srcdir}/src/generated \
-I${top_srcdir}/src/logging \
-I${top_builddir}/include \
-I${top_srcdir}/include \
-I${top_builddir}/libnm-util \
- -I${top_srcdir}/libnm-util
-
-noinst_LTLIBRARIES = libsupplicant-manager.la
+ -I${top_srcdir}/libnm-util \
+ $(DBUS_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ -DNM_PKGDATADIR=\"$(pkgdatadir)\" \
+ -DNM_LOCALSTATEDIR=\"$(localstatedir)\"
libsupplicant_manager_la_SOURCES = \
nm-supplicant-types.h \
nm-supplicant-manager.h \
nm-supplicant-manager.c \
nm-supplicant-config.h \
nm-supplicant-config.c \
nm-supplicant-interface.c \
nm-supplicant-interface.h \
nm-supplicant-settings-verify.h \
nm-supplicant-settings-verify.c
-libsupplicant_manager_la_CPPFLAGS = \
- $(DBUS_CFLAGS) \
- $(GLIB_CFLAGS) \
- -DNM_PKGDATADIR=\"$(pkgdatadir)\" \
- -DNM_LOCALSTATEDIR=\"$(localstatedir)\"
-
libsupplicant_manager_la_LIBADD = \
$(top_builddir)/src/logging/libnm-logging.la \
$(DBUS_LIBS) \
$(GLIB_LIBS)
diff --git a/src/supplicant-manager/tests/Makefile.am
b/src/supplicant-manager/tests/Makefile.am
index 20ba9cc..58132a6 100644
--- a/src/supplicant-manager/tests/Makefile.am
+++ b/src/supplicant-manager/tests/Makefile.am
@@ -1,26 +1,24 @@
if ENABLE_TESTS
-INCLUDES = \
+noinst_PROGRAMS = test-supplicant-config
+
+test_supplicant_config_CPPFLAGS = \
-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
-
-noinst_PROGRAMS = test-supplicant-config
-
-test_supplicant_config_SOURCES = \
- test-supplicant-config.c
-
-test_supplicant_config_CPPFLAGS = \
+ -I$(top_srcdir)/src/supplicant-manager \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS)
+test_supplicant_config_SOURCES = \
+ test-supplicant-config.c
+
test_supplicant_config_LDADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(top_builddir)/src/supplicant-manager/libsupplicant-manager.la \
$(DBUS_LIBS)
check-local: test-supplicant-config
$(abs_builddir)/test-supplicant-config
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 8f40636..77e6c0f 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,31 +1,32 @@
if ENABLE_TESTS
-INCLUDES = \
+AM_CPPFLAGS = \
-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_srcdir)/src \
- -I$(top_builddir)/src
+ -I$(top_builddir)/src \
+ $(GLIB_CFLAGS) \
+ $(DBUS_CFLAGS)
noinst_PROGRAMS = \
test-dhcp-options \
test-policy-hosts \
test-wifi-ap-utils
####### DHCP options test #######
test_dhcp_options_SOURCES = \
test-dhcp-options.c
test_dhcp_options_CPPFLAGS = \
- $(GLIB_CFLAGS) \
- $(DBUS_CFLAGS) \
+ $(AM_CPPFLAGS) \
-DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \
-DDHCPCD_PATH=\"$(DHCPCD_PATH)\"
test_dhcp_options_LDADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(top_builddir)/src/dhcp-manager/libdhcp-manager.la \
$(top_builddir)/src/libtest-dhcp.la \
@@ -33,31 +34,24 @@ test_dhcp_options_LDADD = \
$(DBUS_LIBS)
####### policy /etc/hosts test #######
test_policy_hosts_SOURCES = \
test-policy-hosts.c
-test_policy_hosts_CPPFLAGS = \
- $(GLIB_CFLAGS)
-
test_policy_hosts_LDADD = \
-ldl \
$(top_builddir)/src/libtest-policy-hosts.la \
$(GLIB_LIBS)
####### wifi ap utils test #######
test_wifi_ap_utils_SOURCES = \
test-wifi-ap-utils.c
-test_wifi_ap_utils_CPPFLAGS = \
- $(GLIB_CFLAGS) \
- $(DBUS_CFLAGS)
-
test_wifi_ap_utils_LDADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(top_builddir)/src/libtest-wifi-ap-utils.la \
$(GLIB_LIBS) \
$(DBUS_LIBS)
####### secret agent interface test #######
diff --git a/src/vpn-manager/Makefile.am b/src/vpn-manager/Makefile.am
index a525ce2..94809dd 100644
--- a/src/vpn-manager/Makefile.am
+++ b/src/vpn-manager/Makefile.am
@@ -1,37 +1,34 @@
-INCLUDES = \
+noinst_LTLIBRARIES = libvpn-manager.la
+
+libvpn_manager_la_SOURCES = \
+ nm-vpn-manager.c \
+ nm-vpn-manager.h \
+ nm-vpn-service.c \
+ nm-vpn-service.h \
+ nm-vpn-connection.c \
+ nm-vpn-connection.h
+
+libvpn_manager_la_CPPFLAGS = \
-I${top_srcdir} \
-I${top_builddir}/include \
-I${top_srcdir}/include \
-I${top_builddir}/libnm-util \
-I${top_srcdir}/libnm-util \
-I${top_builddir}/src/generated \
-I${top_srcdir}/src/generated \
-I${top_srcdir}/src/logging \
-I${top_srcdir}/src/posix-signals \
-I${top_srcdir}/src \
-I${top_srcdir}/src/dns-manager \
+ $(LIBNL_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ $(GLIB_CFLAGS) \
-DVPN_NAME_FILES_DIR=\""$(sysconfdir)/NetworkManager/VPN"\"
-
-noinst_LTLIBRARIES = libvpn-manager.la
-
-libvpn_manager_la_SOURCES = \
- nm-vpn-manager.c \
- nm-vpn-manager.h \
- nm-vpn-service.c \
- nm-vpn-service.h \
- nm-vpn-connection.c \
- nm-vpn-connection.h
-
-libvpn_manager_la_CPPFLAGS = \
- $(LIBNL_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(GLIB_CFLAGS)
-
libvpn_manager_la_LIBADD = \
$(top_builddir)/src/generated/libnm-generated.la \
$(top_builddir)/src/logging/libnm-logging.la \
$(top_builddir)/src/posix-signals/libnm-posix-signals.la \
$(top_builddir)/libnm-util/libnm-util.la \
$(LIBNL_LIBS) \
$(DBUS_LIBS) \
diff --git a/src/wifi/Makefile.am b/src/wifi/Makefile.am
index c9a1b47..4100743 100644
--- a/src/wifi/Makefile.am
+++ b/src/wifi/Makefile.am
@@ -1,29 +1,27 @@
-INCLUDES = \
- -I${top_srcdir}/include \
- -I${top_builddir}/include \
- -I${top_srcdir}/src/logging \
- -I${top_srcdir}/libnm-util \
- -I${top_builddir}/libnm-util \
- -I${top_srcdir}/src
-
noinst_LTLIBRARIES = libwifi-utils.la
libwifi_utils_la_SOURCES = \
wifi-utils.c \
wifi-utils.h \
wifi-utils-private.h \
wifi-utils-nl80211.c \
wifi-utils-nl80211.h
if WITH_WEXT
libwifi_utils_la_SOURCES += wifi-utils-wext.c wifi-utils-wext.h
endif
libwifi_utils_la_CPPFLAGS = \
+ -I${top_srcdir}/include \
+ -I${top_builddir}/include \
+ -I${top_srcdir}/src/logging \
+ -I${top_srcdir}/libnm-util \
+ -I${top_builddir}/libnm-util \
+ -I${top_srcdir}/src \
$(GLIB_CFLAGS) \
$(LIBNL_CFLAGS)
libwifi_utils_la_LIBADD = \
$(top_builddir)/src/logging/libnm-logging.la \
$(top_builddir)/libnm-util/libnm-util.la \
$(GLIB_LIBS) \
diff --git a/src/wimax/Makefile.am b/src/wimax/Makefile.am
index caf017d..55c7046 100644
--- a/src/wimax/Makefile.am
+++ b/src/wimax/Makefile.am
@@ -1,17 +1,7 @@
-INCLUDES = \
- -I${top_srcdir}/src \
- -I${top_builddir}/src/generated \
- -I${top_srcdir}/src/generated \
- -I${top_srcdir}/src/logging \
- -I${top_builddir}/include \
- -I${top_srcdir}/include \
- -I${top_builddir}/libnm-util \
- -I${top_srcdir}/libnm-util
-
pkglib_LTLIBRARIES = libnm-device-plugin-wimax.la
libnm_device_plugin_wimax_la_SOURCES = \
nm-wimax-factory.c \
nm-device-wimax.c \
nm-device-wimax.h \
nm-wimax-nsp.c \
@@ -19,14 +9,22 @@ libnm_device_plugin_wimax_la_SOURCES = \
nm-wimax-types.h \
nm-wimax-util.c \
nm-wimax-util.h \
iwmxsdk.c \
iwmxsdk.h
libnm_device_plugin_wimax_la_CPPFLAGS = \
+ -I${top_srcdir}/src \
+ -I${top_builddir}/src/generated \
+ -I${top_srcdir}/src/generated \
+ -I${top_srcdir}/src/logging \
+ -I${top_builddir}/include \
+ -I${top_srcdir}/include \
+ -I${top_builddir}/libnm-util \
+ -I${top_srcdir}/libnm-util \
$(DBUS_CFLAGS) \
$(IWMX_SDK_CFLAGS) \
$(LIBNL_CFLAGS) \
$(GUDEV_CFLAGS)
libnm_device_plugin_wimax_la_LDFLAGS = -module -avoid-version
libnm_device_plugin_wimax_la_LIBADD = \
diff --git a/test/Makefile.am b/test/Makefile.am
index bdfd306..4b7ca43 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,15 +1,14 @@
-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
-
AM_CPPFLAGS = \
+ -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 \
$(DBUS_CFLAGS) \
$(GLIB_CFLAGS) \
-DBINDIR=\"$(bindir)\" \
-DDATADIR=\"$(datadir)\" \
-DNMLOCALEDIR=\"$(datadir)/locale\"
bin_PROGRAMS = nm-tool nm-online
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 38d861e..abb7c5f 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,22 +1,20 @@
GENERATE_SETTINGS_SPEC_SOURCE = generate-settings-spec.c
-INCLUDES = \
- -I$(top_srcdir)/include \
- -I$(top_builddir)/include \
- -I$(top_srcdir)/libnm-util \
- -I$(top_builddir)/libnm-util
-
noinst_PROGRAMS = \
generate-settings-spec
generate_settings_spec_SOURCES = \
$(GENERATE_SETTINGS_SPEC_SOURCE)
generate_settings_spec_CPPFLAGS = \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir)/include \
+ -I$(top_srcdir)/libnm-util \
+ -I$(top_builddir)/libnm-util \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS)
generate_settings_spec_LDADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(GLIB_LIBS) \
$(DBUS_LIBS)
--
1.8.5.3
_______________________________________________
networkmanager-list mailing list
networkmanager-list@gnome.org
https://mail.gnome.org/mailman/listinfo/networkmanager-list
