atk-zip.sh.in Use ATK_API_VERSION also in the Win32 import library names.

2002-03-06  Tor Lillqvist  <tml@iki.fi>

	* atk-zip.sh.in
	* atk/Makefile.am: Use ATK_API_VERSION also in the Win32 import
	library names.

diff --git a/ChangeLog b/ChangeLog
index 8b5d083..f979f00 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-06  Tor Lillqvist  <tml@iki.fi>
+
+       * atk-zip.sh.in
+       * atk/Makefile.am: Use ATK_API_VERSION also in the Win32 import
+       library names.
+
 Tue Mar  5 16:54:21 2002  Owen Taylor  <otaylor@redhat.com>
 
         * ATK 1.0.0 rc1

diff --git a/atk-zip.sh.in b/atk-zip.sh.in
index 47959f2..68bf2f1 100755 (executable)
--- a/atk-zip.sh.in
+++ b/atk-zip.sh.in
@@ -8,13 +8,13 @@ cd @prefix@
 
 rm $ZIP
 zip -r $ZIP -@ <<EOF
-lib/libatk-@LT_CURRENT_MINUS_AGE@.dll
+lib/libatk-@ATK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
 EOF
 
 rm $DEVZIP
 zip -r $DEVZIP -@ <<EOF
 include/atk-1.0
-lib/libatk.dll.a
-lib/atk.lib
+lib/libatk-@ATK_API_VERSION@.dll.a
+lib/atk-@ATK_API_VERSION@.lib
 lib/pkgconfig/atk.pc
 EOF

diff --git a/atk/Makefile.am b/atk/Makefile.am
index f46e43d..846bdad 100644 (file)
--- a/atk/Makefile.am
+++ b/atk/Makefile.am
@@ -8,9 +8,9 @@ export_symbols = -export-symbols atk.def
 no_undefined = -no-undefined
 
 install-libtool-import-lib:
-       $(INSTALL) .libs/libatk.dll.a $(DESTDIR)$(libdir)
+       $(INSTALL) .libs/libatk-$(ATK_API_VERSION).dll.a $(DESTDIR)$(libdir)
 uninstall-libtool-import-lib:
-       -rm $(DESTDIR)$(libdir)/libatk.dll.a
+       -rm $(DESTDIR)$(libdir)/libatk-$(ATK_API_VERSION).dll.a
 else
 install-libtool-import-lib:
 uninstall-libtool-import-lib:
@@ -19,13 +19,13 @@ endif
 lib_LTLIBRARIES = libatk-1.0.la
 
 if MS_LIB_AVAILABLE
-noinst_DATA = atk.lib
+noinst_DATA = atk-$(ATK_API_VERSION).lib
 
 install-ms-lib:
-       $(INSTALL) atk.lib $(DESTDIR)$(libdir)
+       $(INSTALL) atk-$(ATK_API_VERSION).lib $(DESTDIR)$(libdir)
 
 uninstall-ms-lib:
-       -rm $(DESTDIR)$(libdir)/atk.lib
+       -rm $(DESTDIR)$(libdir)/atk-$(ATK_API_VERSION).lib
 else
 install-ms-lib:
 uninstall-ms-lib:
@@ -168,7 +168,7 @@ s-enum-types-c: @REBUILD@ $(atk_headers) Makefile
        && echo timestamp > $(@F)
 
 
-atk.lib: libatk-$(ATK_API_VERSION).la atk.def
+atk-$(ATK_API_VERSION).lib: libatk-$(ATK_API_VERSION).la atk.def
        lib -name:libatk-@LT_CURRENT_MINUS_AGE@.dll -def:atk.def -out:$@
 
 install-data-local: install-ms-lib install-libtool-import-lib