[cairo-commit] cairo/pixman Makefile.am,1.5,1.6

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/pixman
In directory gabe:/tmp/cvs-serv5810/pixman

Modified Files:
	Makefile.am 
Log Message:

2005-08-10  Carl Worth  <cworth at cworth.org>

        From Keith Packard <keithp at keithp.com>,

        Build pixman internally as a private part of cairo, with suitable
        name changes to avoid any visible pixman symbols in the cairo
        library:

        * Makefile.am: Descend into pixman.

        * cairo.pc.in: Drop libpixman from Requires.

        * configure.in: Don't check for libpixman. Check version of
        pkg-config and use Requires.private instead of Requires in
        cairo.pc if possible. Generate pixman Makefiles.

        * pixman/Makefile.am: Rip out release-publish target and
        installation of libpixman.pc.

        * pixman/src/Makefile.am: Add pixman-remap.h. Drop libpixman.la
        target.

        * pixman/src/icint.h: Fix to include config.h rather than
        ../config.h

        * pixman/src/pixman-remap.h: This is the cpp magic to rename all
        pixman functions from the various fb, Fb, INT_pixman, pixman,
        Render, _Render, or no prefix to _cairo_pixman_ prefixes.

        * pixman/src/pixman.h: Include pixman-remap.h to get all the
        cairo-internalized names.

        * src/Makefile.am:
        * test/Makefile.am: Add -Ipixman/src to get at
        pixman-remap.h.


Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/pixman/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	21 Jan 2005 18:54:51 -0000	1.5
+++ Makefile.am	10 Aug 2005 19:36:51 -0000	1.6
@@ -1,60 +1,7 @@
-SUBDIRS = . src
+SUBDIRS = src
 
 EXTRA_DIST = \
 	COPYING \
 	ChangeLog.libic \
 	ChangeLog.libpixregion \
-	ChangeLog.slim \
-	libpixman.pc.in
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libpixman.pc
-
-# Some custom targets to make it easier to release things.
-# Use either:
-#		make release-check
-# or		make release-publish
-
-RELEASE_UPLOAD_HOST =   cairographics.org
-RELEASE_UPLOAD_DIR =    /srv/cairo.freedesktop.org/www/snapshots
-RELEASE_URL_BASE = 	http://cairographics.org/snapshots
-RELEASE_ANNOUNCE_LIST = cairo-announce at cairographics.org
-
-tar_file = $(PACKAGE)-$(VERSION).tar.gz
-md5_file = $(tar_file).md5
-
-$(md5_file): $(tar_file)
-	md5sum $^ > $@
-
-release-remove-old:
-	rm -f $(tar_file) $(md5_file)
-
-release-check: release-remove-old distcheck $(md5_file)
-
-release-verify-newer:
-	@echo -n "Checking that no $(VERSION) release already exists..."
-	@ssh $(RELEASE_UPLOAD_HOST) test ! -e $(RELEASE_UPLOAD_DIR)/$(tar_file) \
-		|| (echo "Ouch." && echo "Found: $(RELEASE_UPLOAD_HOST):$(RELEASE_UPLOAD_DIR)/$(tar_file)" \
-		&& echo "The version in configure.in must be incremented before a new release." \
-		&& false)
-	@echo "Good."
-
-release-publish: release-verify-newer release-check
-	mkdir -p releases
-	scp $(tar_file) $(md5_file) $(RELEASE_UPLOAD_HOST):$(RELEASE_UPLOAD_DIR)
-	mv $(tar_file) $(md5_file) releases
-	ssh $(RELEASE_UPLOAD_HOST) "rm -f $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-[0-9]* && touch $(RELEASE_UPLOAD_DIR)/LATEST-$(PACKAGE)-$(VERSION)"
-	@echo ""
-	@echo "Please send an announcement to $(RELEASE_ANNOUNCE_LIST)"
-	@echo "including the following:"
-	@echo ""
-	@echo "Subject: $(PACKAGE) snapshot $(VERSION) now available"
-	@echo ""
-	@echo "A new $(PACKAGE) snapshot $(VERSION) is now available from:"
-	@echo ""
-	@echo "	$(RELEASE_URL_BASE)/$(tar_file)"
-	@echo "	$(RELEASE_URL_BASE)/$(md5_file)"
-	@echo -n "	"
-	@cat releases/$(md5_file)
-	@echo ""
-	@echo "Also, please include the new entries from the NEWS file."
+	ChangeLog.slim