Commit 45ab4ae0 authored by LRN's avatar LRN Committed by Benjamin Otte

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
parent 1741de47
...@@ -26,6 +26,10 @@ SKIP_GDKTARGET = \ ...@@ -26,6 +26,10 @@ SKIP_GDKTARGET = \
echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target." echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target."
endif endif
if PLATFORM_WIN32
no_undefined = -no-undefined
endif
XVFB_START = \ XVFB_START = \
${XVFB} -help 2>/dev/null 1>&2 \ ${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` \ && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \
......
...@@ -42,10 +42,6 @@ AM_CPPFLAGS = \ ...@@ -42,10 +42,6 @@ AM_CPPFLAGS = \
$(GTK_DEBUG_FLAGS) \ $(GTK_DEBUG_FLAGS) \
$(GDK_DEP_CFLAGS) $(GDK_DEP_CFLAGS)
if PLATFORM_WIN32
no_undefined = -no-undefined
endif
# libtool stuff: set version and export symbols for resolving # libtool stuff: set version and export symbols for resolving
# since automake doesn't support conditionalized libsomething_la_LDFLAGS # since automake doesn't support conditionalized libsomething_la_LDFLAGS
# we use the general approach here # we use the general approach here
......
...@@ -79,10 +79,6 @@ AM_CPPFLAGS = \ ...@@ -79,10 +79,6 @@ AM_CPPFLAGS = \
$(GTK_DEP_CFLAGS) \ $(GTK_DEP_CFLAGS) \
$(INCLUDED_IMMODULE_DEFINE) $(INCLUDED_IMMODULE_DEFINE)
if PLATFORM_WIN32
no_undefined = -no-undefined
endif
if OS_WIN32 if OS_WIN32
gtk_def = gtk.def gtk_def = gtk.def
gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def
......
include $(top_srcdir)/Makefile.decl include $(top_srcdir)/Makefile.decl
EXTRA_DIST += gailutil.def EXTRA_DIST += gailutil.def
if PLATFORM_WIN32
no_undefined = -no-undefined
endif
if OS_WIN32 if OS_WIN32
export_symbols = -export-symbols $(srcdir)/gailutil.def export_symbols = -export-symbols $(srcdir)/gailutil.def
gailutil.def: libgailutil-3.la gailutil.def: libgailutil-3.la
......
## Makefile.am for gtk+/modules/input ## Makefile.am for gtk+/modules/input
include $(top_srcdir)/Makefile.decl include $(top_srcdir)/Makefile.decl
if PLATFORM_WIN32
no_undefined = -no-undefined
endif
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/gdk \ -I$(top_srcdir)/gdk \
......
include $(top_srcdir)/Makefile.decl include $(top_srcdir)/Makefile.decl
if PLATFORM_WIN32
no_undefined = -no-undefined
endif
backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
backend_LTLIBRARIES = libprintbackend-cloudprint.la backend_LTLIBRARIES = libprintbackend-cloudprint.la
......
include $(top_srcdir)/Makefile.decl include $(top_srcdir)/Makefile.decl
if PLATFORM_WIN32
no_undefined = -no-undefined
endif
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/gtk \ -I$(top_srcdir)/gtk \
......
include $(top_srcdir)/Makefile.decl include $(top_srcdir)/Makefile.decl
if PLATFORM_WIN32
no_undefined = -no-undefined
endif
backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
backend_LTLIBRARIES = libprintbackend-file.la backend_LTLIBRARIES = libprintbackend-file.la
......
include $(top_srcdir)/Makefile.decl include $(top_srcdir)/Makefile.decl
if PLATFORM_WIN32
no_undefined = -no-undefined
endif
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/gtk \ -I$(top_srcdir)/gtk \
......
if OS_WIN32 include $(top_srcdir)/Makefile.decl
no_undefined = -no-undefined
endif
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
......
include $(top_srcdir)/Makefile.decl include $(top_srcdir)/Makefile.decl
if PLATFORM_WIN32
no_undefined = -no-undefined
endif
backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
backend_LTLIBRARIES = libprintbackend-test.la backend_LTLIBRARIES = libprintbackend-test.la
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment