Bug 551408 - gmodule.def generated to builddir, but required in srcdir

2008-09-08  Tor Lillqvist  <tml@novell.com>

	Bug 551408 - gmodule.def generated to builddir, but required in srcdir

	* Makefile.am: Use gmodule.def from builddir, not srcdir.


svn path=/trunk/; revision=7446
This commit is contained in:
Tor Lillqvist 2008-09-08 20:38:40 +00:00 committed by Tor Lillqvist
parent cc29f229ed
commit a8539d10d4
2 changed files with 9 additions and 3 deletions

View File

@ -1,3 +1,9 @@
2008-09-08 Tor Lillqvist <tml@novell.com>
Bug 551408 - gmodule.def generated to builddir, but required in srcdir
* Makefile.am: Use gmodule.def from builddir, not srcdir.
2008-09-02 Matthias Clasen <mclasen@redhat.com> 2008-09-02 Matthias Clasen <mclasen@redhat.com>
* === Released 2.18.0 === * === Released 2.18.0 ===

View File

@ -63,14 +63,14 @@ no_undefined = -no-undefined
endif endif
if OS_WIN32_AND_DLL_COMPILATION if OS_WIN32_AND_DLL_COMPILATION
export_symbols = -export-symbols $(srcdir)/gmodule.def export_symbols = -export-symbols gmodule.def
gmodule_def = gmodule.def gmodule_def = gmodule.def
gmodule_win32_res = gmodule-win32-res.o gmodule_win32_res = gmodule-win32-res.o
gmodule_win32_res_ldflag = -Wl,$(gmodule_win32_res) gmodule_win32_res_ldflag = -Wl,$(gmodule_win32_res)
install-def-file: install-def-file:
$(INSTALL) $(srcdir)/gmodule.def $(DESTDIR)$(libdir)/gmodule-2.0.def $(INSTALL) gmodule.def $(DESTDIR)$(libdir)/gmodule-2.0.def
uninstall-def-file: uninstall-def-file:
-rm $(DESTDIR)$(libdir)/gmodule-2.0.def -rm $(DESTDIR)$(libdir)/gmodule-2.0.def
@ -94,7 +94,7 @@ gmodule-win32-res.o: gmodule.rc
$(WINDRES) gmodule.rc $@ $(WINDRES) gmodule.rc $@
gmodule-2.0.lib: libgmodule-2.0.la gmodule.def gmodule-2.0.lib: libgmodule-2.0.la gmodule.def
lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgmodule-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(srcdir)/gmodule.def -out:$@ lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgmodule-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:gmodule.def -out:$@
.PHONY: files release .PHONY: files release