[geglmm] Update the build system to match glibmm.

From: Hubert FiguiÃre <hub src gnome org>
To: commits-list gnome org
Cc:
Subject: [geglmm] Update the build system to match glibmm.
Date: Mon, 14 Nov 2011 04:41:21 +0000 (UTC)
commit 7ba95c775957225ca729b50bc94874cdd51c74d2
Author: Hub Figuiere <hub figuiere net>
Date:   Sun Nov 13 18:40:57 2011 -0800

    Update the build system to match glibmm.
    
    	* configure.in -> configure.ac
    	Makefile.am
    	autogsen.sh
    	etc...
    	Update the build system to match glibmm.
    
    	* docs/Makefile.am, docs/reference/Doxyfile.in:
    	Update building documentation.

 .gitignore                                         |   24 +-
 ChangeLog                                          |   11 +
 Makefile.am                                        |    6 +-
 autogen.sh                                         |   62 +-
 {build_shared => build}/Makefile_build.am_fragment |    0
 .../Makefile_build_gensrc.am_fragment              |    4 +-
 .../Makefile_gensrc.am_fragment                    |    4 +-
 build/doc-reference.am                             |  204 +
 configure.in => configure.ac                       |   31 +-
 docs/Makefile.am                                   |   40 +-
 docs/reference/Doxyfile.in                         |   54 +-
 docs/reference/Makefile.am                         |   70 -
 docs/reference/README                              |    6 -
 docs/reference/glibmm_doxygen_tags                 |17614 --------------------
 gegl/geglmm/Makefile.am                            |    2 +-
 gegl/geglmm/filelist.am                            |   43 +
 gegl/geglmm/private/Makefile.am                    |    2 +-
 gegl/geglmmconfig.h.in                             |   14 +-
 gegl/src/Makefile.am                               |    2 +-
 ...Makefile_list_of_hg.am_fragment => filelist.am} |    0
 20 files changed, 385 insertions(+), 17808 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 40ce219..6dd242a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,12 +8,29 @@ Makefile.in
 *.so
 .libs
 .deps
+aclocal.m4
+autom4te.cache
 config.guess
 config.log
 config.status
 config.sub
 configure
 depcomp
+install-sh
+ltmain.sh
+missing
+compile-binding.am
+dist-changelog.am
+doc-reference.am
+generate-binding.am
+docs/doc-install.pl
+docs/doc-postprocess.pl
+docs/doxygen.css
+docs/reference/Doxyfile
+docs/reference/geglmm.devhelp2
+docs/reference/geglmm.tag
+docs/reference/doxygen.log
+docs/tagfile-to-devhelp2.xsl
 tools/extra_defs_gen/generate_extra_defs
 gegl/geglmm.pc
 gegl/geglmm/buffer.cc
@@ -49,5 +66,8 @@ examples/2geglbuffer
 examples/geglbuffer-add-image
 examples/geglbuffer-clock
 examples/hello-world
-
-
+scripts/libtool.m4
+scripts/ltoptions.m4
+scripts/ltsugar.m4
+scripts/ltversion.m4
+scripts/lt~obsolete.m4
\ No newline at end of file
diff --git a/ChangeLog b/ChangeLog
index ef943f3..c77cdde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-11-13  Hub FiguiÃre  <hub figuiere net>
+
+	* configure.in -> configure.ac
+	Makefile.am
+	autogsen.sh
+	etc...
+	Update the build system to match glibmm.
+
+	* docs/Makefile.am, docs/reference/Doxyfile.in:
+	Update building documentation.
+
 2011-02-19  Hubert Figuiere  <hub figuiere net>
 
 	* configure.in
diff --git a/Makefile.am b/Makefile.am
index aa63363..50ba965 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,9 +3,9 @@ SUBDIRS		= tools gegl docs examples
 DIST_SUBDIRS	= $(SUBDIRS) scripts
 
 EXTRA_DIST	=  \
-		  build_shared/Makefile_build.am_fragment \
-		  build_shared/Makefile_build_gensrc.am_fragment \
-		  build_shared/Makefile_gensrc.am_fragment 
+		  build/Makefile_build.am_fragment \
+		  build/Makefile_build_gensrc.am_fragment \
+		  build/Makefile_gensrc.am_fragment 
 
 
 all-local:
diff --git a/autogen.sh b/autogen.sh
index 05f1a34..d6d0d7c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,59 +1,7 @@
 #!/bin/sh
