diff options
| author | Tor Lillqvist <tml@novell.com> | 2007-01-18 23:07:06 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2007-01-18 23:07:06 +0000 |
| commit | e483a177d3804074d6d29970fd0625f71aed5b20 (patch) | |
| tree | 213e460b530df617767010429d09f04ed14946e8 /gdk-pixbuf | |
| parent | 8b7373c303c1ad94286fa87e442f2e8cf07fafe2 (diff) | |
| download | gdk-pixbuf-e483a177d3804074d6d29970fd0625f71aed5b20.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 wrappers for the wntab32x and ie55uid libraries. It's too
much trouble making them work when building outside srcdir. Just
link to these libraries direcly using -Wl,libfoo.a.
svn path=/branches/gtk-2-10/; revision=17184
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 c8602779c..76cf86754 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) |