From f1ce05caa9d04fe67e0872c7b09e35be25c7fc1b Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 19 Jan 2007 00:06:01 +0000 Subject: [PATCH] gdk-pixbuf/Makefile.am gdk/Makefile.am gdk/win32/Makefile.am Fixes for 2007-01-18 Tor Lillqvist * gdk-pixbuf/Makefile.am * gdk/Makefile.am * gdk/win32/Makefile.am * gtk/Makefile.am: Fixes for building outside srcdir on Win32. (#336819, #340113) 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. svn path=/trunk/; revision=17185 --- ChangeLog | 11 +++++++++++ gdk-pixbuf/Makefile.am | 10 +++++----- gdk/Makefile.am | 8 ++++---- gdk/win32/Makefile.am | 7 +++---- gtk/Makefile.am | 8 ++++---- 5 files changed, 27 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 09783fb84e..74ea563ff4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2007-01-18 Tor Lillqvist + + * gdk-pixbuf/Makefile.am + * gdk/Makefile.am + * gdk/win32/Makefile.am + * gtk/Makefile.am: Fixes for building outside srcdir on + Win32. (#336819, #340113) 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. + 2007-01-18 Michael Natterer * gtk/gtkcheckbutton.c diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index d76e15f962..05796ce936 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -7,18 +7,18 @@ endif if OS_WIN32 gdk_pixbuf_def = gdk_pixbuf.def -gdk_pixbuf_symbols = -export-symbols $(gdk_pixbuf_def) +gdk_pixbuf_symbols = -export-symbols $(srcdir)/gdk_pixbuf.def gdk_pixbuf_win32_res = gdk_pixbuf-win32-res.o -gdk_pixbuf_win32_res_ldflag = -Wl,$(gdk_pixbuf_win32_res) +gdk_pixbuf_win32_res_ldflag = -Wl,gdk_pixbuf-win32-res.o gdk_pixbuf-win32-res.o : gdk_pixbuf.rc $(WINDRES) gdk_pixbuf.rc $@ install-def-file: - $(INSTALL) $(gdk_pixbuf_def) $(DESTDIR)$(libdir)/gdk_pixbuf-2.0.def + $(INSTALL) $(srcdir)/gdk_pixbuf.def $(DESTDIR)$(libdir)/gdk_pixbuf-$(GTK_API_VERSION).def uninstall-def-file: - -rm $(DESTDIR)$(libdir)/gdk_pixbuf-2.0.def + -rm $(DESTDIR)$(libdir)/gdk_pixbuf-$(GTK_API_VERSION).def else install-def-file: uninstall-def-file: @@ -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:gdk_pixbuf.def -out:$@ + lib -name:libgdk_pixbuf-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:$(srcdir)/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 176223e03a..5a69f3d771 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -158,14 +158,14 @@ 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 gdk.def $(LDADD) +libgdk_win32_2_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def $(LDADD) if HAVE_WINTAB -libgdk_win32_2_0_la_LIBADD += -Lwin32 -lwntab32x +libgdk_win32_2_0_la_LDFLAGS += -Wl,win32/libwntab32x.a endif if OS_WIN32 install-def-file: gdk.def - $(INSTALL) gdk.def $(DESTDIR)$(libdir)/gdk-win32-2.0.def + $(INSTALL) $(srcdir)/gdk.def $(DESTDIR)$(libdir)/gdk-win32-2.0.def uninstall-def-file: -rm $(DESTDIR)$(libdir)/gdk-win32-2.0.def else @@ -177,7 +177,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:gdk.def -out:$@ + lib -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:$(srcdir)/gdk.def -out:$@ install-ms-lib: $(INSTALL) gdk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir) diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am index dc49548b36..05c9d2a788 100644 --- a/gdk/win32/Makefile.am +++ b/gdk/win32/Makefile.am @@ -16,9 +16,9 @@ INCLUDES = \ LDADDS = $(GDK_DEP_LIBS) if HAVE_WINTAB -libwntab32x_a = .libs/libwntab32x.a +libwntab32x_a = libwntab32x.a -.libs/libwntab32x.a: $(WINTAB_LIB) +libwntab32x.a: $(WINTAB_LIB) cp $< $@ endif @@ -30,8 +30,7 @@ SUBDIRS=rc EXTRA_DIST = \ bdfcursor.c \ - makefile.msc \ - libwntab32x.la + makefile.msc libgdk_win32_la_SOURCES = \ xcursors.h \ diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 7e5c5c3522..297a49b42a 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -47,16 +47,16 @@ endif if OS_WIN32 gtk_def = gtk.def -gtk_win32_symbols = -export-symbols $(gtk_def) +gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def gtk_win32_res = gtk-win32-res.o -gtk_win32_res_ldflag = -Wl,$(gtk_win32_res) +gtk_win32_res_ldflag = -Wl,gtk-win32-res.o gtk-win32-res.o : gtk-win32.rc $(WINDRES) gtk-win32.rc $@ install-def-file: gtk.def - $(INSTALL) $(gtk_def) $(DESTDIR)$(libdir)/gtk-win32-2.0.def + $(INSTALL) $(srcdir)/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:gtk.def -out:$@ + lib -name:libgtk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:$(srcdir)/gtk.def -out:$@ install-ms-lib: $(INSTALL) gtk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)