fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 02:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: disable deprecation checks for internal compilation

Browse source 
For internal compilation we want to be able to use deprecated
API without warnings.

Define the version min/max macros to effectively disable deprecation
warnings.

However, don't do it via CFLAGS option in the makefiles, instead hack it
to "nm-default.h". After all, *every* source file that is for internal
compilation needs to include this header as first.
This commit is contained in:
Thomas Haller 2016-04-05 21:18:43 +02:00 • committed by Lubomir Rintel
parent 29cfb144a8
commit 9152dec99f
44 changed files with 11 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
callouts/Makefile.am
View file

@ -7,7 +7,6 @@ AM_CPPFLAGS = \
-I${top_builddir}/libnm-core \ -I${top_builddir}/libnm-core \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
-DNETWORKMANAGER_COMPILATION \ -DNETWORKMANAGER_COMPILATION \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
-DNMCONFDIR=\"$(nmconfdir)\" \ -DNMCONFDIR=\"$(nmconfdir)\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \
-DLIBEXECDIR=\"$(libexecdir)\" -DLIBEXECDIR=\"$(libexecdir)\"

1
callouts/tests/Makefile.am
View file

@ -8,7 +8,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/callouts \ -I$(top_srcdir)/callouts \
-I$(top_builddir)/callouts \ -I$(top_builddir)/callouts \
-DNETWORKMANAGER_COMPILATION \ -DNETWORKMANAGER_COMPILATION \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
-DSRCDIR=\"$(abs_srcdir)\" \ -DSRCDIR=\"$(abs_srcdir)\" \
$(GLIB_CFLAGS) $(GLIB_CFLAGS)

1
clients/Makefile.am
View file

@ -8,7 +8,6 @@ AM_CPPFLAGS = \
-I${top_srcdir}/libnm \ -I${top_srcdir}/libnm \
-I${top_builddir}/libnm \ -I${top_builddir}/libnm \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
-DNMLOCALEDIR=\"$(datadir)/locale\" -DNMLOCALEDIR=\"$(datadir)/locale\"
bin_PROGRAMS = nm-online bin_PROGRAMS = nm-online

1
clients/cli/Makefile.am
View file

@ -15,7 +15,6 @@ AM_CPPFLAGS = \
-I${top_srcdir}/clients/common \ -I${top_srcdir}/clients/common \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
-DG_LOG_DOMAIN=\""nmcli"\" \ -DG_LOG_DOMAIN=\""nmcli"\" \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
-DNMCLI_LOCALEDIR=\"$(datadir)/locale\" -DNMCLI_LOCALEDIR=\"$(datadir)/locale\"
nmcli_SOURCES = \ nmcli_SOURCES = \

1
clients/tui/Makefile.am
View file

@ -16,7 +16,6 @@ AM_CPPFLAGS= \
$(NEWT_CFLAGS) \ $(NEWT_CFLAGS) \
$(GUDEV_CFLAGS) \ $(GUDEV_CFLAGS) \
-DG_LOG_DOMAIN=\""nmtui"\" \ -DG_LOG_DOMAIN=\""nmtui"\" \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
-DLOCALEDIR=\""$(localedir)"\" \ -DLOCALEDIR=\""$(localedir)"\" \
$(NULL) $(NULL)

1
docs/libnm-glib/Makefile.am
View file

@ -60,6 +60,7 @@ GTKDOC_CFLAGS = \
-I$(top_srcdir)/libnm-glib \ -I$(top_srcdir)/libnm-glib \
-I$(top_builddir)/libnm-glib \ -I$(top_builddir)/libnm-glib \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
-DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(DBUS_CFLAGS) $(DBUS_CFLAGS)

1
docs/libnm-util/Makefile.am
View file

@ -55,6 +55,7 @@ extra_files =
GTKDOC_CFLAGS = \ GTKDOC_CFLAGS = \
-I$(top_srcdir)/libnm-util \ -I$(top_srcdir)/libnm-util \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
-DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(DBUS_CFLAGS) $(DBUS_CFLAGS)

1
docs/libnm/Makefile.am
View file

@ -77,6 +77,7 @@ GTKDOC_CFLAGS = \
-I$(top_srcdir)/libnm \ -I$(top_srcdir)/libnm \
-I$(top_builddir)/libnm \ -I$(top_builddir)/libnm \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
-DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_8 \
$(GLIB_CFLAGS) $(GLIB_CFLAGS)
GTKDOC_LIBS = \ GTKDOC_LIBS = \

