svn commit: samba-docs r455 - in trunk: .

[jelmer at samba.org]

Author: jelmer
Date: 2005-03-29 19:24:12 +0000 (Tue, 29 Mar 2005)
New Revision: 455

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=455

Log:
Force update of XML files if one of its include files changes
avoid rebuilding dependency files for "make clobber" 

Modified:
   trunk/Makefile


Changeset:
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2005-03-29 18:30:32 UTC (rev 454)
+++ trunk/Makefile	2005-03-29 19:24:12 UTC (rev 455)
@@ -39,9 +39,9 @@
 	@echo " samples - Extract examples"
 	@echo " files - Extract other files"
 
-Samba-Guide/index.xml: $(subst Samba-Guide/index.xml,,$(wildcard Samba-Guide/*.xml))
-Samba-HOWTO-Collection/index.xml: $(subst Samba-HOWTO-Collection/index.xml,,$(wildcard Samba-HOWTO-Collection/*.xml)) Samba-HOWTO-Collection-attributions.xml
-Samba-Developers-Guide/index.xml: $(subst Samba-Developers-Guide/index.xml,,$(wildcard Samba-Developers-Guide/*.xml)) Samba-Developers-Guide-attributions.xml
+$(DOCBOOKDIR)/Samba-Guide.xml: $(filter-out Samba-Guide/index.xml,$(wildcard Samba-Guide/*.xml))
+$(DOCBOOKDIR)/Samba-HOWTO-Collection.xml: $(filter-out Samba-HOWTO-Collection/index.xml,$(wildcard Samba-HOWTO-Collection/*.xml)) Samba-HOWTO-Collection-attributions.xml
+$(DOCBOOKDIR)/Samba-Developers-Guide.xml: $(filter-out Samba-Developers-Guide/index.xml,$(wildcard Samba-Developers-Guide/*.xml)) Samba-Developers-Guide-attributions.xml
 
 # Pseudo targets 
 all: $(TARGETS)
@@ -70,7 +70,7 @@
 validate: $(addsuffix -validate,$(MAIN_DOCS))
 
 # Intermediate docbook docs
-
+#
 $(DOCBOOKDIR)/%.xml: %/index.xml xslt/expand-sambadoc.xsl
 	mkdir -p $(@D)
 	$(XSLTPROC) --stringparam latex.imagebasedir "$*/" --stringparam noreference 1 --xinclude --output $@ xslt/expand-sambadoc.xsl $<
@@ -164,9 +164,11 @@
 	@echo "$*-images-htmlhelp: \$$(addprefix \$$(HTMLHELPDIR)/$*/, \$$($*-images-html))" >> $@
 	@echo "	touch \$$@" >> $@
 
-ifdef OUTPUTDIR
+ifdef OUTPUTDIR 
+ifneq ($(MAKECMDGOALS),clobber)
 include $(addsuffix .d,$(MAIN_DOCS))
 endif
+endif
 
 # Adobe PDF files
 %.pdf: %.tex %.ind latexfigures %-images-latex-png