fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-04 06:00:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: remove G_DISABLE_DEPRECATED

Browse source 
This functionality is (mostly) obsoleted by the newer
GLIB_VERSION_MIN_REQUIRED and GLIB_VERSION_MAX_ALLOWED defines.  With
this, your build doesn't all of a sudden blow up if we deprecate
something in GLib - you have to explicitly opt-in to the newer
version.

G_DISABLE_DEPRECATED does still apply for macros and things that can't
take __attribute__((deprecated)), but it's not really worth the pain
and cargo culting around just for that.
This commit is contained in:
Colin Walters 2012-10-31 19:40:01 +01:00 • committed by Pavel Šimerda
parent 462d04bbbb
commit 59f2cd0f8d
19 changed files with 9 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
callouts/Makefile.am
View file

@ -36,7 +36,6 @@ nm_avahi_autoipd_action_SOURCES = \
nm_avahi_autoipd_action_CPPFLAGS = \
$(DBUS_CFLAGS) \
$(GLIB_CFLAGS) \
-DG_DISABLE_DEPRECATED \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DLIBEXECDIR=\"$(libexecdir)\"
@ -59,7 +58,6 @@ nm_dispatcher_action_CPPFLAGS = \
-I${top_builddir}/libnm-util \
$(DBUS_CFLAGS) \
$(GLIB_CFLAGS) \
-DG_DISABLE_DEPRECATED \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DLIBEXECDIR=\"$(libexecdir)\"

3
cli/src/Makefile.am
View file

@ -28,8 +28,7 @@ nmcli_SOURCES = \
nmcli_CPPFLAGS = \
$(DBUS_CFLAGS) \
$(GLIB_CFLAGS) \
-DNMCLI_LOCALEDIR=\"$(datadir)/locale\" \
-DG_DISABLE_DEPRECATED
-DNMCLI_LOCALEDIR=\"$(datadir)/locale\"
nmcli_LDADD = \
$(DBUS_LIBS) \

8
configure.ac
View file

@ -38,14 +38,6 @@ dnl Initialize libtool
LT_PREREQ([2.2])
LT_INIT([disable-static])
dnl maintainer mode stuff
if test $USE_MAINTAINER_MODE = yes; then
DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED"
else
DISABLE_DEPRECATED=""
fi
AC_SUBST(DISABLE_DEPRECATED)
dnl Version stuff
NM_MAJOR_VERSION=nm_major_version
NM_MINOR_VERSION=nm_minor_version

3
libnm-util/Makefile.am
View file

@ -9,8 +9,7 @@ lib_LTLIBRARIES=libnm-util.la
libnm_util_la_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
$(UUID_CFLAGS) \
-DG_DISABLE_DEPRECATED
$(UUID_CFLAGS)
libnm_util_include_HEADERS = \
nm-connection.h \

2
src/Makefile.am
View file

@ -295,7 +295,6 @@ NetworkManager_CPPFLAGS = \
$(GMODULE_CFLAGS) \
$(POLKIT_CFLAGS) \
$(SYSTEMD_CFLAGS) \
-DG_DISABLE_DEPRECATED \
-DBINDIR=\"$(bindir)\" \
-DSBINDIR=\"$(sbindir)\" \
-DLIBEXECDIR=\"$(libexecdir)\" \
@ -348,7 +347,6 @@ libexec_PROGRAMS = nm-crash-logger
nm_crash_logger_SOURCES = nm-crash-logger.c
nm_crash_logger_CPPFLAGS = \
$(GLIB_CFLAGS) \
-DG_DISABLE_DEPRECATED \
-DBINDIR=\"$(bindir)\" \
-DSBINDIR=\"$(sbindir)\" \
-DDATADIR=\"$(datadir)\" \

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

@ -24,7 +24,6 @@ libbluez_manager_la_CPPFLAGS = \
$(DBUS_CFLAGS) \
$(GLIB_CFLAGS) \
$(BLUEZ_CFLAGS) \
-DG_DISABLE_DEPRECATED \
-DBINDIR=\"$(bindir)\" \
-DDATADIR=\"$(datadir)\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \

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

@ -25,7 +25,6 @@ libdhcp_dhclient_la_SOURCES = \
libdhcp_dhclient_la_CPPFLAGS = \
$(DBUS_CFLAGS) \
$(GLIB_CFLAGS) \
-DG_DISABLE_DEPRECATED \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DLIBEXECDIR=\"$(libexecdir)\" \
-DLOCALSTATEDIR=\"$(localstatedir)\" \
@ -52,7 +51,6 @@ libdhcp_manager_la_SOURCES = \
libdhcp_manager_la_CPPFLAGS = \
$(DBUS_CFLAGS) \
$(GLIB_CFLAGS) \
-DG_DISABLE_DEPRECATED \
-DLIBEXECDIR=\"$(libexecdir)\" \
-DLOCALSTATEDIR=\"$(localstatedir)\" \
-DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \

3
src/ip6-manager/Makefile.am
View file

@ -18,8 +18,7 @@ libip6_manager_la_SOURCES = \
libip6_manager_la_CPPFLAGS = \
$(LIBNL_CFLAGS) \
$(DBUS_CFLAGS) \
$(GLIB_CFLAGS) \
-DG_DISABLE_DEPRECATED
$(GLIB_CFLAGS)
libip6_manager_la_LIBADD = \
$(top_builddir)/src/generated/libnm-generated.la \

3
src/logging/Makefile.am
View file