-MAKE=`which gnumake`
-if test ! -x "$MAKE" ; then MAKE=`which gmake` ; fi
-if test ! -x "$MAKE" ; then MAKE=`which make` ; fi
-HAVE_GNU_MAKE=`$MAKE --version|grep -c "Free Software Foundation"`
-
-if test "$HAVE_GNU_MAKE" != "1"; then 
-echo !!!! ERROR: You need GNU make to build from cvs!; 
-echo !!!! $MAKE is not GNU make;
-exit 1; 
-fi
-
-echo Found GNU Make at $MAKE ... good.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-PKG_NAME="geglmm"
-
-(test -f $srcdir/configure.in \
-  && test -d $srcdir/gegl/src \
-  && test -d $srcdir/gegl/geglmm) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level $PKG_NAME directory"
-    exit 1
-}
-
-
-
-echo "Adding libtools."
-libtoolize --automake
-
-echo "Building macros."
-aclocal -I scripts $ACLOCAL_FLAGS
-
-#echo "Building config header."
-#autoheader
-
-echo "Building makefiles."
-automake   --add-missing
-
-echo "Building configure."
-autoconf
-
-rm -f config.cache
-
-if test -z "$AUTOGEN_SUBDIR_MODE"; then
-
-    echo "Running configure."
-    ./configure --enable-maintainer-mode "$@"
-    echo
-    echo 'run "make"'
-    echo
-else
-    echo
-    echo 'run "./configure ; make"'
-    echo
-fi
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
 
+mm-common-prepare --copy --force "$srcdir"
+autoreconf --force --install --verbose --warnings=all "$srcdir"
+test -n "$NOCONFIGURE" || "$srcdir/configure" --enable-maintainer-mode "$@"
diff --git a/build_shared/Makefile_build.am_fragment b/build/Makefile_build.am_fragment
similarity index 100%
rename from build_shared/Makefile_build.am_fragment
rename to build/Makefile_build.am_fragment
diff --git a/build_shared/Makefile_build_gensrc.am_fragment b/build/Makefile_build_gensrc.am_fragment
similarity index 83%
rename from build_shared/Makefile_build_gensrc.am_fragment
rename to build/Makefile_build_gensrc.am_fragment
index 07312a1..cc7cf46 100644
--- a/build_shared/Makefile_build_gensrc.am_fragment
+++ b/build/Makefile_build_gensrc.am_fragment
@@ -17,10 +17,10 @@
 ## common_ldflags		libgtkmm_la_LDFLAGS = $(common_ldflags)
 
 
-include $(srcdir)/../src/Makefile_list_of_hg.am_fragment
+include $(srcdir)/../src/filelist.am
 
 files_built_cc		= $(files_hg:.hg=.cc) wrap_init.cc
 files_built_h		= $(files_hg:.hg=.h)
 files_extra_h		+= wrap_init.h
 
-include $(top_srcdir)/build_shared/Makefile_build.am_fragment
+include $(top_srcdir)/build/Makefile_build.am_fragment
diff --git a/build_shared/Makefile_gensrc.am_fragment b/build/Makefile_gensrc.am_fragment
similarity index 95%
rename from build_shared/Makefile_gensrc.am_fragment
rename to build/Makefile_gensrc.am_fragment
index d38e43c..8eeab0a 100644
--- a/build_shared/Makefile_gensrc.am_fragment
+++ b/build/Makefile_gensrc.am_fragment
@@ -23,7 +23,7 @@ include $(top_srcdir)/tools/Makefile_list_of_sources.am_fragment
 tools_m4	= $(files_tools_m4:%.m4=$(tools_dir_m4)/%.m4)
 # tools_pm	= $(files_tools_pm:%.pm=$(tools_dir_pm)/%.pm)
 
-include $(srcdir)/Makefile_list_of_hg.am_fragment
+include $(srcdir)/filelist.am
 files_ccg	= $(files_hg:%.hg=%.ccg)
 files_h		= $(files_hg:%.hg=$(gensrc_destdir)/%.h)
 files_cc	= $(files_hg:%.hg=$(gensrc_destdir)/%.cc)
@@ -42,7 +42,7 @@ gen_wrap_init_path = $(gmmproc_dir)/generate_wrap_init.pl
 gen_wrap_init_args = --namespace=$(sublib_namespace) --parent_dir=$(sublib_parentdir)
 run_gen_wrap_init  = $(gen_wrap_init_path) $(gen_wrap_init_args)
 
