gtk+ r22280 - in trunk/modules/other/gail: . libgail-util

[tml svn gnome org]

Author: tml
Date: Wed Feb  4 08:20:11 2009
New Revision: 22280
URL: http://svn.gnome.org/viewvc/gtk+?rev=22280&view=rev

Log:
2009-02-04  Tor Lillqvist  <tml novell com>

	Bug 570406 - gailutil.def is in srcdir, but used from builddir

	* libgail-util/Makefile.am: Use gailutil.def from srcdir. Drop
	useless rules to install/uninstall import libraries, libtool knows
	to install / uninstall them itself when installing / uninstalling
	a .la file. Add rules to install / uninstall the def file like for
	consistency, like with the other libraries in GTK+.



Modified:
   trunk/modules/other/gail/ChangeLog
   trunk/modules/other/gail/libgail-util/Makefile.am

Modified: trunk/modules/other/gail/libgail-util/Makefile.am
==============================================================================
--- trunk/modules/other/gail/libgail-util/Makefile.am	(original)
+++ trunk/modules/other/gail/libgail-util/Makefile.am	Wed Feb  4 08:20:11 2009
@@ -2,15 +2,15 @@
 
 EXTRA_DIST += gailutil.def
 if OS_WIN32
-export_symbols = -export-symbols gailutil.def
+export_symbols = -export-symbols $(srcdir)/gailutil.def
 no_undefined = -no-undefined
-install-libtool-import-lib:
-	$(INSTALL) .libs/libgailutil.dll.a $(DESTDIR)$(libdir)
-uninstall-libtool-import-lib:
-	-rm $(DESTDIR)$(libdir)/libgailutil.dll.a
+install-def-file: gailutil.def
+	$(INSTALL) $(srcdir)/gailutil.def $(DESTDIR)$(libdir)
+uninstall-def-file:
+	-rm $(DESTDIR)$(libdir)/gailutil.def
 else
-install-libtool-import-lib:
-uninstall-libtool-import-lib:
+install-def-file:
+uninstall-def-file:
 endif
 
 if MS_LIB_AVAILABLE
@@ -75,7 +75,6 @@
 gailutil.lib: libgailutil.la gailutil.def
 	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgailutil-$(GAIL_LT_CURRENT_MINUS_AGE).dll -def:gailutil.def -out:$@
 
-install-data-local: install-ms-lib install-libtool-import-lib
-
-uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
+install-data-local: install-ms-lib install-def-file
 
+uninstall-local: uninstall-ms-lib uninstall-def-file