1
libnm-core/Makefile.am
View file

@ -12,7 +12,6 @@ AM_CPPFLAGS = \
-DNMCONFDIR=\"$(nmconfdir)\" \ -DNMCONFDIR=\"$(nmconfdir)\" \
-DNMLIBDIR=\"$(nmlibdir)\" \ -DNMLIBDIR=\"$(nmlibdir)\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(CODE_COVERAGE_CFLAGS) $(CODE_COVERAGE_CFLAGS)

1
libnm-core/tests/Makefile.am
View file

@ -17,7 +17,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libnm-core \ -I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
-DNETWORKMANAGER_COMPILATION \ -DNETWORKMANAGER_COMPILATION \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
-DTEST_CERT_DIR=\"$(certsdir)\" -DTEST_CERT_DIR=\"$(certsdir)\"

1
libnm-glib/Makefile.am
View file

@ -9,7 +9,6 @@ AM_CPPFLAGS = \
-I$(top_builddir)/libnm-util \ -I$(top_builddir)/libnm-util \
-DG_LOG_DOMAIN=\""libnm-glib"\" \ -DG_LOG_DOMAIN=\""libnm-glib"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(DBUS_CFLAGS) \ $(DBUS_CFLAGS) \
$(GLIB_CFLAGS) $(GLIB_CFLAGS)

1
libnm-glib/tests/Makefile.am
View file

@ -7,7 +7,6 @@ AM_CPPFLAGS = \
-I$(top_builddir)/libnm-util \ -I$(top_builddir)/libnm-util \
-I$(top_srcdir)/libnm-glib \ -I$(top_srcdir)/libnm-glib \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
-DTEST_NM_SERVICE=\"$(abs_top_srcdir)/tools/test-networkmanager-service.py\" \ -DTEST_NM_SERVICE=\"$(abs_top_srcdir)/tools/test-networkmanager-service.py\" \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(DBUS_CFLAGS) $(DBUS_CFLAGS)

1
libnm-util/Makefile.am
View file

@ -9,7 +9,6 @@ AM_CPPFLAGS = \
-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 \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \ $(DBUS_CFLAGS) \
$(UUID_CFLAGS) $(UUID_CFLAGS)

1
libnm-util/tests/Makefile.am
View file

@ -5,7 +5,6 @@ AM_CPPFLAGS = \
-I$(top_builddir)/shared \ -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 \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \ $(DBUS_CFLAGS) \
-DBUILD_DIR=\"$(abs_builddir)\" \ -DBUILD_DIR=\"$(abs_builddir)\" \

3
libnm/Makefile.am
View file

@ -14,7 +14,6 @@ AM_CPPFLAGS = \
-I$(top_builddir)/libnm \ -I$(top_builddir)/libnm \
-DG_LOG_DOMAIN=\""libnm"\" \ -DG_LOG_DOMAIN=\""libnm"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(GUDEV_CFLAGS) \ $(GUDEV_CFLAGS) \
-DNMRUNDIR=\"$(nmrundir)\" \ -DNMRUNDIR=\"$(nmrundir)\" \
@ -133,7 +132,7 @@ libnm_la_SOURCES = \
GLIB_GENERATED = nm-enum-types.h nm-enum-types.c GLIB_GENERATED = nm-enum-types.h nm-enum-types.c
nm_enum_types_sources = $(libnminclude_HEADERS) nm_enum_types_sources = $(libnminclude_HEADERS)
GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include <nm-core-enum-types.h>\n' GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include <nm-core-enum-types.h>\n'
GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n'
libnm_la_LIBADD = \ libnm_la_LIBADD = \
$(top_builddir)/libnm-core/libnm-core.la \ $(top_builddir)/libnm-core/libnm-core.la \

1
libnm/tests/Makefile.am
View file

@ -8,7 +8,6 @@ AM_CPPFLAGS = \
-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_LIB \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
-DTEST_NM_SERVICE=\"$(abs_top_srcdir)/tools/test-networkmanager-service.py\" \ -DTEST_NM_SERVICE=\"$(abs_top_srcdir)/tools/test-networkmanager-service.py\" \
$(GLIB_CFLAGS) $(GLIB_CFLAGS)

6
shared/nm-default.h
View file

