[cairo-commit] 5 commits - doc/Makefile.am Makefile.am pixman/src

[Carl Worth]

 Makefile.am                |    8 ++++----
 doc/Makefile.am            |    2 +-
 pixman/src/icint.h         |    2 +-
 pixman/src/icrop.h         |    4 ++--
 pixman/src/slim_internal.h |    4 +++-
 5 files changed, 11 insertions(+), 9 deletions(-)

New commits:
diff-tree 34d11aa3c45ba672b34d0a17f672f907305f3893 (from c1495742f76ce380aaa48389bc331723b7a3a141)
Author: Alfred Peng <alfred.peng at sun.com>
Date:   Fri Sep 29 17:17:27 2006 -0700

    Use pixman_private consistently as prefix not suffix

diff --git a/pixman/src/icint.h b/pixman/src/icint.h
index a489bb7..17b13b4 100644
--- a/pixman/src/icint.h
+++ b/pixman/src/icint.h
@@ -985,7 +985,7 @@ typedef struct _PictFormat	*PictFormatPt
 #define PictureCmapPolicyColor	    3
 #define PictureCmapPolicyAll	    4
 
-extern int PictureCmapPolicy pixman_private;
+extern pixman_private int PictureCmapPolicy;
 
 int	PictureParseCmapPolicy (const char *name);
 
diff --git a/pixman/src/icrop.h b/pixman/src/icrop.h
index 4e6ac82..99fc8e5 100644
--- a/pixman/src/icrop.h
+++ b/pixman/src/icrop.h
@@ -29,7 +29,7 @@ typedef struct _mergeRopBits {
     FbBits   ca1, cx1, ca2, cx2;
 } FbMergeRopRec, *FbMergeRopPtr;
 
-extern const FbMergeRopRec FbMergeRopBits[16] pixman_private;
+extern pixman_private const FbMergeRopRec FbMergeRopBits[16];
 
 #define FbDeclareMergeRop() FbBits   _ca1, _cx1, _ca2, _cx2;
 #define FbDeclarePrebuiltMergeRop()	FbBits	_cca, _ccx;
@@ -98,7 +98,7 @@ extern const FbMergeRopRec FbMergeRopBit
  */
 
 /* half of table */
-extern const pixman_bits_t fbStipple16Bits[256] pixman_private;
+extern pixman_private const pixman_bits_t fbStipple16Bits[256];
 #define FbStipple16Bits(b) \
     (fbStipple16Bits[(b)&0xff] | fbStipple16Bits[(b) >> 8] << FB_HALFUNIT)
 
diff-tree c1495742f76ce380aaa48389bc331723b7a3a141 (from 28cc64aa20cd15f78109f4481bd1c08627c87e46)
Author: Alfred Peng <alfred.peng at sun.com>
Date:   Fri Sep 29 17:16:47 2006 -0700

    Add Sun Pro C definition of pixman_private

diff --git a/pixman/src/slim_internal.h b/pixman/src/slim_internal.h
index 3d1e9a6..9a93972 100644
--- a/pixman/src/slim_internal.h
+++ b/pixman/src/slim_internal.h
@@ -49,7 +49,9 @@
 
 #if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__)
 #define pixman_private	__attribute__((__visibility__("hidden")))
-#else
+#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
+#define pixman_private       __hidden
+#else /* not gcc >= 3.3 and not Sun Studio >= 8 */
 #define pixman_private
 #endif
 
diff-tree 28cc64aa20cd15f78109f4481bd1c08627c87e46 (from deef1a667536ec67ff1d7b42a1f8179e1eac4715)
Author: Carl Worth <cworth at cworth.org>
Date:   Fri Sep 29 17:08:53 2006 -0700

    Fix dependency of 'make doc' so that necessary header files are built first.

diff --git a/Makefile.am b/Makefile.am
index d84f6b8..d3a67c3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,9 @@ endif
 
 
 .PHONY: doc test retest recheck check-valgrind
-doc:
+# We have some generated header files, so we really need to build the
+# library before we can build the docs
+doc: all
 	cd doc && $(MAKE) $(AM_MAKEFLAGS) doc
 test: all
 	cd test && $(MAKE) $(AM_MAKEFLAGS) test
@@ -184,9 +186,7 @@ release-publish-message: releases/$(sha1
 
 release-publish: release-upload release-publish-message
 
-# XXX: Depending on all here is rather overkill. We don't really need
-# the library built in order to create the documentation.
-doc-publish: all
+doc-publish: doc
 	cp -a doc/public/html $(MANUAL_DATED)
 	tar czf $(MANUAL_TAR_FILE) $(MANUAL_DATED)
 	scp $(MANUAL_TAR_FILE) $(RELEASE_UPLOAD_HOST):$(MANUAL_UPLOAD_DIR)
diff-tree deef1a667536ec67ff1d7b42a1f8179e1eac4715 (from e6575fb3c76ec2cda742e05c24958a7000d488dd)
Author: Carl Worth <cworth at cworth.org>
Date:   Fri Sep 29 16:59:27 2006 -0700

    Rename docs-publish target to doc-publish in order to be consistent with the doc target.

diff --git a/Makefile.am b/Makefile.am
index eb98104..d84f6b8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -186,7 +186,7 @@ release-publish: release-upload release-
 
 # XXX: Depending on all here is rather overkill. We don't really need
 # the library built in order to create the documentation.
-docs-publish: all
+doc-publish: all
 	cp -a doc/public/html $(MANUAL_DATED)
 	tar czf $(MANUAL_TAR_FILE) $(MANUAL_DATED)
 	scp $(MANUAL_TAR_FILE) $(RELEASE_UPLOAD_HOST):$(MANUAL_UPLOAD_DIR)
diff-tree e6575fb3c76ec2cda742e05c24958a7000d488dd (from beb778f482645650b129762a0a37400c12a04b32)
Author: Carl Worth <cworth at cworth.org>
Date:   Fri Sep 29 16:58:51 2006 -0700

    Fix Makefile bug preventing 'make doc' from succeeding

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4bca815..821d5c9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
 SUBDIRS=public
 .PHONY: doc
 doc:
-	cd public && $(MAKE) $(AM_MAKEFLAGS) public doc
+	cd public && $(MAKE) $(AM_MAKEFLAGS) doc