diff options
| author | Tor Lillqvist <tml@novell.com> | 2007-03-06 09:52:35 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2007-03-06 09:52:35 +0000 |
| commit | af11ec647fff361cf55f7c8aea9b5eaa72d2fdc8 (patch) | |
| tree | 37c76420830c00c68fff7897d0dd6010d0d53444 /gdk-pixbuf | |
| parent | 3bffda30fd5e5aa4087eab60de7cfdd6c619c8ea (diff) | |
| download | gtk+-af11ec647fff361cf55f7c8aea9b5eaa72d2fdc8.tar.gz | |
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
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 5 | ||||
| -rw-r--r-- | gdk-pixbuf/Makefile.am | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 7072aadeba..b2951caf11 100644 --- 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 05796ce936..d812790619 100644 --- 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) |