Version 2.8.0.1.GCONF_2_8_0_1

2004-09-13  Mark McLoughlin  <mark@skynet.ie>

        * configure.in: Version 2.8.0.1.

2004-09-14  Mark McLoughlin  <mark@skynet.ie>

        * autogen.sh: use automake 1.7 and run gtkdocize.

        * configure.in: check for glib-genmarshal and use
        GTK_DOC_CHECK.

        * Makefile.am: add --enable-gtk-doc to
        DISTCHECK_CONFIGURE_FLAGS.

        * gconf/Makefile.am: re-do how the marshallers
        are generated.

        * doc/gconf/Makefile.am: use gtk-doc.make.

        * doc/gconf/gconf.sgml: tweak to validate.

        * backends/Makefile.am: make xml-test link
        against the backend rather than rebuilding
        the sources.

        * gconf-2.m4.in: rename from gconf.m4.in.

10 files changed, 93 insertions, 272 deletions

diff --git a/ChangeLog b/ChangeLog
index 6facbdb5..09f53569 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,32 @@
 2004-09-13  Mark McLoughlin  <mark@skynet.ie>
 
+	* configure.in: Version 2.8.0.1.
+
+2004-09-14  Mark McLoughlin  <mark@skynet.ie>
+
+	* autogen.sh: use automake 1.7 and run gtkdocize.
+	
+	* configure.in: check for glib-genmarshal and use 
+	GTK_DOC_CHECK.
+	
+	* Makefile.am: add --enable-gtk-doc to 
+	DISTCHECK_CONFIGURE_FLAGS.
+	
+	* gconf/Makefile.am: re-do how the marshallers
+	are generated.
+	
+	* doc/gconf/Makefile.am: use gtk-doc.make.
+
+	* doc/gconf/gconf.sgml: tweak to validate.
+
+	* backends/Makefile.am: make xml-test link
+	against the backend rather than rebuilding
+	the sources.
+
+	* gconf-2.m4.in: rename from gconf.m4.in.
+
+2004-09-13  Mark McLoughlin  <mark@skynet.ie>
+
 	* configure.in: post-release bump to 2.8.1.
 
 ==================== 2.8.0 ====================
diff --git a/Makefile.am b/Makefile.am
index 27bf1dbc..fcdac65a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,12 +2,19 @@
 SUBDIRS = gconf backends po doc examples
 DIST_SUBDIRS=tests $(SUBDIRS)
 
-EXTRA_DIST=gconf.m4.in TODO \
-	   gconf-2.0.pc.in
+EXTRA_DIST =            \
+	gconf-2.m4.in   \
+	TODO            \
+	gconf-2.0.pc.in \
+	gtk-doc.make
+
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+DISTCLEANFILES =                \
+	intltool-extract        \
+	intltool-merge          \
+	intltool-update
 
 install-data-local:
-	-mkdir -p $(DESTDIR)$(datadir)/aclocal
-	$(INSTALL_DATA) gconf.m4 $(DESTDIR)$(datadir)/aclocal/gconf-$(MAJOR_VERSION).m4
 	-mkdir -p $(DESTDIR)$(sysgconfdir)/gconf.xml.defaults
 	-chmod 755 $(DESTDIR)$(sysgconfdir)/gconf.xml.defaults
 	-mkdir -p $(DESTDIR)$(sysgconfdir)/gconf.xml.mandatory
@@ -16,5 +23,8 @@ install-data-local:
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gconf-2.0.pc
 
+aclocaldir = $(datadir)/aclocal
+aclocal_DATA = gconf-2.m4
+
 install-schemas:
 	(cd standard-schemas && $(MAKE) $(AM_MAKEFLAGS) install-schemas)
diff --git a/NEWS b/NEWS
index b4c26b42..afb556fa 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+2.8.1
+=====
+
+ Fixes
+
+  - Use automake 1.7 (Mark)
+  - Always ship the API docs html in the tarball (Mark)
+
 2.8.0
 =====
 
diff --git a/autogen.sh b/autogen.sh
index cf831820..eae9d8e7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -16,12 +16,12 @@ DIE=0
 	echo
 	echo "You must have autoconf installed to compile $PROJECT."
 	echo "Download the appropriate package for your distribution,"
-	echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
+	echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
 	DIE=1
 }
 
-AUTOMAKE=automake-1.4
-ACLOCAL=aclocal-1.4
+AUTOMAKE=automake-1.7
+ACLOCAL=aclocal-1.7
 
 ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
         AUTOMAKE=automake
@@ -30,9 +30,9 @@ ACLOCAL=aclocal-1.4
 
 ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || {
 	echo
-	echo "You must have automake installed to compile $PROJECT."
-	echo "Get ftp://sourceware.cygnus.com/pub/automake/automake-1.4.tar.gz"
-	echo "(or a newer version if it is available)"
+	echo "You must have $AUTOMAKE installed to compile $PROJECT."
+	echo "Download the appropriate package for your distribution,"
+	echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/"
 	DIE=1
 }
 
@@ -55,6 +55,14 @@ grep "^AM_GLIB_GNU_GETTEXT" configure.in >/dev/null && {
   }
 }
 
+(grep "^GTK_DOC_CHECK" configure.in >/dev/null) && {
+  (gtkdocize --version) < /dev/null > /dev/null 2>&1 || {
+    echo
+    echo "**Error**: You must have \`gtk-doc' installed to compile $PROJECT."
+    DIE=1
+  }
+}
+
 if test "$DIE" -eq 1; then
 	exit 1
 fi
@@ -122,6 +130,10 @@ do
 	echo "Running libtoolize..."
 	libtoolize --force --copy
       fi
+      if grep "^GTK_DOC_CHECK" configure.in >/dev/null; then
+	echo "Running gtkdocize..."
+	gtkdocize
+      fi
       echo "Running $ACLOCAL $aclocalinclude ..."
       $ACLOCAL $aclocalinclude
       if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
diff --git a/backends/Makefile.am b/backends/Makefile.am
index 33045c8b..92cf6853 100644
--- a/backends/Makefile.am
+++ b/backends/Makefile.am
@@ -28,8 +28,11 @@ libgconfbackend_xml_la_LIBADD  = $(DEPENDENT_LIBS) $(top_builddir)/gconf/libgcon
 
 noinst_PROGRAMS = xml-test
 
