diff options
| author | Tor Lillqvist <tml@novell.com> | 2007-01-19 00:06:01 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2007-01-19 00:06:01 +0000 |
| commit | f1ce05caa9d04fe67e0872c7b09e35be25c7fc1b (patch) | |
| tree | 0dfb399c81302db487ac384ae419b2460f5102e8 /gdk | |
| parent | 42debff10ddeb2976bbbfa0d688f46766b209bb6 (diff) | |
| download | gtk+-f1ce05caa9d04fe67e0872c7b09e35be25c7fc1b.tar.gz | |
gdk-pixbuf/Makefile.am gdk/Makefile.am gdk/win32/Makefile.am Fixes for
2007-01-18 Tor Lillqvist <tml@novell.com>
* 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
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/Makefile.am | 8 | ||||
| -rw-r--r-- | gdk/win32/Makefile.am | 7 |
2 files changed, 7 insertions, 8 deletions
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 \ |