[cairo-commit] cairo ChangeLog, 1.941, 1.942 configure.in, 1.132, 1.133 Makefile.am, 1.21, 1.22

[Tor Lillqvist]

Committed by: tml

Update of /cvs/cairo/cairo
In directory gabe:/tmp/cvs-serv3688

Modified Files:
	ChangeLog configure.in Makefile.am 
Log Message:
2005-08-22  Tor Lillqvist  <tml at novell.com>

	* configure.in: Calculate LT_CURRENT_MINUS_AGE (which forms part
	of the DLL name on Win32), and AC_SUBST it.

	* Makefile.am: Add target "zips" to create zip file based
	distribution for Win32.

	* src/Makefile.am: Produce a cairo.def file for distribution by
	preprocessing the relevant header files and grepping for
	declarations of functions that start with cairo_. Works for now,
	will have to modify later if necessary. Use the .def file when
	linking on Win32.



Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.941
retrieving revision 1.942
diff -u -d -r1.941 -r1.942
--- ChangeLog	22 Aug 2005 22:19:03 -0000	1.941
+++ ChangeLog	22 Aug 2005 22:49:04 -0000	1.942
@@ -1,3 +1,17 @@
+2005-08-22  Tor Lillqvist  <tml at novell.com>
+
+	* configure.in: Calculate LT_CURRENT_MINUS_AGE (which forms part
+	of the DLL name on Win32), and AC_SUBST it.
+
+	* Makefile.am: Add target "zips" to create zip file based
+	distribution for Win32.
+
+	* src/Makefile.am: Produce a cairo.def file for distribution by
+	preprocessing the relevant header files and grepping for
+	declarations of functions that start with cairo_. Works for now,
+	will have to modify later if necessary. Use the .def file when
+	linking on Win32.
+
 2005-08-22  Owen Taylor  <otaylor at redhat.com>
 
 	Support artificial bold fonts with FC_EMBOLDEN; patch

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- configure.in	22 Aug 2005 22:19:03 -0000	1.132
+++ configure.in	22 Aug 2005 22:49:04 -0000	1.133
@@ -34,6 +34,10 @@
 
 VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
 AC_SUBST(VERSION_INFO)
+
+LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
+AC_SUBST(LT_CURRENT_MINUS_AGE)
+
 CAIRO_VERSION_MAJOR=cairo_version_major()
 CAIRO_VERSION_MINOR=cairo_version_minor()
 CAIRO_VERSION_MICRO=cairo_version_micro()

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Makefile.am	18 Aug 2005 15:22:29 -0000	1.21
+++ Makefile.am	22 Aug 2005 22:49:04 -0000	1.22
@@ -43,6 +43,22 @@
 	@echo "Please enter your GPG password to sign the checksum."
 	gpg --armor --sign $^ 
 
+# Win32 package zipfiles
+runtime_zip_file = /tmp/$(PACKAGE)-$(VERSION).zip
+developer_zip_file = /tmp/$(PACKAGE)-dev-$(VERSION).zip
+
+$(runtime_zip_file): install
+	-rm $@
+	cd $(prefix); \
+	zip $@ bin/libcairo-$(LT_CURRENT_MINUS_AGE).dll
+
+$(developer_zip_file): install
+	-rm $@
+	cd $(prefix); \
+	zip -r $@ include/cairo lib/libcairo.dll.a lib/cairo.lib lib/pkgconfig/cairo.pc
+
+zips: $(runtime_zip_file) $(developer_zip_file)
+
 release-verify-even-micro:
 	@echo -n "Checking that $(VERSION) has an even micro component..."
 	@test "$(CAIRO_VERSION_MICRO)" = "`echo $(CAIRO_VERSION_MICRO)/2*2 | bc`" \