From 59f2cd0f8d9a934b47822dcf31015d2aedeaea35 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 31 Oct 2012 19:40:01 +0100 Subject: [PATCH] build: remove G_DISABLE_DEPRECATED 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. --- callouts/Makefile.am | 2 -- cli/src/Makefile.am | 3 +-- configure.ac | 8 -------- libnm-util/Makefile.am | 3 +-- src/Makefile.am | 2 -- src/bluez-manager/Makefile.am | 1 - src/dhcp-manager/Makefile.am | 2 -- src/ip6-manager/Makefile.am | 3 +-- src/logging/Makefile.am | 3 +-- src/posix-signals/Makefile.am | 3 +-- src/ppp-manager/Makefile.am | 1 - src/settings/Makefile.am | 1 - src/settings/plugins/example/Makefile.am | 3 +-- src/settings/plugins/ifcfg-rh/Makefile.am | 2 -- src/settings/plugins/ifcfg-suse/Makefile.am | 1 - src/settings/plugins/ifnet/Makefile.am | 2 -- src/settings/plugins/ifupdown/Makefile.am | 2 -- src/settings/plugins/keyfile/Makefile.am | 6 ++---- src/vpn-manager/Makefile.am | 3 +-- 19 files changed, 9 insertions(+), 42 deletions(-) diff --git a/callouts/Makefile.am b/callouts/Makefile.am index 45d38b61ce..5cc804a0db 100644 --- a/callouts/Makefile.am +++ b/callouts/Makefile.am @@ -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)\" diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am index ec62bfeaec..0f379c10d9 100644 --- a/cli/src/Makefile.am +++ b/cli/src/Makefile.am @@ -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) \ diff --git a/configure.ac b/configure.ac index fba4d5bf01..367ef9b157 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am index 76acd99fcf..37d1f1274b 100644 --- a/libnm-util/Makefile.am +++ b/libnm-util/Makefile.am @@ -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 \ diff --git a/src/Makefile.am b/src/Makefile.am index ba7d2d65fe..17f79dfa68 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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)\" \ diff --git a/src/bluez-manager/Makefile.am b/src/bluez-manager/Makefile.am index 63c6d3def2..7e7ed9a023 100644 --- a/src/bluez-manager/Makefile.am +++ b/src/bluez-manager/Makefile.am @@ -24,7 +24,6 @@ libbluez_manager_la_CPPFLAGS = \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) \ $(BLUEZ_CFLAGS) \ - -DG_DISABLE_DEPRECATED \ -DBINDIR=\"$(bindir)\" \ -DDATADIR=\"$(datadir)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ diff --git a/src/dhcp-manager/Makefile.am b/src/dhcp-manager/Makefile.am index 6028670390..7457219ebb 100644 --- a/src/dhcp-manager/Makefile.am +++ b/src/dhcp-manager/Makefile.am @@ -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)\" \ diff --git a/src/ip6-manager/Makefile.am b/src/ip6-manager/Makefile.am index be4b971342..eb730394e5 100644 --- a/src/ip6-manager/Makefile.am +++ b/src/ip6-manager/Makefile.am @@ -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 \ diff --git a/src/logging/Makefile.am b/src/logging/Makefile.am index 51a6b25dc0..e8fe60ee75 100644 --- a/src/logging/Makefile.am +++ b/src/logging/Makefile.am @@ -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 \ diff --git a/src/posix-signals/Makefile.am b/src/posix-signals/Makefile.am index 88c3d8d427..183214bd75 100644 --- a/src/posix-signals/Makefile.am +++ b/src/posix-signals/Makefile.am @@ -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 \ diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am index 9de581692b..7e8102a518 100644 --- a/src/ppp-manager/Makefile.am +++ b/src/ppp-manager/Makefile.am @@ -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)\" diff --git a/src/settings/Makefile.am b/src/settings/Makefile.am index eb6190bbcf..388ce5701e 100644 --- a/src/settings/Makefile.am +++ b/src/settings/Makefile.am @@ -55,7 +55,6 @@ libsettings_la_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(GMODULE_CFLAGS) \ $(POLKIT_CFLAGS) \ - -DG_DISABLE_DEPRECATED \ -DBINDIR=\"$(bindir)\" \ -DSBINDIR=\"$(sbindir)\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ diff --git a/src/settings/plugins/example/Makefile.am b/src/settings/plugins/example/Makefile.am index 027f6f895e..924de956a1 100644 --- a/src/settings/plugins/example/Makefile.am +++ b/src/settings/plugins/example/Makefile.am @@ -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 \ diff --git a/src/settings/plugins/ifcfg-rh/Makefile.am b/src/settings/plugins/ifcfg-rh/Makefile.am index afad94c832..23c2a283e2 100644 --- a/src/settings/plugins/ifcfg-rh/Makefile.am +++ b/src/settings/plugins/ifcfg-rh/Makefile.am @@ -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 diff --git a/src/settings/plugins/ifcfg-suse/Makefile.am b/src/settings/plugins/ifcfg-suse/Makefile.am index 3db8ed31d4..62350be18e 100644 --- a/src/settings/plugins/ifcfg-suse/Makefile.am +++ b/src/settings/plugins/ifcfg-suse/Makefile.am @@ -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 \ diff --git a/src/settings/plugins/ifnet/Makefile.am b/src/settings/plugins/ifnet/Makefile.am index 07a2fc8852..98f0e84f63 100644 --- a/src/settings/plugins/ifnet/Makefile.am +++ b/src/settings/plugins/ifnet/Makefile.am @@ -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)\" diff --git a/src/settings/plugins/ifupdown/Makefile.am b/src/settings/plugins/ifupdown/Makefile.am index 9f9d021821..20b1c1e3e0 100644 --- a/src/settings/plugins/ifupdown/Makefile.am +++ b/src/settings/plugins/ifupdown/Makefile.am @@ -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 diff --git a/src/settings/plugins/keyfile/Makefile.am b/src/settings/plugins/keyfile/Makefile.am index 83031c2418..c96294f95d 100644 --- a/src/settings/plugins/keyfile/Makefile.am +++ b/src/settings/plugins/keyfile/Makefile.am @@ -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 \ diff --git a/src/vpn-manager/Makefile.am b/src/vpn-manager/Makefile.am index 06e04734ca..a525ce205c 100644 --- a/src/vpn-manager/Makefile.am +++ b/src/vpn-manager/Makefile.am @@ -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 \