Review and clean up after build overhaul

* autogen.sh: Pass --enable-maintainer-mode to ./configure since the
automatic rebuild of the reference documentation is only enabled in
maintainer mode.  AM_MAINTAINER_MODE is already in configure.ac.
* configure.ac (AC_CONFIG_HEADERS): Prepend build/config.h to the
list of header files, because the first file in the list has its .in
file generated by autoheader, and will thus include every AC_DEFINE
from every Autoconf macro that is used.  The macros defined in the
installed cairommconfig.h header should be namespaced and limited to
meta information about the installed cairomm library.
Also move cairommconfig.h to the top-level directory, in order to
avoid the need to add the cairomm/ subdirectory to the include path.
(PKG_CHECK_MODULES): Collapse the checks for optional cairo modules
into a loop, and use PKG_CHECK_EXISTS() instead of the full-blown
PKG_CHECK_MODULES().  Also, be a bit cleverer about the lists of .pc
files and module names generated along the way.
(AC_CONFIG_FILES): List all potentially installed files literally,
instead of creating the list of output files dynamically.  This is
much simpler and also gets us free shipping.  Remove data/Makefile.
* cairommconfig.h.in: Add file to repository, as it should not be
autogenerated.  Of the content, keep only the CAIROMM_ namespaced
macros.
* cairomm/context*.cc: Remove cairomm/ prefix from cairommconfig.h
include statements.  This was already wrong before, but moving the
file around made it visible.
* Makefile.am: Clean up a bit.
(DIST_SUBDIRS): Have Automake figure it out automatically.
(cairomm_include_HEADERS): Remove, as cairomm/cairomm.h is already
installed in cairomm/Makefile.am.
(nodist_cairomm_libinclude_HEADERS): Relocate cairommconfig.h to
the top-level directory.
(nodist_pkgconfig_DATA): Use $(CAIROMM_INSTALL_PC) substitution from
configure.ac to install the appropriate pkg-config data files.
* cairomm/Makefile.am: Rewrite without using compile-binding.am, as
it is not really the appropriate tool for the cairomm job.
* cairomm/filelist.am (cairomm_cc): Rename from $(files_extra_cc).
(cairomm_public_h): Rename variable from $(files_extra_h) and remove
cairommconfig.h from the list.
(cairomm_private_h): Rename variable from $(files_extra_ph).
* docs/Makefile.am (doc_input): Adjust variable names.
(dist_noinst_DATA): Add reference/cairomm.css to the list.
(pubdocbase): Define for completeness.
(htmlrefpub): Correct documentation URL.
* docs/Doxyfile.in: Strip trailing whitespace from every line.
(STRIP_FROM_PATH), (STRIP_FROM_INC_PATH), (INCLUDE_PATH): Do not
strip the cairomm/ subdirectory prefix from the displayed filenames.
(EXCLUDE): Remove list of files to exclude, since the list of input
files is specified explicitly with the new build organization.
(EXPAND_AS_DEFINED): Expand version number macros, although at the
moment they are probably not used anywhere in the public headers.
* data/cairomm-*.pc.in: Use @PACKAGE_VERSION@ instead of @VERSION@.
* data/cairomm-1.0.pc.in (htmlrefpub): Correct documentation URL.
(Cflags): Add missing -I${libdir}/@CAIROMM_MODULE_NAME@/include.
* data/Makefile.am: Delete now unused build file.
* docs/reference/Makefile.am: Delete left-over build file.

