gdk/Makefile.am gdk-pixbuf/Makefile.am Further fixes for building on Win32

2007-03-06  Tor Lillqvist  <tml@novell.com>

	* gdk/Makefile.am
	* gdk-pixbuf/Makefile.am
	* gtk/Makefile.am: Further fixes for building on Win32 outside
	srcdir. (#413492, Mathias Hasselmann)

svn path=/trunk/; revision=17395

diff --git a/ChangeLog b/ChangeLog
index 94adaa47fbcf1d638fd0821d35cae96531e6b395..eb01070a039788df61b3ff6dea2f7810c98b04b0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-06  Tor Lillqvist  <tml@novell.com>
+
+       * gdk/Makefile.am
+       * gtk/Makefile.am: Further fixes for building on Win32 outside
+       srcdir. (#413492, Mathias Hasselmann)
+
 2007-03-04  Ihar Hrachyshka <iharh@gnome.org>
 
        * configure.in: Added be@latin to ALL_LINGUAS. Problems seems to be
@@ -676,7 +682,7 @@ Fri Jan 26 13:07:07 2007  Tim Janik  <timj@imendio.com>
        * gdk/Makefile.am
        * gdk/win32/Makefile.am
        * gtk/Makefile.am: Fixes for building outside srcdir on
-       Win32. (#336819, #340113) Drop distributing the handmade .la
+       Win32. (#336819, #340013) Drop distributing the handmade .la
        libtool wrapper for the wntab32x library. It's too much trouble
        making it work when building outside srcdir. Just link to the
        library direcly using -Wl,win32/libwntab32x.a.

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 7072aadeba9e5ac9559912a87e9e9254ce27ae91..b2951caf11f38c80963ddb670607ff4203f1cb41 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-06  Tor Lillqvist  <tml@novell.com>
+
+       * Makefile.am: Further fixes for building on Win32 outside
+       srcdir. (#413492, Mathias Hasselmann)
+
 2007-03-05  Matthias Clasen <mclasen@redhat.com>
 
        * io-tga.c: (gdk_pixbuf__tga_stop_load): Flip rle-encoded

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 05796ce936721057983ca4ebe54d6f43516b4cfe..d812790619b2a5c2747ded18259bd2f75e070a2e 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -7,7 +7,7 @@ endif
 
 if OS_WIN32
 gdk_pixbuf_def = gdk_pixbuf.def
-gdk_pixbuf_symbols = -export-symbols $(srcdir)/gdk_pixbuf.def
+gdk_pixbuf_symbols = -export-symbols gdk_pixbuf.def
 
 gdk_pixbuf_win32_res = gdk_pixbuf-win32-res.o
 gdk_pixbuf_win32_res_ldflag = -Wl,gdk_pixbuf-win32-res.o
@@ -16,7 +16,7 @@ gdk_pixbuf-win32-res.o : gdk_pixbuf.rc
        $(WINDRES) gdk_pixbuf.rc $@
 
 install-def-file:
-       $(INSTALL) $(srcdir)/gdk_pixbuf.def $(DESTDIR)$(libdir)/gdk_pixbuf-$(GTK_API_VERSION).def
+       $(INSTALL) gdk_pixbuf.def $(DESTDIR)$(libdir)/gdk_pixbuf-$(GTK_API_VERSION).def
 uninstall-def-file:
        -rm $(DESTDIR)$(libdir)/gdk_pixbuf-$(GTK_API_VERSION).def
 else
@@ -28,7 +28,7 @@ if MS_LIB_AVAILABLE
 noinst_DATA = gdk_pixbuf-$(GTK_API_VERSION).lib
 
 gdk_pixbuf-$(GTK_API_VERSION).lib: libgdk_pixbuf-$(GTK_API_VERSION).la gdk_pixbuf.def
-       lib -name:libgdk_pixbuf-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:$(srcdir)/gdk_pixbuf.def -out:$@
+       lib -name:libgdk_pixbuf-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk_pixbuf.def -out:$@
 
 install-ms-lib:
        $(INSTALL) gdk_pixbuf-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index d84c9b3d6dc3b1319c9cb08717ab46d66e2f4b2a..1290544f856f4f7b377fa04add46b90626c2ba5d 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -158,11 +158,11 @@ libgdk_win32_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
 libgdk_win32_2_0_la_LIBADD = win32/libgdk-win32.la $(GDK_DEP_LIBS) \
   $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
 libgdk_win32_2_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
-libgdk_win32_2_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def $(LDADD)
+libgdk_win32_2_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols gdk.def $(LDADD)
 
 if OS_WIN32
 install-def-file: gdk.def
-       $(INSTALL) $(srcdir)/gdk.def $(DESTDIR)$(libdir)/gdk-win32-2.0.def
+       $(INSTALL) gdk.def $(DESTDIR)$(libdir)/gdk-win32-2.0.def
 uninstall-def-file:
        -rm $(DESTDIR)$(libdir)/gdk-win32-2.0.def
 else
@@ -174,7 +174,7 @@ if MS_LIB_AVAILABLE
 noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib
 
 gdk-win32-$(GTK_API_VERSION).lib: libgdk-win32-$(GTK_API_VERSION).la gdk.def
-       lib -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:$(srcdir)/gdk.def -out:$@
+       lib -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk.def -out:$@
 
 install-ms-lib:
        $(INSTALL) gdk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index b212d62ed784ba2d585d3de0497c1f5b88369eee..82c4afd712d63b563fbd81bb65d31f5811e55552 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -47,7 +47,7 @@ endif
 
 if OS_WIN32
 gtk_def = gtk.def
-gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def
+gtk_win32_symbols = -export-symbols gtk.def
 
 gtk_win32_res = gtk-win32-res.o
 gtk_win32_res_ldflag = -Wl,gtk-win32-res.o
@@ -56,7 +56,7 @@ gtk-win32-res.o : gtk-win32.rc
        $(WINDRES) gtk-win32.rc $@
 
 install-def-file: gtk.def
-       $(INSTALL) $(srcdir)/gtk.def $(DESTDIR)$(libdir)/gtk-win32-2.0.def
+       $(INSTALL) gtk.def $(DESTDIR)$(libdir)/gtk-win32-2.0.def
 uninstall-def-file:
        -rm $(DESTDIR)$(libdir)/gtk-win32-2.0.def
 else
@@ -68,7 +68,7 @@ if MS_LIB_AVAILABLE
 noinst_DATA = gtk-win32-$(GTK_API_VERSION).lib
 
 gtk-win32-$(GTK_API_VERSION).lib: libgtk-win32-$(GTK_API_VERSION).la gtk.def
-       lib -name:libgtk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:$(srcdir)/gtk.def -out:$@
+       lib -name:libgtk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gtk.def -out:$@
 
 install-ms-lib:
        $(INSTALL) gtk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)