@ -46,6 +46,12 @@
#include <config.h> #include <config.h>
#endif #endif
/* for internal compilation we don't want the deprecation macros
* to be in effect. Define the widest range of versions to effectively
* disable deprecation checks */
#define NM_VERSION_MAX_ALLOWED NM_VERSION_NEXT_STABLE
#define NM_VERSION_MIN_REQUIRED NM_VERSION_0_9_8
#include <stdlib.h> #include <stdlib.h>
#include "nm-glib.h" #include "nm-glib.h"

3
src/Makefile.am
View file

@ -41,8 +41,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/callouts \ -I$(top_srcdir)/callouts \
-DPREFIX=\"$(prefix)\" \ -DPREFIX=\"$(prefix)\" \
-DG_LOG_DOMAIN=\""NetworkManager"\" \ -DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE
# add each subdirectory that contains a libNM source file. $(sort) is being used # add each subdirectory that contains a libNM source file. $(sort) is being used
# primarily for its side effect of removing duplicates. # primarily for its side effect of removing duplicates.

1
src/devices/adsl/Makefile.am
View file

@ -14,7 +14,6 @@ AM_CPPFLAGS = \
-I${top_srcdir}/libnm-core \ -I${top_srcdir}/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager-adsl"\" \ -DG_LOG_DOMAIN=\""NetworkManager-adsl"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GUDEV_CFLAGS) $(GUDEV_CFLAGS)
pkglib_LTLIBRARIES = libnm-device-plugin-adsl.la pkglib_LTLIBRARIES = libnm-device-plugin-adsl.la

1
src/devices/bluetooth/Makefile.am
View file

@ -16,7 +16,6 @@ AM_CPPFLAGS = \
-I${top_srcdir}/libnm-core \ -I${top_srcdir}/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager-bluetooth"\" \ -DG_LOG_DOMAIN=\""NetworkManager-bluetooth"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) $(GLIB_CFLAGS)
GLIB_GENERATED = nm-bt-enum-types.h nm-bt-enum-types.c GLIB_GENERATED = nm-bt-enum-types.h nm-bt-enum-types.c

1
src/devices/team/Makefile.am
View file

@ -14,7 +14,6 @@ AM_CPPFLAGS = \
-I${top_srcdir}/libnm-core \ -I${top_srcdir}/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager-team"\" \ -DG_LOG_DOMAIN=\""NetworkManager-team"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) $(GLIB_CFLAGS)
if WITH_TEAMDCTL if WITH_TEAMDCTL

1
src/devices/tests/Makefile.am
View file

@ -12,7 +12,6 @@ AM_CPPFLAGS = \
-I$(top_builddir)/src \ -I$(top_builddir)/src \
-DG_LOG_DOMAIN=\""NetworkManager"\" \ -DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) $(GLIB_CFLAGS)
AM_CFLAGS = $(CODE_COVERAGE_CFLAGS) AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)

1
src/devices/wifi/Makefile.am
View file

@ -20,7 +20,6 @@ AM_CPPFLAGS = \
-I${top_srcdir}/libnm-core \ -I${top_srcdir}/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager-wifi"\" \ -DG_LOG_DOMAIN=\""NetworkManager-wifi"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) $(GLIB_CFLAGS)
pkglib_LTLIBRARIES = libnm-device-plugin-wifi.la pkglib_LTLIBRARIES = libnm-device-plugin-wifi.la

1
src/devices/wifi/tests/Makefile.am
View file

@ -10,7 +10,6 @@ AM_CPPFLAGS = \
-I$(top_builddir)/src \ -I$(top_builddir)/src \
-DG_LOG_DOMAIN=\""NetworkManager-wifi"\" \ -DG_LOG_DOMAIN=\""NetworkManager-wifi"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) $(GLIB_CFLAGS)
noinst_PROGRAMS = test-wifi-ap-utils noinst_PROGRAMS = test-wifi-ap-utils

1
src/devices/wwan/Makefile.am
View file

@ -15,7 +15,6 @@ AM_CPPFLAGS = \
-I${top_builddir}/libnm-core \ -I${top_builddir}/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager-wwan"\" \ -DG_LOG_DOMAIN=\""NetworkManager-wwan"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(MM_GLIB_CFLAGS) $(MM_GLIB_CFLAGS)

1
src/dhcp-manager/Makefile.am
View file

@ -9,7 +9,6 @@ nm_dhcp_helper_CPPFLAGS = \
-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"\" \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
-DNMRUNDIR=\"$(nmrundir)\" -DNMRUNDIR=\"$(nmrundir)\"
nm_dhcp_helper_LDADD = $(GLIB_LIBS) nm_dhcp_helper_LDADD = $(GLIB_LIBS)