14 files changed, 15 insertions, 42 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
deleted file mode 100644
index cb3b574..0000000
--- a/data/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-# This is a list of all of the possible pkg-config files that can be generated.
-# Specific ones to be installed are determined in configure.in
-ALL_PC_IN = cairomm-1.0.pc.in \
-		cairomm-ft-1.0.pc.in \
-		cairomm-pdf-1.0.pc.in \
-		cairomm-png-1.0.pc.in \
-		cairomm-ps-1.0.pc.in \
-		cairomm-quartz-1.0.pc.in \
-		cairomm-quartz-font-1.0.pc.in \
-		cairomm-quartz-image-1.0.pc.in \
-		cairomm-svg-1.0.pc.in \
-		cairomm-win32-1.0.pc.in \
-		cairomm-win32-font-1.0.pc.in \
-		cairomm-xlib-1.0.pc.in \
-		cairomm-xlib-xrender-1.0.pc.in
-
-EXTRA_DIST = $(ALL_PC_IN)
-
-# Install the pkg-config files:
-pkgconfigdir = $(libdir)/pkgconfig
-# $INSTALLED_PC is computed in configure.in
-pkgconfig_DATA = $(INSTALLED_PC)
-
-DISTCLEANFILES=$(INSTALLED_PC)
diff --git a/data/cairomm-1.0.pc.in b/data/cairomm-1.0.pc.in
index 4f5cecc..d7d0fe9 100644
--- a/data/cairomm-1.0.pc.in
+++ b/data/cairomm-1.0.pc.in
@@ -8,13 +8,12 @@ includedir=@includedir@
 docdir=${datarootdir}/doc/@CAIROMM_MODULE_NAME@
 doxytagfile=${docdir}/reference/@CAIROMM_MODULE_NAME@.tag
 htmlrefdir=${docdir}/reference/html
-htmlrefpub=http://www.cairographics.org/documentation/$(book_name)/reference/
+htmlrefpub=http://www.cairographics.org/documentation/cairomm/reference
 
 Name: cairomm
-Description: C++ wrapper for cairo
+Description: C++ binding for the cairo graphics library
 Version: @PACKAGE_VERSION@
 URL: http://www.cairographics.org/cairomm/
 Requires: @CAIROMM_MODULES@
 Libs: -L${libdir} -lcairomm-@CAIROMM_API_VERSION@
-Cflags: -I${includedir}/cairomm-@CAIROMM_API_VERSION@
-
+Cflags: -I${includedir}/@CAIROMM_MODULE_NAME@ -I${libdir}/@CAIROMM_MODULE_NAME@/include
diff --git a/data/cairomm-ft-1.0.pc.in b/data/cairomm-ft-1.0.pc.in
index 13326ab..0c2e666 100644
--- a/data/cairomm-ft-1.0.pc.in
+++ b/data/cairomm-ft-1.0.pc.in
@@ -1,4 +1,4 @@
 Name: cairomm-ft
 Description: C++ wrapper for cairo - ft support
 Requires: cairomm-1.0 cairo-ft
-Version: @VERSION@
+Version: @PACKAGE_VERSION@
diff --git a/data/cairomm-pdf-1.0.pc.in b/data/cairomm-pdf-1.0.pc.in
index 5a14a54..2d0d944 100644
--- a/data/cairomm-pdf-1.0.pc.in
+++ b/data/cairomm-pdf-1.0.pc.in
@@ -1,4 +1,4 @@
 Name: cairomm-pdf
 Description: C++ wrapper for cairo - pdf support
 Requires: cairomm-1.0 cairo-pdf
-Version: @VERSION@
+Version: @PACKAGE_VERSION@
diff --git a/data/cairomm-png-1.0.pc.in b/data/cairomm-png-1.0.pc.in
index 8566f8e..37b97cb 100644
--- a/data/cairomm-png-1.0.pc.in
+++ b/data/cairomm-png-1.0.pc.in
@@ -1,4 +1,4 @@
 Name: cairomm-png
 Description: C++ wrapper for cairo - png support
 Requires: cairomm-1.0 cairo-png
-Version: @VERSION@
+Version: @PACKAGE_VERSION@
diff --git a/data/cairomm-ps-1.0.pc.in b/data/cairomm-ps-1.0.pc.in
index ad5e735..aa5eec5 100644
--- a/data/cairomm-ps-1.0.pc.in
+++ b/data/cairomm-ps-1.0.pc.in
@@ -1,4 +1,4 @@
 Name: cairomm-ps
 Description: C++ wrapper for cairo - postscript support
 Requires: cairomm-1.0 cairo-ps
-Version: @VERSION@
+Version: @PACKAGE_VERSION@
diff --git a/data/cairomm-quartz-1.0.pc.in b/data/cairomm-quartz-1.0.pc.in
index ebb30bf..1d0e65d 100644
--- a/data/cairomm-quartz-1.0.pc.in
+++ b/data/cairomm-quartz-1.0.pc.in
@@ -1,4 +1,4 @@
 Name: cairomm-quartz
 Description: C++ wrapper for cairo - quartz support
 Requires: cairomm-1.0 cairo-quartz
