build: Set no_undefined in Makefile.decl

This simplifies the code and - more importantly - fixes the cases like
in testsuite/reftests where the no_undefined definition was missing.

https://bugzilla.gnome.org/show_bug.cgi?id=736382

11 files changed, 5 insertions, 38 deletions

diff --git a/Makefile.decl b/Makefile.decl
index 901b64b172..4bc7784b60 100644
--- a/Makefile.decl
+++ b/Makefile.decl
@@ -26,6 +26,10 @@ SKIP_GDKTARGET = \
 	echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target."
 endif
 
+if PLATFORM_WIN32
+no_undefined = -no-undefined
+endif
+
 XVFB_START = \
 	${XVFB} -help 2>/dev/null 1>&2 \
 	&& XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index e3860a972d..5f0c1e5d0a 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -42,10 +42,6 @@ AM_CPPFLAGS = 				\
 	$(GTK_DEBUG_FLAGS)		\
 	$(GDK_DEP_CFLAGS)
 
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
 # libtool stuff: set version and export symbols for resolving
 # since automake doesn't support conditionalized libsomething_la_LDFLAGS
 # we use the general approach here
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 2ec3cd2957..17ca614292 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -79,10 +79,6 @@ AM_CPPFLAGS =						\
 	$(GTK_DEP_CFLAGS)				\
 	$(INCLUDED_IMMODULE_DEFINE)
 
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
 if OS_WIN32
 gtk_def = gtk.def
 gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def
diff --git a/libgail-util/Makefile.am b/libgail-util/Makefile.am
index 9422f8a27e..8ac0264a9d 100644
--- a/libgail-util/Makefile.am
+++ b/libgail-util/Makefile.am
@@ -1,9 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
 EXTRA_DIST += gailutil.def
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
 if OS_WIN32
 export_symbols = -export-symbols $(srcdir)/gailutil.def
 gailutil.def: libgailutil-3.la
diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index 44df55f509..519be8e84a 100644
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -1,10 +1,6 @@
 ## Makefile.am for gtk+/modules/input
 include $(top_srcdir)/Makefile.decl
 
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
 AM_CPPFLAGS = \
 	-I$(top_srcdir) 		\
 	-I$(top_srcdir)/gdk		\
diff --git a/modules/printbackends/cloudprint/Makefile.am b/modules/printbackends/cloudprint/Makefile.am
index 6408d4cbbf..d2d434fec3 100644
--- a/modules/printbackends/cloudprint/Makefile.am
+++ b/modules/printbackends/cloudprint/Makefile.am
@@ -1,9 +1,5 @@
 include $(top_srcdir)/Makefile.decl
 
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
 backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
 
 backend_LTLIBRARIES = libprintbackend-cloudprint.la
diff --git a/modules/printbackends/cups/Makefile.am b/modules/printbackends/cups/Makefile.am
index 33520bea48..09a9f893cf 100644
--- a/modules/printbackends/cups/Makefile.am
+++ b/modules/printbackends/cups/Makefile.am
@@ -1,9 +1,5 @@
 include $(top_srcdir)/Makefile.decl
 
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
 AM_CPPFLAGS = \
 	-I$(top_srcdir) 				\
 	-I$(top_srcdir)/gtk				\
diff --git a/modules/printbackends/file/Makefile.am b/modules/printbackends/file/Makefile.am
index c0189f10a7..9b51bf4e12 100644
--- a/modules/printbackends/file/Makefile.am
+++ b/modules/printbackends/file/Makefile.am
@@ -1,9 +1,5 @@
 include $(top_srcdir)/Makefile.decl
 
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
 backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
 
 backend_LTLIBRARIES = libprintbackend-file.la
diff --git a/modules/printbackends/lpr/Makefile.am b/modules/printbackends/lpr/Makefile.am
index ff51351d3d..5a7517009e 100644
--- a/modules/printbackends/lpr/Makefile.am
+++ b/modules/printbackends/lpr/Makefile.am
@@ -1,9 +1,5 @@
 include $(top_srcdir)/Makefile.decl
 
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
 AM_CPPFLAGS = \
 	-I$(top_srcdir) 				\
 	-I$(top_srcdir)/gtk				\
diff --git a/modules/printbackends/papi/Makefile.am b/modules/printbackends/papi/Makefile.am
index 5388baa3a3..7176eba2dd 100644
--- a/modules/printbackends/papi/Makefile.am
+++ b/modules/printbackends/papi/Makefile.am
@@ -1,6 +1,4 @@
-if OS_WIN32
-no_undefined = -no-undefined
-endif
+include $(top_srcdir)/Makefile.decl
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir) 				\
diff --git a/modules/printbackends/test/Makefile.am b/modules/printbackends/test/Makefile.am
index 69b3ff1ba6..bff5e93c7a 100644
--- a/modules/printbackends/test/Makefile.am
+++ b/modules/printbackends/test/Makefile.am
@@ -1,9 +1,5 @@
 include $(top_srcdir)/Makefile.decl
 
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
 backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
 
 backend_LTLIBRARIES = libprintbackend-test.la