gdk/Makefile.am Current GNU tools do understand the PRIVATE keyword, so no

2005-06-26  Tor Lillqvist  <tml@novell.com>

	* gdk/Makefile.am
	* gtk/Makefile.am: Current GNU tools do understand the PRIVATE
	keyword, so no need to remove those entries from the import
	library. libtool installs the .dll.a import library itself, so no
	need to do it here. Install the .def file.

5 files changed, 40 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index 35258cefa..032b6a6df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-06-26  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/Makefile.am
+	* gtk/Makefile.am: Current GNU tools do understand the PRIVATE
+	keyword, so no need to remove those entries from the import
+	library. libtool installs the .dll.a import library itself, so no
+	need to do it here. Install the .def file.
+
 Sun Jun 26 00:04:36 2005  Manish Singh  <yosh@gimp.org>
 
 	* gdk/gdkevents.c (gdk_event_get_time, gdk_event_get_state): add
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 35258cefa..032b6a6df 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2005-06-26  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/Makefile.am
+	* gtk/Makefile.am: Current GNU tools do understand the PRIVATE
+	keyword, so no need to remove those entries from the import
+	library. libtool installs the .dll.a import library itself, so no
+	need to do it here. Install the .def file.
+
 Sun Jun 26 00:04:36 2005  Manish Singh  <yosh@gimp.org>
 
 	* gdk/gdkevents.c (gdk_event_get_time, gdk_event_get_state): add
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 35258cefa..032b6a6df 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2005-06-26  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/Makefile.am
+	* gtk/Makefile.am: Current GNU tools do understand the PRIVATE
+	keyword, so no need to remove those entries from the import
+	library. libtool installs the .dll.a import library itself, so no
+	need to do it here. Install the .def file.
+
 Sun Jun 26 00:04:36 2005  Manish Singh  <yosh@gimp.org>
 
 	* gdk/gdkevents.c (gdk_event_get_time, gdk_event_get_state): add
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 4384dad5f..e977fd4fd 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -154,13 +154,13 @@ libgdk_win32_2_0_la_LIBADD += -Lwin32 -lie55uuid
 endif
 
 if OS_WIN32
-install-libtool-import-lib:
-	$(INSTALL) .libs/libgdk-win32-$(GTK_API_VERSION).dll.a $(DESTDIR)$(libdir)
-uninstall-libtool-import-lib:
-	-rm $(DESTDIR)$(libdir)/libgdk-win32-$(GTK_API_VERSION).dll.a
+install-def-file: gdk.def
+	$(INSTALL) gdk.def $(DESTDIR)$(libdir)/gdk-win32-2.0.def
+uninstall-def-file:
+	-rm $(DESTDIR)$(libdir)/gdk-win32-2.0.def
 else
-install-libtool-import-lib:
-uninstall-libtool-import-lib:
+install-def-file:
+uninstall-def-file:
 endif
 
 if MS_LIB_AVAILABLE
@@ -273,9 +273,9 @@ stamp-gc-h: $(top_builddir)/config.status
 
 DISTCLEANFILES = gdkconfig.h stamp-gc-h
 
-install-data-local: install-ms-lib install-libtool-import-lib
+install-data-local: install-ms-lib install-def-file
 
-uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
+uninstall-local: uninstall-ms-lib uninstall-def-file
 	rm -f $(DESTDIR)$(configexecincludedir)/gdkconfig.h
 
 # if srcdir!=builddir, clean out maintainer-clean files from builddir
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index c3ab0e6a1..ce3ac5625 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -45,17 +45,13 @@ gtk_win32res_lo = gtk-win32res.lo
 gtk-win32res.lo : gtk-win32.rc
 	$(top_srcdir)/build/win32/lt-compile-resource gtk-win32.rc gtk-win32res.lo
 
-install-libtool-import-lib:
-	for entry in `grep PRIVATE gtk.def | sed -e 's/PRIVATE//'`; do \
-	  file=`$(NM) -A .libs/libgtk-win32-$(GTK_API_VERSION).dll.a | tr -d '\r' | grep -E $$entry'$$' | head -n 1 | cut -d: -f2`; \
-	  $(AR) d .libs/libgtk-win32-$(GTK_API_VERSION).dll.a $$file; \
-	done
-	$(INSTALL) .libs/libgtk-win32-$(GTK_API_VERSION).dll.a $(DESTDIR)$(libdir)
-uninstall-libtool-import-lib:
-	-rm $(DESTDIR)$(libdir)/libtk-win32-$(GTK_API_VERSION).dll.a
+install-def-file: gtk.def
+	$(INSTALL) $(gtk_def) $(DESTDIR)$(libdir)/gtk-win32-2.0.def
+uninstall-def-file:
+	-rm $(DESTDIR)$(libdir)/gtk-win32-2.0.def
 else
-install-libtool-import-lib:
-uninstall-libtool-import-lib:
+install-def-file:
+uninstall-def-file:
 endif
 
 if MS_LIB_AVAILABLE
@@ -680,7 +676,7 @@ if DISABLE_EXPLICIT_DEPS
 endif
 
 # Install a RC file for the default GTK+ theme, and key themes
-install-data-local: install-ms-lib install-libtool-import-lib
+install-data-local: install-ms-lib install-def-file
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0
 	$(INSTALL_DATA) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key
@@ -688,7 +684,7 @@ install-data-local: install-ms-lib install-libtool-import-lib
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key
 	$(INSTALL_DATA) $(srcdir)/gtkrc.key.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc
 
-uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
+uninstall-local: uninstall-ms-lib uninstall-def-file
 	rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
 	rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key/gtkrc
 	rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc