[gtk-doc] make: stop using a wildcard for the setup files

[Stefan Kost <stefkost src gnome org>]

commit 514c524ffda9d316d054143d36bd559b3e417034
Author: Stefan Kost <ensonic users sf net>
Date:   Mon Jan 31 22:46:45 2011 +0200

    make: stop using a wildcard for the setup files
    
    Use an explicit list. With the wildcar we e.g. also copy gio-xxx.1 in glib
    and breaking the build as the file would be already present. Properly clean
    all copied files using the new list var.

 gtk-doc.make        |   14 ++++++++------
 gtk-doc.notmpl.make |   14 ++++++++------
 2 files changed, 16 insertions(+), 12 deletions(-)
---
diff --git a/gtk-doc.make b/gtk-doc.make
index 58053a4..03af177 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -23,13 +23,16 @@ GPATH = $(srcdir)
 
 TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
 
-EXTRA_DIST = 				\
+SETUP_FILES = \
 	$(content_files)		\
 	$(HTML_IMAGES)			\
 	$(DOC_MAIN_SGML_FILE)		\
 	$(DOC_MODULE)-sections.txt	\
 	$(DOC_MODULE)-overrides.txt
 
+EXTRA_DIST = 				\
+	$(SETUP_FILES)
+
 DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
 	html-build.stamp pdf-build.stamp \
 	setup.stamp tmpl.stamp sgml.stamp html.stamp pdf.stamp
@@ -73,10 +76,9 @@ $(REPORT_FILES): sgml-build.stamp
 
 setup-build.stamp::
 	- if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	   cp -r $(abs_srcdir)/$(DOC_MAIN_SGML_FILE) $(abs_builddir)/; \
-	   cp -r $(abs_srcdir)/$(DOC_MODULE)* $(abs_builddir)/; \
-	   if test "x$(content_files) $(expand_content_files)" != "x" ; then \
-	       for file in $(content_files) $(expand_content_files) ; do \
+	   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)/; \
 	       done \
@@ -182,7 +184,7 @@ distclean-local:
 	rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
 	    $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
 	if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	    rm -f $(DOC_MAIN_SGML_FILE) $(DOC_MODULE)*; \
+	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
 	fi
 
 maintainer-clean-local: clean
diff --git a/gtk-doc.notmpl.make b/gtk-doc.notmpl.make
index 937f7bc..d0b893a 100644
--- a/gtk-doc.notmpl.make
+++ b/gtk-doc.notmpl.make
@@ -23,13 +23,16 @@ GPATH = $(srcdir)
 
 TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
 
-EXTRA_DIST = 				\
+SETUP_FILES = \
 	$(content_files)		\
 	$(HTML_IMAGES)			\
 	$(DOC_MAIN_SGML_FILE)		\
 	$(DOC_MODULE)-sections.txt	\
 	$(DOC_MODULE)-overrides.txt
 
+EXTRA_DIST = 				\
+	$(SETUP_FILES)
+
 DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \
 	html-build.stamp pdf-build.stamp \
 	setup.stamp sgml.stamp html.stamp pdf.stamp
@@ -73,10 +76,9 @@ $(REPORT_FILES): sgml-build.stamp
 
 setup-build.stamp::
 	- if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
-	   cp -r $(abs_srcdir)/$(DOC_MAIN_SGML_FILE) $(abs_builddir)/; \
-	   cp -r $(abs_srcdir)/$(DOC_MODULE)* $(abs_builddir)/; \
-	   if test "x$(content_files) $(expand_content_files)" != "x" ; then \
-	       for file in $(content_files) $(expand_content_files) ; do \
+	   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)/; \
 	       done \
@@ -168,7 +170,7 @@ distclean-local:
 	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 $(DOC_MAIN_SGML_FILE) $(DOC_MODULE)*; \
+	    rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
 	fi
 
 maintainer-clean-local: clean