[network-manager-applet/danw/cleanup: 5/5] build: misc cruft removal
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet/danw/cleanup: 5/5] build: misc cruft removal
- Date: Tue, 25 Nov 2014 22:08:58 +0000 (UTC)
commit c54a4cba91f715aa5d305af5cb039f4b3a311150
Author: Dan Winship <danw redhat com>
Date: Tue Nov 25 09:10:08 2014 -0500
build: misc cruft removal
Remove "PKG_CHECK_MODULES(GOBJECT, gobject-2.0)", which wasn't being
used, and which was already implied by other checks.
Remove a bunch of unecessary AC_SUBST() calls in configure.ac.
(PKG_CHECK_MODULES automatically substs the variables it sets.)
Remove GNOME_MAINTAINER_MODE_DEFINES, which just sets a bunch of
irrelevant flags like BONOBO_DISABLE_DEPRECATED.
configure.ac | 14 --------------
src/Makefile.am | 1 -
src/connection-editor/Makefile.am | 1 -
src/libnm-gtk/Makefile.am | 1 -
src/utils/Makefile.am | 1 -
src/wireless-security/Makefile.am | 1 -
6 files changed, 0 insertions(+), 19 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 40de497..cf901a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,8 +69,6 @@ else
AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["$prefix"],[ISO codes prefix])
fi
-PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
-
PKG_CHECK_MODULES(NMA,
[dbus-glib-1 >= 0.74
gio-2.0 >= 2.32
@@ -83,8 +81,6 @@ PKG_CHECK_MODULES(NMA,
NMA_CFLAGS="$NMA_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32"
PKG_CHECK_MODULES(LIBSECRET, [libsecret-unstable])
-AC_SUBST(LIBSECRET_CFLAGS)
-AC_SUBST(LIBSECRET_LIBS)
# Check for libnotify >= 0.7
PKG_CHECK_MODULES(LIBNOTIFY_07, [libnotify >= 0.7], [have_libnotify_07=yes],[have_libnotify_07=no])
@@ -92,12 +88,8 @@ if test x"$have_libnotify_07" = "xyes"; then
AC_DEFINE(HAVE_LIBNOTIFY_07, 1, [Define if you have libnotify 0.7 or later])
fi
PKG_CHECK_MODULES(NOTIFY, [libnotify >= 0.4.3])
-AC_SUBST(NOTIFY_CFLAGS)
-AC_SUBST(NOTIFY_LIBS)
PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.4)
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4"
dnl ModemManager1 with libmm-glib
@@ -107,8 +99,6 @@ if (test "${with_modem_manager_1}" != "no"); then
[mm-glib],
[have_libmm_glib=yes],
[have_libmm_glib=no])
- AC_SUBST(MM_GLIB_CFLAGS)
- AC_SUBST(MM_GLIB_LIBS)
if (test "${have_libmm_glib}" = "no"); then
if (test "${with_modem_manager_1}" = "yes"); then
@@ -128,8 +118,6 @@ AM_CONDITIONAL(WITH_MODEM_MANAGER_1, test "${with_modem_manager_1}" = "yes")
dnl Check for gudev
PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= 147)
-AC_SUBST(GUDEV_CFLAGS)
-AC_SUBST(GUDEV_LIBS)
dnl Check for gobject introspection
GOBJECT_INTROSPECTION_CHECK([0.9.6])
@@ -140,8 +128,6 @@ dnl
dnl Compiler flags
dnl
NM_COMPILER_WARNINGS
-# Use --enable-maintainer-mode to disabled deprecated symbols
-GNOME_MAINTAINER_MODE_DEFINES
AC_CONFIG_FILES([
diff --git a/src/Makefile.am b/src/Makefile.am
index 3af0af2..1d38ebf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,7 +18,6 @@ nm_applet_CPPFLAGS = \
-DNMALOCALEDIR=\"$(datadir)/locale\" \
-DG_LOG_DOMAIN=\""nm-applet"\" \
$(DBUS_CFLAGS) \
- $(DISABLE_DEPRECATED) \
-I${top_srcdir}/src/utils \
-I${top_srcdir}/src/wireless-security \
-I${top_srcdir}/src/libnm-gtk
diff --git a/src/connection-editor/Makefile.am b/src/connection-editor/Makefile.am
index c234efd..940db53 100644
--- a/src/connection-editor/Makefile.am
+++ b/src/connection-editor/Makefile.am
@@ -12,7 +12,6 @@ nm_connection_editor_CPPFLAGS = \
-DDATADIR=\""$(datadir)"\" \
-DNMALOCALEDIR=\"$(datadir)/locale\" \
$(DBUS_CFLAGS) \
- $(DISABLE_DEPRECATED) \
-I${top_srcdir}/src/utils \
-I${top_srcdir}/src/wireless-security \
-I${top_srcdir}/src/libnm-gtk
diff --git a/src/libnm-gtk/Makefile.am b/src/libnm-gtk/Makefile.am
index 02e0d50..e5c2bda 100644
--- a/src/libnm-gtk/Makefile.am
+++ b/src/libnm-gtk/Makefile.am
@@ -37,7 +37,6 @@ libnm_gtk_la_CFLAGS = \
-DAUTOSTARTDIR=\""$(sysconfdir)/xdg/autostart"\" \
-DVPN_NAME_FILES_DIR=\""$(sysconfdir)/NetworkManager/VPN"\" \
-DNMALOCALEDIR=\"$(datadir)/locale\" \
- $(DISABLE_DEPRECATED) \
-I${top_srcdir}/src/utils \
-I${top_srcdir}/src/wireless-security
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 8c56353..c2cbe9e 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -10,7 +10,6 @@ libutils_la_SOURCES = \
libutils_la_CPPFLAGS = \
$(GTK_CFLAGS) \
$(NMA_CFLAGS) \
- $(DISABLE_DEPRECATED) \
-I${top_srcdir}/src
libutils_la_LIBADD = $(GTK_LIBS) $(NMA_LIBS)
diff --git a/src/wireless-security/Makefile.am b/src/wireless-security/Makefile.am
index f8098f7..4203050 100644
--- a/src/wireless-security/Makefile.am
+++ b/src/wireless-security/Makefile.am
@@ -34,7 +34,6 @@ libwireless_security_la_CPPFLAGS = \
$(GTK_CFLAGS) \
-DUIDIR=\""$(uidir)"\" \
$(NMA_CFLAGS) \
- $(DISABLE_DEPRECATED) \
-I${top_srcdir}/src/utils
libwireless_security_la_LIBADD = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]