diff options
| author | Tor Lillqvist <tml@novell.com> | 2008-05-12 08:49:08 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2008-05-12 08:49:08 +0000 |
| commit | b372221dfd815b10970c417f3f9f4f3a83f497e6 (patch) | |
| tree | 8265ffc4c53b54c23a93395a019ec6e7b7e1643b /gdk/Makefile.am | |
| parent | 48fb2c0ecf5696b7758d6c2a2140e695c7412680 (diff) | |
| download | gtk+-b372221dfd815b10970c417f3f9f4f3a83f497e6.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=/trunk/; revision=20097
Diffstat (limited to 'gdk/Makefile.am')
| -rw-r--r-- | gdk/Makefile.am | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gdk/Makefile.am b/gdk/Makefile.am index af3abae808..3f188ad0cc 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -175,11 +175,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 @@ -203,8 +203,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 |