diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rwxr-xr-x | atk-zip.sh.in | 17 | ||||
| -rw-r--r-- | atk/Makefile.am | 21 | ||||
| -rw-r--r-- | configure.in | 1 |
5 files changed, 49 insertions, 4 deletions
@@ -1,3 +1,14 @@ +2001-10-28 Tor Lillqvist <tml@iki.fi> + + * atk-zip.sh.in: New file, used to build developer package for + Win32. + + * Makefile.am + * configure.in: Add it. + + * atk/Makefile.am: Add rules to install and uninstall mingw import + library. + 2001-10-26 Padraig O'Briain <padraig.obriain@sun.com> * atk/atkobject.[c|h] diff --git a/Makefile.am b/Makefile.am index 473f31b..e9a2439 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,8 @@ EXTRA_DIST = \ atk-uninstalled.pc.in \ atk.pc.in \ atk.spec.in \ - atk.spec + atk.spec \ + atk-zip.sh pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = atk.pc diff --git a/atk-zip.sh.in b/atk-zip.sh.in new file mode 100755 index 0000000..c6d694d --- /dev/null +++ b/atk-zip.sh.in @@ -0,0 +1,17 @@ +#!/bin/sh + +# Build zipfile for ATK on Win32: both runtime and developer stuff + +# These two directory paths are obviously system-dependent. This is what tml +# happens to use. +ZIP=/g/tmp/atk-@ATK_VERSION@.zip +cd /target + +rm $ZIP +zip -r $ZIP -@ <<EOF +include/atk-1.0 +lib/libatk-@LT_CURRENT_MINUS_AGE@.dll +lib/libatk.dll.a +lib/atk.lib +lib/pkgconfig/atk.pc +EOF diff --git a/atk/Makefile.am b/atk/Makefile.am index 945b013..88ca108 100644 --- a/atk/Makefile.am +++ b/atk/Makefile.am @@ -1,6 +1,14 @@ EXTRA_DIST = atk.def if OS_WIN32 export_symbols = -export-symbols atk.def + +install-libtool-import-lib: + $(INSTALL) .libs/libatk.dll.a $(DESTDIR)$(libdir) +uninstall-libtool-import-lib: + -rm $(DESTDIR)$(libdir)/libatk.dll.a +else +install-libtool-import-lib: +uninstall-libtool-import-lib: endif lib_LTLIBRARIES = libatk.la @@ -8,11 +16,14 @@ lib_LTLIBRARIES = libatk.la if MS_LIB_AVAILABLE noinst_DATA = atk.lib -install-data-local: - cp atk.lib $(DESTDIR)$(libdir) +install-ms-lib: + $(INSTALL) atk.lib $(DESTDIR)$(libdir) -uninstall-local: +uninstall-ms-lib: -rm $(DESTDIR)$(libdir)/atk.lib +else +install-ms-lib: +uninstall-ms-lib: endif libatk_la_SOURCES = \ @@ -111,3 +122,7 @@ stamp-atkmarshal.c: atkmarshal.list atk.lib: libatk.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 + +uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib diff --git a/configure.in b/configure.in index ce67675..5c5b1ea 100644 --- a/configure.in +++ b/configure.in @@ -161,4 +161,5 @@ atk/Makefile tests/Makefile docs/Makefile atk.spec +atk-zip.sh ]) |