[gtk+] build: Set no_undefined in Makefile.decl
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] build: Set no_undefined in Makefile.decl
- Date: Mon, 15 Sep 2014 16:19:04 +0000 (UTC)
commit 45ab4ae09bade6f63bc71d4df0aa250c72afe1b2
Author: Руслан Ижбулатов <lrn1986 gmail com>
Date: Tue Sep 9 14:48:17 2014 +0000
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
Makefile.decl | 4 ++++
gdk/Makefile.am | 4 ----
gtk/Makefile.am | 4 ----
libgail-util/Makefile.am | 3 ---
modules/input/Makefile.am | 4 ----
modules/printbackends/cloudprint/Makefile.am | 4 ----
modules/printbackends/cups/Makefile.am | 4 ----
modules/printbackends/file/Makefile.am | 4 ----
modules/printbackends/lpr/Makefile.am | 4 ----
modules/printbackends/papi/Makefile.am | 4 +---
modules/printbackends/test/Makefile.am | 4 ----
11 files changed, 5 insertions(+), 38 deletions(-)
---
diff --git a/Makefile.decl b/Makefile.decl
index 901b64b..4bc7784 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 e3860a9..5f0c1e5 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 2ec3cd2..17ca614 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 9422f8a..8ac0264 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 44df55f..519be8e 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 6408d4c..d2d434f 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 33520be..09a9f89 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 c0189f1..9b51bf4 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 ff51351..5a75170 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 5388baa..7176eba 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 69b3ff1..bff5e93 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]