diff options
| author | Tor Lillqvist <tml@novell.com> | 2008-05-12 08:51:57 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2008-05-12 08:51:57 +0000 |
| commit | 31bd06846b1fdc242f85c9af5f6c99b9ab7e6630 (patch) | |
| tree | f725678a6536568972479e6e07ee8bc2af00f9bb | |
| parent | 038e15813af9a07996e8df137cffc043d1ab2d43 (diff) | |
| download | gdk-pixbuf-31bd06846b1fdc242f85c9af5f6c99b9ab7e6630.tar.gz | |
Bug 532558 - Cannot build dll when using separate builddir
2008-05-12 Tor Lillqvist <tml@novell.com>
Bug 532558 - Cannot build dll when using separate builddir
* gdk/Makefile.am
* gtk/Makefile.am: .def file belongs in $(srcdir). Patch by Marko
Lindqvist.
svn path=/branches/gtk-2-12/; revision=20099
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | gdk/Makefile.am | 8 | ||||
| -rw-r--r-- | gtk/Makefile.am | 8 |
3 files changed, 18 insertions, 6 deletions
@@ -1,5 +1,13 @@ 2008-05-12 Tor Lillqvist <tml@novell.com> + Bug 532558 - Cannot build dll when using separate builddir + + * gdk/Makefile.am + * gtk/Makefile.am: .def file belongs in $(srcdir). Patch by Marko + Lindqvist. + +2008-05-12 Tor Lillqvist <tml@novell.com> + Bug 532059 - Leak in win32 clipboard manipulation * gdk/win32/gdkselection-win32.c diff --git a/gdk/Makefile.am b/gdk/Makefile.am index e22c31827..c2a121042 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -161,11 +161,11 @@ 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 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 @@ -189,8 +189,10 @@ install-ms-lib: uninstall-ms-lib: endif +# This places the generated .def file in srcdir, since it is expected to be there. +# (The one from a tarball is) gdk.def: gdk.symbols - (echo -e EXPORTS; $(CPP) -P -DALL_FILES -DGDK_WINDOWING_WIN32 -DINCLUDE_VARIABLES - <$(srcdir)/gdk.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > gdk.def + (echo -e EXPORTS; $(CPP) -P -DALL_FILES -DGDK_WINDOWING_WIN32 -DINCLUDE_VARIABLES - <$(srcdir)/gdk.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gdk.def gdkalias.h: gdk.symbols $(PERL) $(srcdir)/makegdkalias.pl < $(srcdir)/gdk.symbols > gdkalias.h diff --git a/gtk/Makefile.am b/gtk/Makefile.am index d5efdb642..0c135a8be 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -51,7 +51,7 @@ endif if OS_WIN32 gtk_def = gtk.def -gtk_win32_symbols = -export-symbols gtk.def +gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def gtk_win32_res = gtk-win32-res.o gtk_win32_res_ldflag = -Wl,gtk-win32-res.o @@ -60,7 +60,7 @@ gtk-win32-res.o : gtk-win32.rc $(WINDRES) gtk-win32.rc $@ install-def-file: gtk.def - $(INSTALL) gtk.def $(DESTDIR)$(libdir)/gtk-win32-2.0.def + $(INSTALL) $(srcdir)/gtk.def $(DESTDIR)$(libdir)/gtk-win32-2.0.def uninstall-def-file: -rm $(DESTDIR)$(libdir)/gtk-win32-2.0.def else @@ -84,8 +84,10 @@ install-ms-lib: uninstall-ms-lib: endif +# This places the generated .def file in srcdir, since it is expected to be there. +# (The one from a tarball is) gtk.def: gtk.symbols - (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gtk.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > gtk.def + (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gtk.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gtk.def gtkalias.h: gtk.symbols $(PERL) $(srcdir)/makegtkalias.pl < $(srcdir)/gtk.symbols > gtkalias.h |