[glib-networking] Move redundant Makefile.am bits into Makefile.decl

[Dan Winship <danw src gnome org>]

commit 98d9f3df0debcbb9ae8e2c4a3d177fccbd45927b
Author: Dan Winship <danw gnome org>
Date:   Wed Sep 28 16:21:35 2011 -0400

    Move redundant Makefile.am bits into Makefile.decl

 Makefile.decl              |   17 ++++++++++++++++-
 proxy/gnome/Makefile.am    |   18 ++++--------------
 proxy/libproxy/Makefile.am |   19 +++++--------------
 proxy/tests/Makefile.am    |    5 +----
 tls/gnutls/Makefile.am     |   12 ++----------
 tls/tests/Makefile.am      |    5 +----
 6 files changed, 29 insertions(+), 47 deletions(-)
---
diff --git a/Makefile.decl b/Makefile.decl
index 72d0e15..b999c4a 100644
--- a/Makefile.decl
+++ b/Makefile.decl
@@ -1,4 +1,19 @@
-# GLIB - Library of useful C routines
+### glib-networking declarations
+
+NULL =
+
+module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload|query)'
+
+giomoduledir = $(GIO_MODULE_DIR)
+
+INCLUDES =				\
+	-DG_LOG_DOMAIN=\"GLib-Net\"	\
+	-DG_DISABLE_DEPRECATED		\
+	$(GLIB_CFLAGS)			\
+	$(NULL)
+
+
+### gtester stuff from glib
 
 GTESTER = gtester 			# for non-GLIB packages
 GTESTER_REPORT = gtester-report		# for the GLIB package
diff --git a/proxy/gnome/Makefile.am b/proxy/gnome/Makefile.am
index a59b436..7ec792a 100644
--- a/proxy/gnome/Makefile.am
+++ b/proxy/gnome/Makefile.am
@@ -1,11 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-NULL =
-
-module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload|query)'
-
 giomodule_LTLIBRARIES = libgiognomeproxy.la
-giomoduledir = $(GIO_MODULE_DIR)
 
 libgiognomeproxy_la_SOURCES = 		\
 	gproxyresolvergnome.c		\
@@ -13,14 +8,9 @@ libgiognomeproxy_la_SOURCES = 		\
 	gnome-proxy-module.c		\
 	$(NULL)
 
-libgiognomeproxy_la_CFLAGS =			\
-	-DG_LOG_DOMAIN=\"GLib-Net\"		\
-	$(GLIB_CFLAGS)				\
-	$(GSETTINGS_DESKTOP_SCHEMAS_CFLAGS)	\
-	-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"	\
-	-DG_DISABLE_DEPRECATED
+INCLUDES += $(GSETTINGS_DESKTOP_SCHEMAS_CFLAGS)
 
 libgiognomeproxy_la_LDFLAGS = $(module_flags)
-libgiognomeproxy_la_LIBADD = \
-		$(GLIB_LIBS) \
-		$(NULL)
+libgiognomeproxy_la_LIBADD =		\
+	$(GLIB_LIBS)			\
+	$(NULL)
diff --git a/proxy/libproxy/Makefile.am b/proxy/libproxy/Makefile.am
index 2e763c5..483ad1f 100644
--- a/proxy/libproxy/Makefile.am
+++ b/proxy/libproxy/Makefile.am
@@ -1,17 +1,8 @@
 include $(top_srcdir)/Makefile.decl
 
-NULL =
-
-INCLUDES = \
-	-DG_LOG_DOMAIN=\"GLib-Net\"	\
-	$(GLIB_CFLAGS)			\
-	$(LIBPROXY_CFLAGS)		\
-	-DG_DISABLE_DEPRECATED
-
-module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload|query)'
+INCLUDES += $(LIBPROXY_CFLAGS)
 
 giomodule_LTLIBRARIES = libgiolibproxy.la
-giomoduledir = $(GIO_MODULE_DIR)
 
 libgiolibproxy_la_SOURCES = 		\
 	glibproxyresolver.c		\
@@ -21,10 +12,10 @@ libgiolibproxy_la_SOURCES = 		\
 
 libgiolibproxy_la_CFLAGS = -DGLIBPROXY_MODULE
 libgiolibproxy_la_LDFLAGS = $(module_flags)
-libgiolibproxy_la_LIBADD = \
-		$(GLIB_LIBS) \
-		$(LIBPROXY_LIBS) \
-		$(NULL)
+libgiolibproxy_la_LIBADD =		\
+	$(GLIB_LIBS)			\
+	$(LIBPROXY_LIBS)		\
+	$(NULL)
 
 libexec_PROGRAMS = glib-pacrunner
 
diff --git a/proxy/tests/Makefile.am b/proxy/tests/Makefile.am
index a1e69bd..78c3d17 100644
--- a/proxy/tests/Makefile.am
+++ b/proxy/tests/Makefile.am
@@ -1,9 +1,6 @@
-NULL =
-
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES =					\
-	$(GLIB_CFLAGS)				\
+INCLUDES +=					\
 	$(GSETTINGS_DESKTOP_SCHEMAS_CFLAGS)	\
 	-I$(top_srcdir)/proxy			\
 	-DSRCDIR=\""$(srcdir)"\"		\
diff --git a/tls/gnutls/Makefile.am b/tls/gnutls/Makefile.am
index 745f0ce..7df8756 100644
--- a/tls/gnutls/Makefile.am
+++ b/tls/gnutls/Makefile.am
@@ -1,11 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-NULL =
-
-module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload|query)'
-
 giomodule_LTLIBRARIES = libgiognutls.la
-giomoduledir = $(GIO_MODULE_DIR)
 
 gnutls-marshal.h: gnutls-marshal.list
 	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_gnutls_marshal $(srcdir)/gnutls-marshal.list --header --internal > $  tmp && \
@@ -42,13 +37,10 @@ libgiognutls_la_SOURCES = 		\
 
 $(libgiognutls_la_OBJECTS): gnutls-marshal.h
 
-libgiognutls_la_CFLAGS = \
-	-DG_LOG_DOMAIN=\"GLib-Net\"	\
-	$(GLIB_CFLAGS)			\
+INCLUDES +=				\
 	$(LIBGNUTLS_CFLAGS)		\
 	$(LIBGCRYPT_CFLAGS)		\
-	-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"	\
-	-DG_DISABLE_DEPRECATED
+	$(NULL)
 
 libgiognutls_la_LDFLAGS = $(module_flags)
 libgiognutls_la_LIBADD =		\
diff --git a/tls/tests/Makefile.am b/tls/tests/Makefile.am
index 3fe34ed..3af7439 100644
--- a/tls/tests/Makefile.am
+++ b/tls/tests/Makefile.am
@@ -1,9 +1,6 @@
-NULL =
-
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES =					\
-	$(GLIB_CFLAGS)				\
+INCLUDES +=					\
 	-I$(top_srcdir)/tls			\
 	-DSRCDIR=\""$(srcdir)"\"		\
 	-DGNUTLS_MODULE_DIR=\""$(top_builddir)/tls/gnutls/.libs"\"