[gtk-doc] make: fix leftover files in build-dir.

[Stefan Kost <stefkost src gnome org>]

commit 2347c227868cd1d08cad681d9fc531db22ce2bd7
Author: Stefan Kost <ensonic users sf net>
Date:   Wed Feb 2 23:35:21 2011 +0200

    make: fix leftover files in build-dir.
    
    Especially in the tmpl build case we build in builddir, but we need to copy
    the files back to allow them to be checked in.

 gtk-doc.make        |   15 ++++++++++++---
 gtk-doc.notmpl.make |    5 +++--
 2 files changed, 15 insertions(+), 5 deletions(-)
---
diff --git a/gtk-doc.make b/gtk-doc.make
index 71c1965..eb042f9 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -76,13 +76,16 @@ $(REPORT_FILES): sgml-build.stamp
 
 setup-build.stamp:
 	- if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	   echo 'gtk-doc: Preparing build'; \
 	   files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
 	   if test "x$$files" != "x" ; then \
 	       for file in $$files ; do \
 	           test -f $(abs_srcdir)/$$file && \
-	               cp -r $(abs_srcdir)/$$file $(abs_builddir)/; \
+	               cp -p $(abs_srcdir)/$$file $(abs_builddir)/; \
 	       done \
-	   fi \
+	   fi; \
+	   test -f $(abs_srcdir)/tmpl && \
+	       cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
 	fi
 	@touch setup-build.stamp
 
@@ -117,6 +120,11 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)
 tmpl-build.stamp: setup.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
 	@echo 'gtk-doc: Rebuilding template files'
 	@gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+	@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	  if test -w $(abs_srcdir) ; then \
+	    cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
+	  fi \
+	fi
 	@touch tmpl-build.stamp
 
 tmpl.stamp: tmpl-build.stamp
@@ -182,10 +190,11 @@ clean-local:
 	rm -rf .libs
 
 distclean-local:
-	rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
+	rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
 	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
 	if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
 	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
+	    rm -rf tmpl; \
 	fi
 
 maintainer-clean-local: clean
diff --git a/gtk-doc.notmpl.make b/gtk-doc.notmpl.make
index b88229e..e01c4fc 100644
--- a/gtk-doc.notmpl.make
+++ b/gtk-doc.notmpl.make
@@ -76,11 +76,12 @@ $(REPORT_FILES): sgml-build.stamp
 
 setup-build.stamp:
 	- if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+	   echo 'gtk-doc: Preparing build'; \
 	   files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
 	   if test "x$$files" != "x" ; then \
 	       for file in $$files ; do \
 	           test -f $(abs_srcdir)/$$file && \
-	               cp -r $(abs_srcdir)/$$file $(abs_builddir)/; \
+	               cp -p $(abs_srcdir)/$$file $(abs_builddir)/; \
 	       done \
 	   fi \
 	fi
@@ -175,7 +176,7 @@ distclean-local:
 	fi
 
 maintainer-clean-local: clean
-	rm -rf html
+	rm -rf xml html
 
 install-data-local:
 	@installfiles=`echo $(builddir)/html/*`; \