glib/Makefile.am glib.def and gobject.def are generated, not in $(srcdir).

2005-01-06  Tor Lillqvist  <tml@iki.fi>

	* glib/Makefile.am
	* gobject/Makefile.am: glib.def and gobject.def are generated, not
	in $(srcdir). (#163143, J. Ali Harlow)

7 files changed, 34 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 78b60243b..8babc8956 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-06  Tor Lillqvist  <tml@iki.fi>
+
+	* glib/Makefile.am
+	* gobject/Makefile.am: glib.def and gobject.def are generated, not
+	in $(srcdir). (#163143, J. Ali Harlow)
+
 2005-01-05  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/gutils.h: Simplify the inlining magic to make it
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 78b60243b..8babc8956 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-01-06  Tor Lillqvist  <tml@iki.fi>
+
+	* glib/Makefile.am
+	* gobject/Makefile.am: glib.def and gobject.def are generated, not
+	in $(srcdir). (#163143, J. Ali Harlow)
+
 2005-01-05  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/gutils.h: Simplify the inlining magic to make it
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 78b60243b..8babc8956 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2005-01-06  Tor Lillqvist  <tml@iki.fi>
+
+	* glib/Makefile.am
+	* gobject/Makefile.am: glib.def and gobject.def are generated, not
+	in $(srcdir). (#163143, J. Ali Harlow)
+
 2005-01-05  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/gutils.h: Simplify the inlining magic to make it
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 78b60243b..8babc8956 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2005-01-06  Tor Lillqvist  <tml@iki.fi>
+
+	* glib/Makefile.am
+	* gobject/Makefile.am: glib.def and gobject.def are generated, not
+	in $(srcdir). (#163143, J. Ali Harlow)
+
 2005-01-05  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/gutils.h: Simplify the inlining magic to make it
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 78b60243b..8babc8956 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-01-06  Tor Lillqvist  <tml@iki.fi>
+
+	* glib/Makefile.am
+	* gobject/Makefile.am: glib.def and gobject.def are generated, not
+	in $(srcdir). (#163143, J. Ali Harlow)
+
 2005-01-05  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/gutils.h: Simplify the inlining magic to make it
diff --git a/glib/Makefile.am b/glib/Makefile.am
index bae30d3ba..832fbf82b 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -193,7 +193,7 @@ endif
 
 if OS_WIN32
 # This requires a very new libtool
-export_symbols = -export-symbols $(srcdir)/glib.def
+export_symbols = -export-symbols glib.def
 
 install-libtool-import-lib:
 # 	Don't put the binary compatibility entries in the import lib!
@@ -205,7 +205,7 @@ install-libtool-import-lib:
 	  ar d .libs/libglib-2.0.dll.a $$file; \
 	done
 	$(INSTALL) .libs/libglib-2.0.dll.a $(DESTDIR)$(libdir)
-	$(INSTALL) $(srcdir)/glib.def $(DESTDIR)$(libdir)/glib-2.0.def
+	$(INSTALL) glib.def $(DESTDIR)$(libdir)/glib-2.0.def
 
 uninstall-libtool-import-lib:
 	-rm $(DESTDIR)$(libdir)/libglib-2.0.dll.a $(DESTDIR)$(libdir)/glib-2.0.def
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 3c2e1d934..263598a44 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -46,7 +46,7 @@ no_undefined = -no-undefined
 endif
 
 if OS_WIN32
-export_symbols = -export-symbols $(srcdir)/gobject.def
+export_symbols = -export-symbols gobject.def
 
 install-libtool-import-lib:
 # 	Don't put the bug compatibility entries in the import lib!
@@ -58,7 +58,7 @@ install-libtool-import-lib:
 	  ar d .libs/libgobject-2.0.dll.a $$file; \
 	done
 	$(INSTALL) .libs/libgobject-2.0.dll.a $(DESTDIR)$(libdir)
-	$(INSTALL) $(srcdir)/gobject.def $(DESTDIR)$(libdir)/gobject-2.0.def
+	$(INSTALL) gobject.def $(DESTDIR)$(libdir)/gobject-2.0.def
 
 uninstall-libtool-import-lib:
 	-rm $(DESTDIR)$(libdir)/libgobject-2.0.dll.a $(DESTDIR)$(libdir)/gobject-2.0.def