[cairo-commit] cairomm ChangeLog, 1.20, 1.21 Makefile.am, 1.2, 1.3 configure.in, 1.7, 1.8

[Jonathon Jongsma]

Committed by: jjongsma

Update of /cvs/cairo/cairomm
In directory gabe:/tmp/cvs-serv30713

Modified Files:
	ChangeLog Makefile.am configure.in 
Log Message:
2006-02-07  Jonathon Jongsma  <jonathon.jongsma at gmail.com>

	* Makefile.am: add docs/ subdir
	* configure.in: added an --enable-docs switch to the configure script
	(enabled by default), and added AC_OUTPUT directives for the documentation
	Makefiles, etc.
	* docs/.cvsignore:
	* docs/Makefile.am:
	* docs/reference/.cvsignore:
	* docs/reference/Doxyfile.in:
	* docs/reference/Makefile.am:
	* docs/reference/introduction.h: Added infrastructure to build and install
	the API documentation for cairomm (based on libxml++ makefiles).  


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairomm/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- ChangeLog	29 Jan 2006 05:00:31 -0000	1.20
+++ ChangeLog	8 Feb 2006 00:55:17 -0000	1.21
@@ -1,3 +1,17 @@
+2006-02-07  Jonathon Jongsma  <jonathon.jongsma at gmail.com>
+
+	* Makefile.am: add docs/ subdir
+	* configure.in: added an --enable-docs switch to the configure script
+	(enabled by default), and added AC_OUTPUT directives for the documentation
+	Makefiles, etc.
+	* docs/.cvsignore:
+	* docs/Makefile.am:
+	* docs/reference/.cvsignore:
+	* docs/reference/Doxyfile.in:
+	* docs/reference/Makefile.am:
+	* docs/reference/introduction.h: Added infrastructure to build and install
+	the API documentation for cairomm (based on libxml++ makefiles).  
+
 0.5.0:
 
 2006-01-27  Jonathon Jongsma  <jonathon.jongsma at gmail.com>

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairomm/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	2 Dec 2005 16:11:18 -0000	1.2
+++ Makefile.am	8 Feb 2006 00:55:17 -0000	1.3
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = cairomm examples
+SUBDIRS = cairomm examples $(DOCS_SUBDIR)
 #docs examples
 
 EXTRA_DIST = cairomm-1.0.pc.in

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairomm/configure.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- configure.in	27 Jan 2006 19:01:12 -0000	1.7
+++ configure.in	8 Feb 2006 00:55:17 -0000	1.8
@@ -94,10 +94,26 @@
 
 GLIBMM_CHECK_PERL([5.6.0])
 
+
+AC_ARG_ENABLE(docs, [AC_HELP_STRING([--enable-docs],
+              [build the included docs [default=yes]])],,
+                        [enable_docs=yes])
+if test "x$enable_docs" = "xyes"; then
+  DOCS_SUBDIR="docs"
+else
+  DOCS_SUBDIR=""
+fi
+AC_SUBST(DOCS_SUBDIR)
+
+
 AC_OUTPUT(
   Makefile
   cairomm/Makefile
 
+  docs/Makefile
+  docs/reference/Makefile
+  docs/reference/Doxyfile
+
   examples/Makefile
   examples/png_file/Makefile
   examples/pdf-surface/Makefile