[cairo-commit] 2 commits - doc/public src/Makefile.am

[Behdad Esfahbod]

 doc/public/cairo-docs.xml |   13 +++++++------
 src/Makefile.am           |   39 +++++++++++++--------------------------
 2 files changed, 20 insertions(+), 32 deletions(-)

New commits:
diff-tree a1143d120fbc142fc6ae15f394cfbe400a4a0b3e (from 6efd145882155971be85b23807bd5c52d1025cc3)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sat Jul 8 21:04:21 2006 -0400

    Generate index of new symbols in 1.2.

diff --git a/doc/public/cairo-docs.xml b/doc/public/cairo-docs.xml
index b78d269..fa5a40b 100644
--- a/doc/public/cairo-docs.xml
+++ b/doc/public/cairo-docs.xml
@@ -34,17 +34,15 @@
       <title>Surfaces</title>
       <xi:include href="xml/cairo-surface.xml"/>
       <xi:include href="xml/cairo-image.xml"/>
-      <xi:include href="xml/cairo-glitz.xml"/>
+      <!--xi:include href="xml/cairo-glitz.xml"/-->
       <xi:include href="xml/cairo-pdf.xml"/>
       <xi:include href="xml/cairo-png.xml"/>
       <xi:include href="xml/cairo-ps.xml"/>
       <xi:include href="xml/cairo-win32.xml"/>
-      <xi:include href="xml/cairo-beos.xml"/>
+      <!--xi:include href="xml/cairo-beos.xml"/-->
       <xi:include href="xml/cairo-svg.xml"/>
-<!--  Experimental Quartz and XCB backends removed
-      from the public doc for now.
-      <xi:include href="xml/cairo-quartz.xml"/>
-      <xi:include href="xml/cairo-xcb.xml"/> -->
+      <!--xi:include href="xml/cairo-quartz.xml"-->
+      <!--xi:include href="xml/cairo-xcb.xml"/-->
       <xi:include href="xml/cairo-xlib.xml"/>
     </chapter>
     <chapter id="Support">
@@ -58,5 +56,8 @@
   <index>
     <title>Index</title>
   </index>
+  <index role="1.2">
+    <title>Index of new symbols in 1.2</title>
+  </index>
   <xi:include href="language-bindings.xml"/>
 </book>
diff-tree 6efd145882155971be85b23807bd5c52d1025cc3 (from f3f374fb8066e09da1948674decadc6c764f2a1b)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sat Jul 8 17:52:24 2006 -0400

    Better creation rules for cairo.def.

diff --git a/src/Makefile.am b/src/Makefile.am
index 1899209..277f81e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -111,24 +111,6 @@ libcairo_atsui_sources = cairo-atsui-fon
 backend_pkgconfigs += cairo-atsui.pc
 endif
 
-# Headers that declare the functions in the cairo DLL API on Windows
-cairo_win32_api_headers = \
-	$(srcdir)/cairo.h \
-	$(srcdir)/cairo-win32.h
-
-if CAIRO_HAS_GLITZ_SURFACE
-cairo_win32_api_headers += \
-	$(srcdir)/cairo-glitz.h
-endif
-
-if CAIRO_HAS_FT_FONT
-cairo_win32_api_headers += \
-	$(srcdir)/cairo-ft.h \
-	$(srcdir)/cairo-pdf.h \
-	$(srcdir)/cairo-ps.h \
-	$(srcdir)/cairo-svg.h
-endif
-
 # These names match automake style variable definition conventions so
 # without these lines, automake will complain during the handling of 
 # the libcairo_la_LIBADD below.  (The INCLUDES is an autoconf only
@@ -138,10 +120,8 @@ XRENDER_LIBS=@XRENDER_LIBS@
 
 BUILT_SOURCES = cairo-features.h
 
-cairoincludedir = $(includedir)/cairo
-cairoinclude_HEADERS =			\
+cairo_headers =				\
 	cairo.h				\
-	cairo-features.h		\
 	$(libcairo_atsui_headers)	\
 	$(libcairo_ft_headers)		\
 	$(libcairo_glitz_headers)	\
@@ -156,6 +136,11 @@ cairoinclude_HEADERS =			\
 	$(libcairo_xlib_xrender_headers)	\
 	$(libcairo_directfb_headers)
 
+cairoincludedir = $(includedir)/cairo
+cairoinclude_HEADERS =			\
+	cairo-features.h		\
+	$(cairo_headers)
+
 lib_LTLIBRARIES = libcairo.la
 
 libcairo_la_SOURCES =				\
@@ -253,16 +238,18 @@ $(top_builddir)/config.h: $(top_srcdir)/
 cairo-features.h:
 	cd $(top_builddir) && ./config.status src/cairo-features.h
 
-cairo.def: $(cairo_win32_api_headers)
-	(echo EXPORTS; \
-	cat $(cairo_win32_api_headers) | \
+cairo.def: $(cairoinclude_HEADERS)
+	@echo Generating $@
+	@(echo EXPORTS; \
+	(cd $(srcdir); cat $(cairo_headers) || echo 'cairo_ERROR ()' ) | \
 	grep -v -E '^# *include' | \
-	gcc -include cairo-features.h -E - |\
+	( gcc -include cairo-features.h -E - || echo 'cairo_ERROR ()' ) | \
 	grep -E '^cairo_.* \(' | \
-	sed -e 's/\([^ ]*\).*/\1/' | \
+	sed -e 's/[ 	].*//' | \
 	sort; \
 	echo LIBRARY libcairo-$(LT_CURRENT_MINUS_AGE).dll; \
 	) >$@
+	@ (! grep -q cairo_ERROR $@) || ($(RM) $@; false)
 
 install-data-local:
 	@if test -f "$(DESTDIR)$(includedir)/cairo.h" || test -f "$(DESTDIR)$(includedir)/cairo-features.h" ; then \