From fc5cdba1600fd3e0df7cef8273546d97e6c8f99f Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 29 Mar 2005 19:24:12 +0000 Subject: Force update of XML files if one of its include files changes avoid rebuilding dependency files for "make clobber" (This used to be commit f4901df3d3f2f69390cc807248ac103ce883d26d) --- docs/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'docs') diff --git a/docs/Makefile b/docs/Makefile index 1a9ac767ea..344c01d015 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -39,9 +39,9 @@ help: @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 @@ htmlhelp: $(addprefix $(HTMLHELPDIR)/,$(MAIN_DOCS)) 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 @@ $(PDFDIR)/%.pdf: %.pdf @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 -- cgit