From 8d99f79ce4c202249562cc81afbac4c612ec33ff Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 19 Jan 2007 12:13:09 +0000 Subject: [PATCH] gmodule/Makefile.am (gmodule-2.0.lib) Use $(srcdir) for builds outside 2007-01-19 Tor Lillqvist * gmodule/Makefile.am (gmodule-2.0.lib) * gthread/Makefile.am (gthread-2.0.lib): Use $(srcdir) for builds outside srcdir. svn path=/branches/glib-2-12/; revision=5299 --- gmodule/ChangeLog | 5 +++++ gmodule/Makefile.am | 2 +- gthread/ChangeLog | 5 +++++ gthread/Makefile.am | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog index 85097f5c5..4c1454998 100644 --- a/gmodule/ChangeLog +++ b/gmodule/ChangeLog @@ -1,3 +1,8 @@ +2007-01-19 Tor Lillqvist + + * Makefile.am (gmodule-2.0.lib): Use $(srcdir) for builds outside + srcdir. + 2007-01-16 Matthias Clasen * === Released 2.12.9 === diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am index d07325a37..84118bd9e 100644 --- a/gmodule/Makefile.am +++ b/gmodule/Makefile.am @@ -86,7 +86,7 @@ gmodule-win32-res.o: gmodule.rc endif gmodule-2.0.lib: libgmodule-2.0.la gmodule.def - lib -name:libgmodule-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:gmodule.def -out:$@ + lib -name:libgmodule-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(srcdir)/gmodule.def -out:$@ .PHONY: files release diff --git a/gthread/ChangeLog b/gthread/ChangeLog index a8251fba4..60b750b44 100644 --- a/gthread/ChangeLog +++ b/gthread/ChangeLog @@ -1,3 +1,8 @@ +2007-01-19 Tor Lillqvist + + * Makefile.am (gthread-2.0.lib): Use $(srcdir) for builds outside + srcdir. + 2007-01-16 Matthias Clasen * === Released 2.12.9 === diff --git a/gthread/Makefile.am b/gthread/Makefile.am index 064305216..af8ea64b8 100644 --- a/gthread/Makefile.am +++ b/gthread/Makefile.am @@ -73,7 +73,7 @@ gthread-win32-res.o: gthread.rc endif gthread-2.0.lib: libgthread-2.0.la gthread.def - lib -name:libgthread-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:gthread.def -out:$@ + lib -name:libgthread-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(srcdir)/gthread.def -out:$@ dist-hook: $(BUILT_EXTRA_DIST) files='$(BUILT_EXTRA_DIST)'; \