1
src/dhcp-manager/tests/Makefile.am
View file

@ -8,7 +8,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/platform \ -I$(top_srcdir)/src/platform \
-DG_LOG_DOMAIN=\""NetworkManager"\" \ -DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
-DTESTDIR="\"$(abs_srcdir)\"" -DTESTDIR="\"$(abs_srcdir)\""

1
src/dnsmasq-manager/tests/Makefile.am
View file

@ -8,7 +8,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/platform \ -I$(top_srcdir)/src/platform \
-DG_LOG_DOMAIN=\""NetworkManager"\" \ -DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
-DTESTDIR="\"$(abs_srcdir)\"" -DTESTDIR="\"$(abs_srcdir)\""

1
src/platform/tests/Makefile.am
View file

@ -9,7 +9,6 @@ AM_CPPFLAGS = \
-I${srcdir}/.. \ -I${srcdir}/.. \
-DG_LOG_DOMAIN=\""NetworkManager"\" \ -DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(GUDEV_CFLAGS) \ $(GUDEV_CFLAGS) \
$(LIBNL_CFLAGS) $(LIBNL_CFLAGS)

1
src/ppp-manager/Makefile.am
View file

@ -8,7 +8,6 @@ AM_CPPFLAGS = \
-I${top_builddir}/libnm-core \ -I${top_builddir}/libnm-core \
-DG_LOG_DOMAIN=\""nm-pppd-plugin"\" \ -DG_LOG_DOMAIN=\""nm-pppd-plugin"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) $(GLIB_CFLAGS)
pppd_plugindir = $(PPPD_PLUGIN_DIR) pppd_plugindir = $(PPPD_PLUGIN_DIR)

1
src/rdisc/tests/Makefile.am
View file

@ -9,7 +9,6 @@ AM_CPPFLAGS = \
-I${srcdir}/.. \ -I${srcdir}/.. \
-DG_LOG_DOMAIN=\""NetworkManager"\" \ -DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(LIBNDP_CFLAGS) $(LIBNDP_CFLAGS)

1
src/settings/plugins/ibft/Makefile.am
View file

@ -19,7 +19,6 @@ AM_CPPFLAGS = \
-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 \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
-DG_LOG_DOMAIN=\""NetworkManager-ibft"\" \ -DG_LOG_DOMAIN=\""NetworkManager-ibft"\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \

1
src/settings/plugins/ibft/tests/Makefile.am
View file

@ -15,7 +15,6 @@ AM_CPPFLAGS = \
-I$(srcdir)/../ \ -I$(srcdir)/../ \
-DG_LOG_DOMAIN=\""NetworkManager-ibft"\" \ -DG_LOG_DOMAIN=\""NetworkManager-ibft"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
-DTEST_IBFT_DIR=\"$(abs_srcdir)\" \ -DTEST_IBFT_DIR=\"$(abs_srcdir)\" \
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/\" -DTEST_SCRATCH_DIR=\"$(abs_builddir)/\"

1
src/settings/plugins/ifcfg-rh/Makefile.am
View file

@ -48,7 +48,6 @@ AM_CPPFLAGS = \
-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 \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(NSS_CFLAGS) \ $(NSS_CFLAGS) \
-DG_LOG_DOMAIN=\""NetworkManager-ifcfg-rh"\" \ -DG_LOG_DOMAIN=\""NetworkManager-ifcfg-rh"\" \

1
src/settings/plugins/ifcfg-rh/tests/Makefile.am
View file

@ -17,7 +17,6 @@ AM_CPPFLAGS = \
-I$(srcdir)/../ \ -I$(srcdir)/../ \
-DG_LOG_DOMAIN=\""NetworkManager-ifcfg-rh"\" \ -DG_LOG_DOMAIN=\""NetworkManager-ifcfg-rh"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
-DTEST_IFCFG_DIR=\"$(abs_srcdir)\" \ -DTEST_IFCFG_DIR=\"$(abs_srcdir)\" \
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/\" \ -DTEST_SCRATCH_DIR=\"$(abs_builddir)/\" \
-DSYSCONFDIR=\"nonexistent\" \ -DSYSCONFDIR=\"nonexistent\" \

1
src/settings/plugins/ifnet/Makefile.am
View file

