From eb675a98a0e886e91253a6fa98f9043c389e4924 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 12 Apr 2006 19:46:26 +0000 Subject: [PATCH] modules/engines/pixbuf/Makefile.am Build fixes for Cygwin. (#338262) 2006-04-12 Matthias Clasen * contrib/gdk-pixbuf-xlib/Makefile.am: * modules/engines/pixbuf/Makefile.am * gdk-pixbuf/Makefile.am: Build fixes for Cygwin. (#338262) --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ contrib/gdk-pixbuf-xlib/Makefile.am | 5 +++++ gdk-pixbuf/Makefile.am | 2 +- modules/engines/pixbuf/Makefile.am | 2 +- 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9235e5a2a5..d83d61e09c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2006-04-12 Matthias Clasen + * contrib/gdk-pixbuf-xlib/Makefile.am: + * modules/engines/pixbuf/Makefile.am + * gdk-pixbuf/Makefile.am: Build fixes for Cygwin. (#338262) + * gdk/x11/gdkselection-x11.c (make_list): Make this work for list == NULL. (Coverity) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9235e5a2a5..d83d61e09c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2006-04-12 Matthias Clasen + * contrib/gdk-pixbuf-xlib/Makefile.am: + * modules/engines/pixbuf/Makefile.am + * gdk-pixbuf/Makefile.am: Build fixes for Cygwin. (#338262) + * gdk/x11/gdkselection-x11.c (make_list): Make this work for list == NULL. (Coverity) diff --git a/contrib/gdk-pixbuf-xlib/Makefile.am b/contrib/gdk-pixbuf-xlib/Makefile.am index a9c40c886f..19bebcf2f4 100644 --- a/contrib/gdk-pixbuf-xlib/Makefile.am +++ b/contrib/gdk-pixbuf-xlib/Makefile.am @@ -1,3 +1,7 @@ +if PLATFORM_WIN32 +no_undefined = -no-undefined +endif + lib_LTLIBRARIES=libgdk_pixbuf_xlib-2.0.la INCLUDES = \ @@ -10,6 +14,7 @@ INCLUDES = \ libgdk_pixbuf_xlib_2_0_la_LDFLAGS = \ -export-dynamic \ + $(no_undefined) \ -version-info $(LT_VERSION_INFO) libgdk_pixbuf_xlib_2_0_la_LIBADD = \ diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index b18dcb374b..1eb2dd1b6f 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -487,7 +487,7 @@ all-local: gdk-pixbuf.loaders endif if BUILD_DYNAMIC_MODULES -gdk-pixbuf.loaders: $(loader_LTLIBRARIES) gdk-pixbuf-query-loaders +gdk-pixbuf.loaders: $(loader_LTLIBRARIES) gdk-pixbuf-query-loaders$(EXEEXT) LOADERS=`echo libpixbufloader-*.la` ; \ if test "x$$LOADERS" != 'xlibpixbufloader-*.la' ; then \ echo "Writing a gdk-pixbuf.loader file to use when running examples before installing gdk-pixbuf."; \ diff --git a/modules/engines/pixbuf/Makefile.am b/modules/engines/pixbuf/Makefile.am index c641f79abc..f588b24d65 100644 --- a/modules/engines/pixbuf/Makefile.am +++ b/modules/engines/pixbuf/Makefile.am @@ -1,4 +1,4 @@ -if OS_WIN32 +if PLATFORM_WIN32 no_undefined = -no-undefined endif