-EXTRA_DIST	= Makefile_list_of_hg.am_fragment \
+EXTRA_DIST	= filelist.am \
 		  $(files_defs) $(files_hg) $(files_ccg)
 
 
diff --git a/build/doc-reference.am b/build/doc-reference.am
new file mode 100644
index 0000000..c99ccc7
--- /dev/null
+++ b/build/doc-reference.am
@@ -0,0 +1,204 @@
+## Copyright (c) 2009, 2011  Openismus GmbH  <http://www.openismus.com/>
+##
+## This file is part of mm-common.
+##
+## mm-common is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published
+## by the Free Software Foundation, either version 2 of the License,
+## or (at your option) any later version.
+##
+## mm-common is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with mm-common.  If not, see <http://www.gnu.org/licenses/>.
+
+## Parameters:  book_name
+## Overrides:   pubdocbase, htmlrefpub, book_title, htmlref_patterns,
+##              doc_outdir, doc_config, doc_postprocess, doc_install,
+##              tagfile_to_devhelp2, doxytagfile, devhelpfile
+## Files:       doc_input
+## Output:      dist_noinst_DATA, DISTCLEANFILES, MAINTAINERCLEANFILES
+
+# The name of the sub-directory where the generated documentation
+# will be placed.
+doc_outdir ?= reference
+
+# The name of the Doxygen configuration file.
+doc_config ?= $(doc_outdir)/Doxyfile
+
+# The base URL where the online documentation for C++ binding modules
+# is located, including the trailing slash.
+pubdocbase ?= http://library.gnome.org/devel/
+
+# The URL of the module's online HTML reference documentation, which
+# may or may not end in a trailing slash.
+htmlrefpub ?= $(pubdocbase)$(PACKAGE_TARNAME)/unstable/
+
+# The title of the generated Devhelp book.
+book_title ?= $(PACKAGE_NAME) Reference Manual
+
+# A list of wildcard patterns matching the files from the HTML directory
+# generated by Doxygen which should be distributed and installed.
+htmlref_patterns ?= $(addprefix $(doc_outdir)/html/*.,css gif html png)
+
+# Locations of utilities shipped with glibmm.  Made overridable
+# in case the installed utilities cannot be used for some reason.
+doc_postprocess     ?= $(PERL) -- "$(MMDOCTOOLDIR)/doc-postprocess.pl"
+doc_install         ?= $(PERL) -- "$(MMDOCTOOLDIR)/doc-install.pl"
+tagfile_to_devhelp2 ?= "$(MMDOCTOOLDIR)/tagfile-to-devhelp2.xsl"
+
+# Names of the main output files.
+doxytagfile ?= $(doc_outdir)/$(book_name).tag
+devhelpfile ?= $(doc_outdir)/$(book_name).devhelp2
+
+# Function: $(call vpath_listall,PATTERN ...)
+# Get all filenames which match a PATTERN from the list.  Look for files
+# relative to either the current directory or $(srcdir).  Strip $(srcdir)/
+# again before returning and remove any duplicates.
+vpath_srclist = $(patsubst $(srcdir)/%,%,$(wildcard $(addprefix $(srcdir)/,$(1))))
+vpath_listall = $(sort $(wildcard $(1)) $(if $(srcdir:.=),$(vpath_srclist)))
+
+# Installation directories.
+libdocdir    = $(datarootdir)/doc/$(book_name)
+referencedir = $(libdocdir)/reference
+htmlrefdir   = $(referencedir)/html
+devhelpdir   = $(datadir)/devhelp/books/$(book_name)
+
+if ENABLE_DOCUMENTATION
+doc_inst_targets = install-htmlref install-devhelp
+doc_inst_files   = $(doxytagfile)
+doc_dist_files   = $(devhelpfile) $(call vpath_listall,$(htmlref_patterns))
+else
+doc_inst_targets =
+doc_inst_files   =
+doc_dist_files   =
+endif
+
+if DIST_DOCTOOLS
+doc_dist_files   += $(MMDOCTOOLDIR)/doc-postprocess.pl $(MMDOCTOOLDIR)/doc-install.pl $(MMDOCTOOLDIR)/tagfile-to-devhelp2.xsl $(MMDOCTOOLDIR)/doxygen.css
+endif
+
+dist_reference_DATA = $(strip $(doc_inst_files))
+dist_noinst_DATA    = $(strip $(doc_dist_files))
+
+DISTCLEANFILES       = $(doc_outdir)/doxygen.log
+MAINTAINERCLEANFILES = $(doxytagfile) $(devhelpfile) $(doc_outdir)/html/*
+
+# The generic bit of the doc-install.pl command line.
+doc_install_cmd = $(doc_install) --verbose --mode=0644
+
+# Transform $(datarootdir) into a URI to match MM_ARG_WITH_TAGFILE_DOC().
+datarootdir_esc = $(subst $(subst ,, ),%20,$(subst \,/,$(datarootdir)))
+docdir_base_uri = file:///$(patsubst /%,%,$(datarootdir_esc:/=))/doc
+
+# The command and options used to install the files from the HTML reference
+# documentation.  The $(subst) magic translates external tag references from
+# absolute to relative paths if the destination is on the local file system
+# and installed under the same prefix as the package being built.
+htmlref_relinst = $(subst @$(docdir_base_uri)/,@../../../,$(DOCINSTALL_FLAGS))
+htmlref_install = $(doc_install_cmd) $(htmlref_relinst)
+
+# The command and options used to install the Devhelp file.
+devhelp_install = $(doc_install_cmd) --book-base='$(htmlrefdir:/=)'
+
+# Helper variables to replicate each pattern with a $(srcdir)/ prefix.
+# Also add quoting to prevent the shell from expanding the patterns.
+htmlref_patterns_dup   = $(foreach item,$(htmlref_patterns),'$(item)' '$(srcdir)/$(item)')
+htmlref_patterns_quote = $(patsubst %,'%',$(htmlref_patterns))
+htmlref_patterns_vpath = $(if $(srcdir:.=),$(htmlref_patterns_dup),$(htmlref_patterns_quote))
+
+# Expand to a list of -name 'PATTERN' arguments for use with 'find'.
+htmlref_find_patterns = $(patsubst %,-name '%' -o,$(notdir $(htmlref_patterns))) -false
+
+# The parameters to the Doxygen-to-Devhelp XSLT script
+dh_xsl_params =	--stringparam book_title '$(book_title)' \
+		--stringparam book_name '$(book_name)' \
+		--stringparam book_base html
+
+# Generated configuration files which, when updated, should cause the
+# reference documentation to be rebuilt.
+doc_config_deps = $(CONFIG_HEADER) $(srcdir)/$(doc_config).in $(srcdir)/Makefile.in
+
+# Regenerate the documentation automatically only in maintainer mode.
+# Depend on the generated configuration header files to trigger a rebuild
+# if a configuration value changed.  The configuration header files only
+# have their timestamp modified when the content actually changed, which
+# is not the case for any other files generated by configure.
+if MAINTAINER_MODE
+doc_dependencies = $(doc_config_deps) $(doc_input)
+else
+doc_dependencies =
+endif
+
+# Explicitly depend on the files to be distributed or installed.
+all-local: $(doc_inst_files) $(doc_dist_files)
+
+# Hook up custom rules for translating references to external documentation
+# to the actual location at install time.
+install-data-local: $(doc_inst_targets)
+
+# Hook up corresponding custom uninstall rules.
+uninstall-local: $(addprefix un,$(doc_inst_targets))
+
+# Install the HTML reference documentation files with just one invocation
+# of doc-install.pl to speed up the build process.  Make use of the --glob
+# option, which tells it to perform filename globbing itself, like 'find'.
+# This helps to avoid excessively long command lines, as some platforms
+# have rather restrictive limits.
+install-htmlref: $(doc_outdir)/html/index.html
+	@$(NORMAL_INSTALL)
+	$(MKDIR_P) '$(DESTDIR)$(htmlrefdir)'
+	$(htmlref_install) -t '$(DESTDIR)$(htmlrefdir)' --glob -- $(htmlref_patterns_vpath)
+
+# Delete files from the html installation directory.  Avoid recursive
+# directory removal, and apply the same wildcard pattern as was used to
+# select files for installation.
+uninstall-htmlref:
+	@$(NORMAL_UNINSTALL)
+	(cd '$(DESTDIR)$(htmlrefdir)' 2>/dev/null || exit 0; \
+	 find . -type f '(' $(htmlref_find_patterns) ')' -exec rm -f '{}' '+')
+	-test ! -r '$(DESTDIR)$(htmlrefdir)' || rmdir '$(DESTDIR)$(htmlrefdir)'
+
+# Install the Devhelp file, translating the base path on the fly.
+install-devhelp: $(devhelpfile)
+	@$(NORMAL_INSTALL)
+	$(MKDIR_P) '$(DESTDIR)$(devhelpdir)'
+	$(devhelp_install) -t '$(DESTDIR)$(devhelpdir)' -- $^
+
+# Remove the installed Devhelp file and directory.
+uninstall-devhelp:
+	@$(NORMAL_UNINSTALL)
+	rm -f '$(DESTDIR)$(devhelpdir)/$(notdir $(devhelpfile))'
+	-test ! -r '$(DESTDIR)$(devhelpdir)' || rmdir '$(DESTDIR)$(devhelpdir)'
+
+# Regenerate the Doxygen configuration file automatically.  In the
+# top-level build directory Automake already takes care of this.
+ ifneq ($(subdir),.)
+$(doc_config): $(srcdir)/$(doc_config).in $(top_builddir)/config.status
+	$(AM_V_GEN)cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+ endif
+# Make sure that the documentation will always have been generated before
+# executing commands of a rule that depends on files in $(doc_outdir)/html/.
+$(doc_outdir)/html/%: | $(doxytagfile)
+
+# Run Doxygen to build the reference documentation. The generated tag file
+# also functions as time stamp target for the documentation as a whole.
+$(doxytagfile): $(doc_dependencies) | $(doc_config)
+	-$(AM_V_at)rm -f $@
+	-$(AM_V_at)rm -fr $(doc_outdir)/html
+	$(AM_V_GEN)(echo '@INCLUDE =' $(doc_config) && echo 'INPUT =' $(doc_input)) | $(DOXYGEN) -
+	$(AM_V_at)$(doc_postprocess) '$(doc_outdir)/html/*.html'
+
+# Run XSL transformation to generate a Devhelp book from a Doxygen tag file.
+%.devhelp2: %.tag
+	$(AM_V_GEN)$(XSLTPROC) $(dh_xsl_params) -o $@ $(tagfile_to_devhelp2) $<
+
+.PHONY: install-htmlref uninstall-htmlref install-devhelp uninstall-devhelp
+
+# Instruct GNU make to delete the targets of a rule after it failed, in
+# order to avoid the complication of handling that situation manually.
+.DELETE_ON_ERROR:
diff --git a/configure.in b/configure.ac
similarity index 90%
rename from configure.in
rename to configure.ac
index 9af640d..4fcf0a1 100644
--- a/configure.in
+++ b/configure.ac
@@ -57,13 +57,21 @@ PACKAGE=geglmm
 dnl Initialize automake stuff
 # Initialize automake stuff
 # tar-ustar asks it to use a sensible tar format that can handle long filenames.
-AM_INIT_AUTOMAKE([1.9 tar-ustar])
+AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 
 dnl Specify a configuration file (no autoheader)
 AM_CONFIG_HEADER(gegl/geglmmconfig.h)
 AM_MAINTAINER_MODE
 dnl AL_ACLOCAL_INCLUDE(scripts)
 
+MM_PREREQ([0.9.5])
+MM_INIT_MODULE([geglmm])
+
+# Copy the mm-common .pl scripts into docs/,
+# and use them from there,
+# so we can dist them to avoid a tarball-build dependency.
+MM_CONFIG_DOCTOOL_DIR([docs])
 
 #########################################################################
 #  Configure arguments 
@@ -74,6 +82,7 @@ dnl AL_ACLOCAL_INCLUDE(scripts)
 #########################################################################
 AC_PROG_CC
 AC_PROG_CPP
+AC_PROG_CXX
 AC_PROG_MAKE_SET
 AC_CANONICAL_HOST
 
@@ -115,9 +124,8 @@ AL_PROG_GNU_MAKE(AC_MSG_ERROR([dnl
 SUN make does not work for building gtkmm.
 Please install GNU make.]))
 
-AL_PROG_PERL(AC_MSG_ERROR([Perl is required to build gtkmm.]))
-
-AC_CHECK_PROGS(PERL, perl5 perl)
+MM_PATH_PERL
+AS_IF([test "x$USE_MAINTAINER_MODE" != xno], [MM_CHECK_PERL])
 
 #########################################################################
 #  Dependancy checks
@@ -154,16 +162,10 @@ do
 done
 AC_SUBST(LIBGEGLMM_DOXYGEN_INPUT)
 
-# Add an --enable-reference option:
-AC_ARG_ENABLE(reference,
-     [  --enable-reference   Build the reference documentation],
-     [case "${enableval}" in
-       yes) reference=true ;;
-       no)  reference=false ;;
-       *) AC_MSG_ERROR(bad value ${enableval} for --enable-reference) ;;
-     esac],[reference=false])
-AM_CONDITIONAL(BUILD_REFERENCE, test x$reference = xtrue)
-
+MM_ARG_ENABLE_DOCUMENTATION
+MM_ARG_WITH_TAGFILE_DOC([libstdc++.tag], [mm-common-libstdc++])
+MM_ARG_WITH_TAGFILE_DOC([libsigc++-2.0.tag], [sigc++-2.0])
+MM_ARG_WITH_TAGFILE_DOC([glibmm-2.4.tag], [glibmm-2.4])
 
 # Dummy conditional just to make automake-1.4 happy.
 # We need an always-false condition in docs/Makefile.am.
@@ -190,7 +192,6 @@ AC_OUTPUT([
   scripts/Makefile
 
   docs/Makefile
-  docs/reference/Makefile
     docs/reference/Doxyfile
 
   examples/Makefile
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 51570ee..84100b2 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,9 +1,31 @@
-## Copyright (c) 2001
-## The libgdamm development team.
-
-## This voodoo stuff lets automake see the subdirs
-## without including them into recursive builds.
-if BUILD_REFERENCE 
-SUBDIRS = reference
-endif
-DIST_SUBDIRS = reference
+## Copyright (c) 2009  Openismus GmbH  <http://www.openismus.com/>
+## Copyright (c) 2011  Hub Figuiere
+##
+## This file is part of geglmm.
+##
+## glibmm is free software: you can redistribute it and/or modify it
+## under the terms of the GNU Lesser General Public License as published
+## by the Free Software Foundation, either version 2.1 of the License,
+## or (at your option) any later version.
+##
+## glibmm is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+## See the GNU Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public License
+## along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+include $(top_srcdir)/gegl/src/filelist.am
+include $(top_srcdir)/gegl/geglmm/filelist.am
+
+geglmm_files_h = $(filter-out wrap_init.h,$(geglmm_files_built_h) $(geglmm_files_extra_h))
+
+book_name = $(GEGLMM_MODULE_NAME)
+doc_input = $(addprefix $(top_srcdir)/gegl/geglmm/,$(geglmm_files_h)) \
+            $(top_srcdir)/gegl/geglmm.h
+
+docimagesdir = $(libdocdir)/images
+dist_docimages_DATA = 
+
+include $(top_srcdir)/build/doc-reference.am
diff --git a/docs/reference/Doxyfile.in b/docs/reference/Doxyfile.in
index f7a975a..f644651 100644
--- a/docs/reference/Doxyfile.in
+++ b/docs/reference/Doxyfile.in
@@ -3,24 +3,29 @@
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
+DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = libgeglmm
 PROJECT_NUMBER         = @LIBGEGLMM_VERSION@
-OUTPUT_DIRECTORY       = 
+OUTPUT_DIRECTORY       = reference
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
-USE_WINDOWS_ENCODING   = NO
 BRIEF_MEMBER_DESC      = YES
 REPEAT_BRIEF           = YES
 ABBREVIATE_BRIEF       = 
 ALWAYS_DETAILED_SEC    = NO
 INLINE_INHERITED_MEMB  = NO
 FULL_PATH_NAMES        = NO
-STRIP_FROM_PATH        = 
-STRIP_FROM_INC_PATH    = 
+STRIP_FROM_PATH        = "@abs_top_builddir@/gegl/" \
+                         "@abs_top_srcdir@/gegl/" \
+                         "@abs_top_builddir@/" \
+                         "@abs_top_srcdir@/"
+STRIP_FROM_INC_PATH    = "@abs_top_builddir@/gegl/" \
+                         "@abs_top_srcdir@/gegl/" \
+                         "@abs_top_builddir@/" \
+                         "@abs_top_srcdir@/"
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = YES
 MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP         = NO
 INHERIT_DOCS           = YES
 DISTRIBUTE_GROUP_DOC   = NO
 TAB_SIZE               = 8
@@ -33,13 +38,13 @@ SUBGROUPING            = YES
 #---------------------------------------------------------------------------
 EXTRACT_ALL            = YES
 EXTRACT_PRIVATE        = NO
-EXTRACT_STATIC         = YES
-EXTRACT_LOCAL_CLASSES  = YES
+EXTRACT_STATIC         = NO
+EXTRACT_LOCAL_CLASSES  = NO
 EXTRACT_LOCAL_METHODS  = NO
-HIDE_UNDOC_MEMBERS     = NO
-HIDE_UNDOC_CLASSES     = NO
-HIDE_FRIEND_COMPOUNDS  = NO
-HIDE_IN_BODY_DOCS      = NO
+HIDE_UNDOC_MEMBERS     = YES
+HIDE_UNDOC_CLASSES     = YES
+HIDE_FRIEND_COMPOUNDS  = YES
+HIDE_IN_BODY_DOCS      = YES
 INTERNAL_DOCS          = NO
 CASE_SENSE_NAMES       = YES
 HIDE_SCOPE_NAMES       = NO
@@ -53,7 +58,7 @@ GENERATE_TESTLIST      = YES
 GENERATE_BUGLIST       = YES
 GENERATE_DEPRECATEDLIST= YES
 ENABLED_SECTIONS       = 
-MAX_INITIALIZER_LINES  = 30
+MAX_INITIALIZER_LINES  = 2
 SHOW_USED_FILES        = YES
 SHOW_DIRECTORIES       = YES
 FILE_VERSION_FILTER    = 
@@ -66,7 +71,7 @@ WARN_IF_UNDOCUMENTED   = YES
 WARN_IF_DOC_ERROR      = YES
 WARN_NO_PARAMDOC       = NO
 WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           = 
+WARN_LOGFILE           = reference/doxygen.log
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
@@ -91,7 +96,8 @@ SOURCE_BROWSER         = NO
 INLINE_SOURCES         = NO
 STRIP_CODE_COMMENTS    = NO
 REFERENCED_BY_RELATION = YES
-REFERENCES_RELATION    = YES
+REFERENCES_RELATION    = NO
+REFERENCES_LINK_SOURCE = YES
 VERBATIM_HEADERS       = NO
 #---------------------------------------------------------------------------
 # configuration options related to the alphabetical class index
@@ -105,10 +111,11 @@ IGNORE_PREFIX          =
 GENERATE_HTML          = YES
 HTML_OUTPUT            = html
 HTML_FILE_EXTENSION    = .html
-HTML_HEADER            = libgeglmm_header.html_fragment
-HTML_FOOTER            = libgeglmm_footer.html_fragment
-HTML_STYLESHEET        = 
+HTML_HEADER            = 
+HTML_FOOTER            = 
+HTML_STYLESHEET        = "@abs_top_srcdir@/docs/doxygen.css"
 HTML_ALIGN_MEMBERS     = YES
+HTML_DYNAMIC_SECTIONS  = NO
 GENERATE_HTMLHELP      = NO
 CHM_FILE               = 
 HHC_LOCATION           = 
@@ -176,8 +183,9 @@ ENABLE_PREPROCESSING   = YES
 MACRO_EXPANSION        = YES
 EXPAND_ONLY_PREDEF     = YES
 SEARCH_INCLUDES        = NO
-INCLUDE_PATH           = 
-INCLUDE_FILE_PATTERNS  = 
+INCLUDE_PATH           = "@abs_top_builddir@/gegl" \
+                         "@abs_top_srcdir@/gegl" 
+INCLUDE_FILE_PATTERNS  = *.h
 PREDEFINED             = DOXYGEN_SHOULD_SKIP_THIS \
                          GTKMM_USING_STD(x)= \
                          GTKMM_API \
@@ -191,10 +199,10 @@ SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------
 # Configuration::additions related to external references   
 #---------------------------------------------------------------------------
-TAGFILES               = ../../../glibmm/docs/reference/glibmm_doxygen_tags
-GENERATE_TAGFILE       = libgeglmm_doxygen_tags
+TAGFILES               = @DOXYGEN_TAGFILES@
+GENERATE_TAGFILE       = "reference/@GEGLMM_MODULE_NAME  tag"
 ALLEXTERNALS           = NO
-EXTERNAL_GROUPS        = YES
+EXTERNAL_GROUPS        = NO
 PERL_PATH              = @PERL_PATH@
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool   
@@ -215,8 +223,6 @@ DIRECTORY_GRAPH        = YES
 DOT_IMAGE_FORMAT       = png
 DOT_PATH               = 
 DOTFILE_DIRS           = 
-MAX_DOT_GRAPH_WIDTH    = 1024
-MAX_DOT_GRAPH_HEIGHT   = 1024
 MAX_DOT_GRAPH_DEPTH    = 0
 DOT_TRANSPARENT        = NO
 DOT_MULTI_TARGETS      = NO
diff --git a/gegl/geglmm/Makefile.am b/gegl/geglmm/Makefile.am
index c099327..fc21c31 100644
--- a/gegl/geglmm/Makefile.am
+++ b/gegl/geglmm/Makefile.am
@@ -14,7 +14,7 @@ sublib_topdir = gegl
 files_extra_h	= init.h 
 files_extra_cc = init.cc #config.cc value.cc
 
-include $(top_srcdir)/build_shared/Makefile_build_gensrc.am_fragment
+include $(top_srcdir)/build/Makefile_build_gensrc.am_fragment
 
 lib_LTLIBRARIES			= libgeglmm.la
 libgeglmm_la_SOURCES	= $(files_all_cc)
diff --git a/gegl/geglmm/filelist.am b/gegl/geglmm/filelist.am
new file mode 100644
index 0000000..2fa6d72
--- /dev/null
+++ b/gegl/geglmm/filelist.am
@@ -0,0 +1,43 @@
+## This file is part of geglmm.
+
+geglmm_files_built_cc = $(geglmm_files_hg:.hg=.cc) $(geglmm_files_cc_m4:.m4=) wrap_init.cc
+geglmm_files_built_h  = $(geglmm_files_hg:.hg=.h) $(geglmm_files_h_m4:.m4=)
+geglmm_files_built_ph = $(patsubst %.hg,private/%_p.h,$(geglmm_files_hg))
+
+geglmm_files_extra_cc =			\
+	buffer.cc			\
+	color.cc			\
+	curve.cc			\
+	init.cc				\
+	matrix3.cc			\
+	node.cc				\
+	operation.cc			\
+	path.cc				\
+	processor.cc			\
+	rectangle.cc			\
+	wrap_init.cc
+
+geglmm_files_extra_h =			\
+	buffer.h			\
+	color.h				\
+	curve.h				\
+	init.h				\
+	matrix3.h			\
+	node.h				\
+	operation.h			\
+	path.h				\
+	processor.h			\
+	rectangle.h			\
+	wrap_init.h
+
+
+geglmm_files_extra_ph =			\
+	private/buffer_p.h		\
+	private/color_p.h		\
+	private/curve_p.h		\
+	private/matrix3_p.h		\
+	private/node_p.h		\
+	private/operation_p.h		\
+	private/path_p.h		\
+	private/processor_p.h		\
+	private/rectangle_p.h
diff --git a/gegl/geglmm/private/Makefile.am b/gegl/geglmm/private/Makefile.am
index 2938990..85fabd1 100644
--- a/gegl/geglmm/private/Makefile.am
+++ b/gegl/geglmm/private/Makefile.am
@@ -1,7 +1,7 @@
 ## Copyright (c) 2001
 ## The libgeglmm development team.
 
-include $(srcdir)/../../src/Makefile_list_of_hg.am_fragment
+include $(srcdir)/../../src/filelist.am
 files_built_h		= $(files_hg:.hg=_p.h)
 
 private_includedir	= $(includedir)/geglmm-1.0/geglmm/private
diff --git a/gegl/geglmmconfig.h.in b/gegl/geglmmconfig.h.in
index 31ecfdc..4a9e7ff 100644
--- a/gegl/geglmmconfig.h.in
+++ b/gegl/geglmmconfig.h.in
@@ -1,4 +1,13 @@
-/* gegl/geglmmconfig.h.in.  Generated from configure.in by autoheader.  */
+/* gegl/geglmmconfig.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Major version number of geglmm. */
+#undef GEGLMM_MAJOR_VERSION
+
+/* Micro version number of geglmm. */
+#undef GEGLMM_MICRO_VERSION
+
+/* Minor version number of geglmm. */
+#undef GEGLMM_MINOR_VERSION
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
@@ -49,6 +58,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
diff --git a/gegl/src/Makefile.am b/gegl/src/Makefile.am
index 35985a2..68abac2 100644
--- a/gegl/src/Makefile.am
+++ b/gegl/src/Makefile.am
@@ -9,5 +9,5 @@ gegl_enums.defs\
 gegl_docs.xml\
 gegl_docs_override.xml
 
-include $(top_srcdir)/build_shared/Makefile_gensrc.am_fragment
+include $(top_srcdir)/build/Makefile_gensrc.am_fragment
 
diff --git a/gegl/src/Makefile_list_of_hg.am_fragment b/gegl/src/filelist.am
similarity index 100%
rename from gegl/src/Makefile_list_of_hg.am_fragment
rename to gegl/src/filelist.am
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]