diff options
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 7 | ||||
| -rw-r--r-- | gdk-pixbuf/Makefile.am | 8 |
2 files changed, 12 insertions, 3 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index ddbda97e01..580353ea64 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,10 @@ +2008-05-12 Tor Lillqvist <tml@novell.com> + + Bug 532558 - Cannot build dll when using separate builddir + + * Makefile.am: .def file belongs in $(srcdir). Patch by Marko + Lindqvist. + 2008-05-02 Michael Natterer <mitch@imendio.com> * Makefile.am (stamp-gdk-pixbuf-marshal.h): deprecate the entire diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index 7421617f9c..bead87b88b 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -8,7 +8,7 @@ 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.o @@ -19,7 +19,7 @@ gdk_pixbuf-win32-res.o : gdk_pixbuf.rc $(WINDRES) gdk_pixbuf.rc $@ install-def-file: - $(INSTALL) gdk_pixbuf.def $(DESTDIR)$(libdir)/gdk_pixbuf-$(GTK_API_VERSION).def + $(INSTALL) $(srcdir)/gdk_pixbuf.def $(DESTDIR)$(libdir)/gdk_pixbuf-$(GTK_API_VERSION).def uninstall-def-file: -rm $(DESTDIR)$(libdir)/gdk_pixbuf-$(GTK_API_VERSION).def else @@ -43,8 +43,10 @@ install-ms-lib: uninstall-ms-lib: endif +# This places the generated .def in srcdir, since it is expected to be there. +# (The one from a tarball is) gdk_pixbuf.def: gdk-pixbuf.symbols - (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gdk-pixbuf.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > gdk_pixbuf.def + (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gdk-pixbuf.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gdk_pixbuf.def gdk-pixbuf-alias.h: gdk-pixbuf.symbols $(PERL) $(srcdir)/makegdkpixbufalias.pl < $(srcdir)/gdk-pixbuf.symbols > gdk-pixbuf-alias.h |