@ -6,8 +6,7 @@ libnm_logging_la_SOURCES = \
libnm_logging_la_CPPFLAGS = \
$(GLIB_CFLAGS) \
-DLIBEXECDIR=\"$(libexecdir)\" \
-DG_DISABLE_DEPRECATED
-DLIBEXECDIR=\"$(libexecdir)\"
libnm_logging_la_LIBADD = \
-ldl \

3
src/posix-signals/Makefile.am
View file

@ -6,8 +6,7 @@ libnm_posix_signals_la_SOURCES = \
libnm_posix_signals_la_CPPFLAGS = \
$(GLIB_CFLAGS) \
-DLIBEXECDIR=\"$(libexecdir)\" \
-DG_DISABLE_DEPRECATED
-DLIBEXECDIR=\"$(libexecdir)\"
libnm_posix_signals_la_LIBADD = \
-ldl \

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

@ -26,7 +26,6 @@ $(libppp_manager_la_OBJECTS): $(built_sources)
libppp_manager_la_CPPFLAGS = \
$(DBUS_CFLAGS) \
-DG_DISABLE_DEPRECATED \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DLIBDIR=\"$(libdir)\" \
-DPLUGINDIR=\"$(PPPD_PLUGIN_DIR)\"

1
src/settings/Makefile.am
View file

@ -55,7 +55,6 @@ libsettings_la_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(GMODULE_CFLAGS) \
$(POLKIT_CFLAGS) \
-DG_DISABLE_DEPRECATED \
-DBINDIR=\"$(bindir)\" \
-DSBINDIR=\"$(sbindir)\" \
-DLIBEXECDIR=\"$(libexecdir)\" \

3
src/settings/plugins/example/Makefile.am
View file

@ -27,8 +27,7 @@ libnm_settings_plugin_example_la_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(GMODULE_CFLAGS) \
$(DBUS_CFLAGS) \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DG_DISABLE_DEPRECATED
-DSYSCONFDIR=\"$(sysconfdir)\"
libnm_settings_plugin_example_la_LIBADD = \
$(top_builddir)/libnm-util/libnm-util.la \

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

@ -36,7 +36,6 @@ libifcfg_rh_io_la_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
$(NSS_CFLAGS) \
-DG_DISABLE_DEPRECATED \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DSBINDIR=\"$(sbindir)\"
@ -57,7 +56,6 @@ libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(GMODULE_CFLAGS) \
$(DBUS_CFLAGS) \
-DG_DISABLE_DEPRECATED \
-DSYSCONFDIR=\"$(sysconfdir)\"
libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = -module -avoid-version

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

@ -9,7 +9,6 @@ libnm_settings_plugin_ifcfg_suse_la_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(GMODULE_CFLAGS) \
$(DBUS_CFLAGS) \
-DG_DISABLE_DEPRECATED \
-I${top_srcdir}/src/settings \
-I$(top_srcdir)/include \
-I$(top_srcdir)/libnm-util \

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

@ -21,7 +21,6 @@ libnm_settings_plugin_ifnet_la_CPPFLAGS = \
$(GMODULE_CFLAGS) \
$(DBUS_CFLAGS) \
$(GUDEV_CFLAGS) \
-DG_DISABLE_DEPRECATED \
-DSYSCONFDIR=\"$(sysconfdir)\"
libnm_settings_plugin_ifnet_la_LDFLAGS = -module -avoid-version
@ -48,7 +47,6 @@ lib_ifnet_io_la_SOURCES = \
lib_ifnet_io_la_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
-DG_DISABLE_DEPRECATED \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DSBINDIR=\"$(sbindir)\"

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

@ -18,7 +18,6 @@ libifupdown_io_la_SOURCES = \
libifupdown_io_la_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
-DG_DISABLE_DEPRECATED \
-DSYSCONFDIR=\"$(sysconfdir)\"
libifupdown_io_la_LIBADD = \
@ -39,7 +38,6 @@ libnm_settings_plugin_ifupdown_la_CPPFLAGS = \
$(GMODULE_CFLAGS) \
$(DBUS_CFLAGS) \
$(GUDEV_CFLAGS) \
-DG_DISABLE_DEPRECATED \
-DSYSCONFDIR=\"$(sysconfdir)\"
libnm_settings_plugin_ifupdown_la_LDFLAGS = -module -avoid-version

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

@ -26,8 +26,7 @@ libkeyfile_io_la_SOURCES = \
libkeyfile_io_la_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DG_DISABLE_DEPRECATED
-DSYSCONFDIR=\"$(sysconfdir)\"
libkeyfile_io_la_LIBADD = $(GLIB_LIBS)
@ -43,8 +42,7 @@ libnm_settings_plugin_keyfile_la_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(GMODULE_CFLAGS) \
$(DBUS_CFLAGS) \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DG_DISABLE_DEPRECATED
-DSYSCONFDIR=\"$(sysconfdir)\"
libnm_settings_plugin_keyfile_la_LIBADD = \
$(top_builddir)/libnm-util/libnm-util.la \

3
src/vpn-manager/Makefile.am
View file

@ -26,8 +26,7 @@ libvpn_manager_la_SOURCES = \
libvpn_manager_la_CPPFLAGS = \
$(LIBNL_CFLAGS) \
$(DBUS_CFLAGS) \
$(GLIB_CFLAGS) \
-DG_DISABLE_DEPRECATED
$(GLIB_CFLAGS)
libvpn_manager_la_LIBADD = \
$(top_builddir)/src/generated/libnm-generated.la \