@ -12,7 +12,6 @@ AM_CPPFLAGS = \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager-ifnet"\" \ -DG_LOG_DOMAIN=\""NetworkManager-ifnet"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
-DSYSCONFDIR=\"$(sysconfdir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
-DSBINDIR=\"$(sbindir)\" -DSBINDIR=\"$(sbindir)\"

1
src/settings/plugins/ifnet/tests/Makefile.am
View file

@ -13,7 +13,6 @@ AM_CPPFLAGS= \
-I$(top_srcdir)/src/platform \ -I$(top_srcdir)/src/platform \
-DG_LOG_DOMAIN=\""NetworkManager-ifnet"\" \ -DG_LOG_DOMAIN=\""NetworkManager-ifnet"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(CHECK_CFLAGS) \ $(CHECK_CFLAGS) \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(CODE_COVERAGE_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) \

1
src/settings/plugins/ifupdown/Makefile.am
View file

@ -11,7 +11,6 @@ AM_CPPFLAGS = \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager-ifupdown"\" \ -DG_LOG_DOMAIN=\""NetworkManager-ifupdown"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(GUDEV_CFLAGS) \ $(GUDEV_CFLAGS) \
-DSYSCONFDIR=\"$(sysconfdir)\" -DSYSCONFDIR=\"$(sysconfdir)\"

1
src/settings/plugins/ifupdown/tests/Makefile.am
View file

@ -10,7 +10,6 @@ AM_CPPFLAGS = \
-I$(srcdir)/../ \ -I$(srcdir)/../ \
-DG_LOG_DOMAIN=\""NetworkManager-ifupdown"\" \ -DG_LOG_DOMAIN=\""NetworkManager-ifupdown"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
-DTEST_ENI_DIR=\"$(abs_srcdir)\" -DTEST_ENI_DIR=\"$(abs_srcdir)\"

1
src/settings/plugins/keyfile/Makefile.am
View file

@ -11,7 +11,6 @@ AM_CPPFLAGS = \
-I$(top_builddir)/libnm-core \ -I$(top_builddir)/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager-keyfile"\" \ -DG_LOG_DOMAIN=\""NetworkManager-keyfile"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
-DNMCONFDIR=\"$(nmconfdir)\" -DNMCONFDIR=\"$(nmconfdir)\"

1
src/settings/plugins/keyfile/tests/Makefile.am
View file

@ -16,7 +16,6 @@ AM_CPPFLAGS = \
$(CODE_COVERAGE_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) \
-DG_LOG_DOMAIN=\""NetworkManager-keyfile"\" \ -DG_LOG_DOMAIN=\""NetworkManager-keyfile"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
-DTEST_KEYFILES_DIR=\"$(abs_srcdir)/keyfiles\" \ -DTEST_KEYFILES_DIR=\"$(abs_srcdir)/keyfiles\" \
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/keyfiles\" \ -DTEST_SCRATCH_DIR=\"$(abs_builddir)/keyfiles\" \
-DNMCONFDIR=\"nonexistent\" -DNMCONFDIR=\"nonexistent\"

1
src/supplicant-manager/tests/Makefile.am
View file

@ -9,7 +9,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/supplicant-manager \ -I$(top_srcdir)/src/supplicant-manager \
-DG_LOG_DOMAIN=\""NetworkManager"\" \ -DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
-DTEST_CERT_DIR=\"$(srcdir)/certs/\" \ -DTEST_CERT_DIR=\"$(srcdir)/certs/\" \
$(GLIB_CFLAGS) $(GLIB_CFLAGS)

1
src/tests/Makefile.am
View file

@ -12,7 +12,6 @@ AM_CPPFLAGS = \
-I$(top_builddir)/src \ -I$(top_builddir)/src \
-DG_LOG_DOMAIN=\""NetworkManager"\" \ -DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) $(GLIB_CFLAGS)
noinst_PROGRAMS = \ noinst_PROGRAMS = \

1
src/tests/config/Makefile.am
View file

@ -8,7 +8,6 @@ AM_CPPFLAGS = \
-I${top_srcdir}/src/platform \ -I${top_srcdir}/src/platform \
-DG_LOG_DOMAIN=\""NetworkManager"\" \ -DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
-DSRCDIR=\""$(srcdir)"\" \ -DSRCDIR=\""$(srcdir)"\" \
-DBUILDDIR=\""$(builddir)"\" -DBUILDDIR=\""$(builddir)"\"