glib r7446 - trunk/gmodule

[tml svn gnome org]

Author: tml
Date: Mon Sep  8 20:38:40 2008
New Revision: 7446
URL: http://svn.gnome.org/viewvc/glib?rev=7446&view=rev

Log:
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.



Modified:
   trunk/gmodule/ChangeLog
   trunk/gmodule/Makefile.am

Modified: trunk/gmodule/Makefile.am
==============================================================================
--- trunk/gmodule/Makefile.am	(original)
+++ trunk/gmodule/Makefile.am	Mon Sep  8 20:38:40 2008
@@ -63,14 +63,14 @@
 endif
 
 if OS_WIN32_AND_DLL_COMPILATION
-export_symbols = -export-symbols $(srcdir)/gmodule.def
+export_symbols = -export-symbols gmodule.def
 gmodule_def = gmodule.def
 
 gmodule_win32_res = gmodule-win32-res.o
 gmodule_win32_res_ldflag = -Wl,$(gmodule_win32_res)
 
 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:
 	-rm $(DESTDIR)$(libdir)/gmodule-2.0.def
@@ -94,7 +94,7 @@
 	$(WINDRES) gmodule.rc $@
 
 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