-xml_test_SOURCES= $(libgconfbackend_oldxml_la_SOURCES) xml-test.c
-xml_test_LDADD = $(DEPENDENT_WITH_XML_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la
+xml_test_SOURCES= xml-test.c
+xml_test_LDADD = \
+	$(DEPENDENT_WITH_XML_LIBS) \
+	$(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la \
+	$(top_builddir)/backends/libgconfbackend-oldxml.la
 
 bin_PROGRAMS = gconf-merge-tree
 gconf_merge_tree_SOURCES = gconf-merge-tree.c
diff --git a/configure.in b/configure.in
index 14f02489..8c898634 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ AC_INIT(gconf/gconf.h)
 
 AM_CONFIG_HEADER(config.h)
 
-AM_INIT_AUTOMAKE(GConf, 2.8.1)
+AM_INIT_AUTOMAKE(GConf, 2.8.0.1)
 
 AM_MAINTAINER_MODE
 
@@ -16,6 +16,7 @@ AC_HEADER_STDC
 AC_ARG_PROGRAM
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
+AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 
 changequote(,)dnl
 if test "x$GCC" = "xyes"; then
@@ -128,63 +129,7 @@ else
   fi
 fi
 
-AC_ARG_WITH(html-dir, [  --with-html-dir=PATH path to installed docs ])
-
-if test "x$with_html_dir" = "x" ; then
-  HTML_DIR='${datadir}/gtk-doc/html'
-else
-  HTML_DIR=$with_html_dir
-fi
-
-AC_SUBST(HTML_DIR)
-
-
-AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)
-
-gtk_doc_min_version=0.6
-if $GTKDOC ; then 
-    gtk_doc_version=`gtkdoc-mkdb --version`
-    AC_MSG_CHECKING([gtk-doc version ($gtk_doc_version) >= $gtk_doc_min_version])
-
-    IFS="${IFS= 	}"; gconf_save_IFS="$IFS"; IFS="."
-    set $gtk_doc_version
-    for min in $gtk_doc_min_version ; do
-        cur=$1; shift
-        if test -z $min ; then break; fi
-        if test -z $cur ; then GTKDOC=false; break; fi
-        if test $cur -gt $min ; then break ; fi
-        if test $cur -lt $min ; then GTKDOC=false; break ; fi
-    done
-    IFS="$gconf_save_IFS"
-
-    if $GTKDOC ; then
-      AC_MSG_RESULT(yes)
-    else
-      AC_MSG_RESULT(no)
-    fi
-fi
-
-AM_CONDITIONAL(HAVE_GTK_DOC, $GTKDOC)
-AC_SUBST(HAVE_GTK_DOC)
-
-AC_CHECK_PROG(DB2HTML, db2html, true, false)
-AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
-
-dnl Let people disable the gtk-doc stuff.
-AC_ARG_ENABLE(gtk-doc, [  --enable-gtk-doc  Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)
-
-if test x$enable_gtk_doc = xauto ; then
-  if test x$GTKDOC = xtrue ; then
-    enable_gtk_doc=yes
-  else
-    enable_gtk_doc=no 
-  fi
-fi
-
-dnl NOTE: We need to use a separate automake conditional for this
-dnl       to make this work with the tarballs.
-AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-
+GTK_DOC_CHECK([1.0])
 
 AC_ARG_ENABLE(gtk, [  --enable-gtk          Enable GTK+ support (for gconf-sanity-check) [default=auto]], enable_gtk="$enableval", enable_gtk=auto)
 
@@ -289,7 +234,7 @@ AC_SUBST(REBUILD)
 
 AC_OUTPUT([
 Makefile
-gconf.m4
+gconf-2.m4
 gconf/Makefile
 gconf/default.path
 backends/Makefile
diff --git a/doc/gconf/Makefile.am b/doc/gconf/Makefile.am
index d04ab793..246038d9 100644
--- a/doc/gconf/Makefile.am
+++ b/doc/gconf/Makefile.am
@@ -1,10 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 
+AUTOMAKE_OPTIONS = 1.6
+
 # The name of the module.
 DOC_MODULE=gconf
 
 # The top-level SGML file.
-DOC_MAIN_SGML_FILE=gconf.sgml
+DOC_MAIN_SGML_FILE=gconf-docs.sgml
 
 # The directory containing the source code. Relative to $(srcdir)
 DOC_SOURCE_DIR=../../gconf
@@ -43,137 +45,6 @@ GTKDOC_CFLAGS = -I$(top_srcdir) $(CFLAGS) $(DEPENDENT_CFLAGS)
 
 GTKDOC_LIBS = $(LDFLAGS) $(DEPENDENT_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la
 
-GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
-GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)
-
-
-####################################
-# Everything below here is generic #
-####################################
-
-# We set GPATH here; this gives us semantics for GNU make
-# which are more like other make's VPATH, when it comes to
-# whether a source that is a target of one rule is then
-# searched for in VPATH/GPATH.
-#
-GPATH = $(srcdir)
-
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-
-EXTRA_DIST = 				\
-	$(content_files)		\
-	$(extra_files)			\
-	$(HTML_IMAGES)			\
-	$(DOC_MAIN_SGML_FILE)		\
-	$(DOC_MODULE).types		\
-	$(DOC_MODULE)-sections.txt	\
-	$(DOC_MODULE)-overrides.txt
-
-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
-
-SCANOBJ_FILES = 		\
-	$(DOC_MODULE).args 	\
-	$(DOC_MODULE).hierarchy \
-	$(DOC_MODULE).signals
-
-if ENABLE_GTK_DOC
-all-local: html-build.stamp
-
-#### scan ####
-
-scan-build.stamp: $(HFILE_GLOB)
-	@echo '*** Scanning header files ***'
-	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) $(OBJSCAN_OPTIONS); \
-	else \
-	    cd $(srcdir) ; \
-	    for i in $(SCANOBJ_FILES) ; do \
-               test -f $$i || touch $$i ; \
-	    done \
-	fi
-	cd $(srcdir) && \
-	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
-	touch scan-build.stamp
-
-$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
-	@true
-
-#### templates ####
-
-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	@echo '*** Rebuilding template files ***'
-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
-	touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
-	@true
-
-#### sgml ####
-
-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
-	@echo '*** Building SGML ***'
-	cd $(srcdir) && \
-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) 
-	touch sgml-build.stamp
-
-sgml.stamp: sgml-build.stamp
-	@true
-
-#### html ####
-
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo '*** Building HTML ***'
-	rm -rf $(srcdir)/html 
-	mkdir $(srcdir)/html
-	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-	@echo '-- Fixing Crossreferences' 
-	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-	touch html-build.stamp
-endif
-
-##############
-
-clean-local:
-	rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS)
-
-maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
-install-data-local:
-	installfiles=`echo $(srcdir)/html/*`; \
-	if test "$$installfiles" = '$(srcdir)/html/*'; \
-	then echo '-- Nothing to install' ; \
-	else \
-	  $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
-	  for i in $$installfiles; do \
-	    echo '-- Installing '$$i ; \
-	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
-	  done; \
-	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
-	fi
-
-#
-# Require gtk-doc when making dist
-#
-if ENABLE_GTK_DOC
-dist-check-gtkdoc:
-else
-dist-check-gtkdoc:
-	@echo "*** gtk-doc must be installed and enabled in order to make dist"
-	@false
-endif
-
-dist-hook: dist-check-gtkdoc dist-hook-local
-	mkdir $(distdir)/tmpl
-	mkdir $(distdir)/xml
-	mkdir $(distdir)/html
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/xml/*.xml $(distdir)/xml
-	-cp $(srcdir)/html/* $(distdir)/html
+include $(top_srcdir)/gtk-doc.make
 
 .PHONY : dist-hook-local
-
-
diff --git a/doc/gconf/gconf.sgml b/doc/gconf/gconf.sgml
index b672b927..4ea7c87b 100644
--- a/doc/gconf/gconf.sgml
+++ b/doc/gconf/gconf.sgml
@@ -1,6 +1,6 @@
-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
 <!ENTITY GConfClient SYSTEM "xml/gconf-client.xml">
 <!ENTITY gconf-gconf-backend SYSTEM "xml/gconf-backend.xml">
 <!ENTITY gconf-gconf-engine SYSTEM "xml/gconf-engine.xml">
diff --git a/gconf.m4.in b/gconf.m4.in
deleted file mode 100644
index 088c93f9..00000000
--- a/gconf.m4.in
+++ /dev/null
@@ -1,40 +0,0 @@
-dnl AM_GCONF_SOURCE_2
-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-dnl  (i.e. pass to gconftool-2
-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
-dnl  you should install foo.schemas files
-dnl
-
-AC_DEFUN([AM_GCONF_SOURCE_2],
-[
-  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  else
-    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-  fi
-
-  AC_ARG_WITH(gconf-source, 
-  [  --with-gconf-source=sourceaddress      Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
-
-  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-
-  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-  fi
-
-  AC_ARG_WITH(gconf-schema-file-dir, 
-  [  --with-gconf-schema-file-dir=dir        Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
-
-  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-
-  AC_ARG_ENABLE(schemas-install,
-     [  --disable-schemas-install	Disable the schemas installation],
-     [case "${enableval}" in
-       yes) schemas_install=true ;;
-       no)  schemas_install=false ;;
-       *) AC_MSG_ERROR(bad value ${enableval} for --disable-schemas-install) ;;
-     esac],[schemas_install=true])
-     AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, test x$schemas_install = xtrue)
-])
diff --git a/gconf/Makefile.am b/gconf/Makefile.am
index 28cae360..fe102db2 100644
--- a/gconf/Makefile.am
+++ b/gconf/Makefile.am
@@ -35,20 +35,14 @@ libexec_PROGRAMS = gconfd-2 $(SANITY_CHECK)
 
 CORBA_SOURCECODE = GConfX-common.c GConfX-skels.c GConfX-stubs.c GConfX.h
 
-## not BUILT_SOURCES which seems to make a mess. fix with automake 1.5?
-built_sourcecode = 			\
+BUILT_SOURCES = 			\
 	$(CORBA_SOURCECODE)		\
 	gconfmarshal.h			\
 	gconfmarshal.c
 
 $(libgconf_2_la_OBJECTS) $(gconftool_2_OBJECTS) $(gconfd_2_OBJECTS): $(built_sourcecode)
 
-CLEANFILES = \
-	$(built_sourcecode)	\
-	stamp-gconfmarshal.h	\
-	stamp-gconfmarshal.c	\
-	stamp-gconfmarshal.h    \
-	stamp-gconfmarshal.c
+CLEANFILES = $(BUILT_SOURCES)
 
 dist-hook:
 	cd $(distdir) ; rm -f $(CLEANFILES)
@@ -122,28 +116,19 @@ libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS)
 EXTRA_DIST=GConfX.idl default.path.in gconfmarshal.list regenerate-enum-header.sh regenerate-enum-footer.sh
 
 install-data-local:
-	-mkdir -p $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)
+	$(mkinstalldirs) $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)
 	$(INSTALL_DATA) default.path $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path
 
-gconfmarshal.h: @REBUILD@ stamp-gconfmarshal.h
-	@true
+uninstall-local:
+	rm -f $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path
 
-gconfmarshal.c: @REBUILD@ stamp-gconfmarshal.c
-	@true
+gconfmarshal.h: gconfmarshal.list $(GLIB_GENMARSHAL)
+	$(GLIB_GENMARSHAL) $< --header --prefix=gconf_marshal > $@
 
-stamp-gconfmarshal.h: @REBUILD@ gconfmarshal.list
-	cd $(srcdir) \
-	&& glib-genmarshal --prefix=gconf_marshal gconfmarshal.list --header >> xgen-gmh \
-	&& (cmp -s xgen-gmh gconfmarshal.h || cp xgen-gmh gconfmarshal.h) \
-	&& rm -f xgen-gmh xgen-gmh~
-
-stamp-gconfmarshal.c: @REBUILD@ gconfmarshal.list
-	cd $(srcdir) \
-	&& glib-genmarshal --prefix=gconf_marshal gconfmarshal.list --body >> xgen-gmc \
-	&& (cmp -s xgen-gmc gconfmarshal.c || cp xgen-gmc gconfmarshal.c) \
-	&& rm -f xgen-gmc xgen-gmc~
+gconfmarshal.c: gconfmarshal.list $(GLIB_GENMARSHAL)
+	echo "#include \"gconfmarshal.h\"" > $@ && \
+	$(GLIB_GENMARSHAL) $< --body --prefix=gconf_marshal >> $@
 
 regenerate-built-sources:
 	GCONF_SRCDIR=$(srcdir) $(srcdir)/regenerate-enum-header.sh $(gconf_headers)
 	GCONF_SRCDIR=$(srcdir) $(srcdir)/regenerate-enum-footer.sh $(gconf_headers)
-