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-pixbuf | |
| parent | 42debff10ddeb2976bbbfa0d688f46766b209bb6 (diff) | |
| download | gdk-pixbuf-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-pixbuf')
| -rw-r--r-- | gdk-pixbuf/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index d76e15f96..05796ce93 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) |