-Version: @VERSION@
+Version: @PACKAGE_VERSION@
diff --git a/data/cairomm-quartz-font-1.0.pc.in b/data/cairomm-quartz-font-1.0.pc.in
index 14913ce..5aeb663 100644
--- a/data/cairomm-quartz-font-1.0.pc.in
+++ b/data/cairomm-quartz-font-1.0.pc.in
@@ -1,4 +1,4 @@
 Name: cairomm-quartz-font
 Description: C++ wrapper for cairo - quartz font support
 Requires: cairomm-1.0 cairo-quartz-font
-Version: @VERSION@
+Version: @PACKAGE_VERSION@
diff --git a/data/cairomm-quartz-image-1.0.pc.in b/data/cairomm-quartz-image-1.0.pc.in
index 25bd8c7..5eb7ba3 100644
--- a/data/cairomm-quartz-image-1.0.pc.in
+++ b/data/cairomm-quartz-image-1.0.pc.in
@@ -1,4 +1,4 @@
 Name: cairomm-quartz-image
 Description: C++ wrapper for cairo - quartz image support
 Requires: cairomm-1.0 cairo-quartz-image
-Version: @VERSION@
+Version: @PACKAGE_VERSION@
diff --git a/data/cairomm-svg-1.0.pc.in b/data/cairomm-svg-1.0.pc.in
index 151c576..ee320b6 100644
--- a/data/cairomm-svg-1.0.pc.in
+++ b/data/cairomm-svg-1.0.pc.in
@@ -1,4 +1,4 @@
 Name: cairomm-svg
 Description: C++ wrapper for cairo - svg support
 Requires: cairomm-1.0 cairo-svg
-Version: @VERSION@
+Version: @PACKAGE_VERSION@
diff --git a/data/cairomm-win32-1.0.pc.in b/data/cairomm-win32-1.0.pc.in
index 99c1285..711e70e 100644
--- a/data/cairomm-win32-1.0.pc.in
+++ b/data/cairomm-win32-1.0.pc.in
@@ -1,4 +1,4 @@
 Name: cairomm-win32
 Description: C++ wrapper for cairo - win32 support
 Requires: cairomm-1.0 cairo-win32
-Version: @VERSION@
+Version: @PACKAGE_VERSION@
diff --git a/data/cairomm-win32-font-1.0.pc.in b/data/cairomm-win32-font-1.0.pc.in
index eaa73f0..aab19c6 100644
--- a/data/cairomm-win32-font-1.0.pc.in
+++ b/data/cairomm-win32-font-1.0.pc.in
@@ -1,4 +1,4 @@
 Name: cairomm-win32-font
 Description: C++ wrapper for cairo - win32 font support
 Requires: cairomm-1.0 cairo-win32-font
-Version: @VERSION@
+Version: @PACKAGE_VERSION@
diff --git a/data/cairomm-xlib-1.0.pc.in b/data/cairomm-xlib-1.0.pc.in
index 6713254..a36f649 100644
--- a/data/cairomm-xlib-1.0.pc.in
+++ b/data/cairomm-xlib-1.0.pc.in
@@ -1,4 +1,4 @@
 Name: cairomm-xlib
 Description: C++ wrapper for cairo - xlib support
 Requires: cairomm-1.0 cairo-xlib
-Version: @VERSION@
+Version: @PACKAGE_VERSION@
diff --git a/data/cairomm-xlib-xrender-1.0.pc.in b/data/cairomm-xlib-xrender-1.0.pc.in
index 9484884..2071f5e 100644
--- a/data/cairomm-xlib-xrender-1.0.pc.in
+++ b/data/cairomm-xlib-xrender-1.0.pc.in
@@ -1,4 +1,4 @@
 Name: cairomm-xlib-xrender
 Description: C++ wrapper for cairo - xlib-xrender support
 Requires: cairomm-1.0 cairo-xlib-xrender
-Version: @VERSION@
+Version: @PACKAGE_VERSION@