summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-03-29 19:24:12 +0000
committerGerald W. Carter <jerry@samba.org>2008-04-23 08:46:24 -0500
commitfc5cdba1600fd3e0df7cef8273546d97e6c8f99f (patch)
tree37c96652eb94468a2f974ee831937027fa2aea36
parentb8909f658f5b7bc9b702173fb236c445b6e5d1f2 (diff)
downloadsamba-fc5cdba1600fd3e0df7cef8273546d97e6c8f99f.tar.gz
samba-fc5cdba1600fd3e0df7cef8273546d97e6c8f99f.tar.bz2
samba-fc5cdba1600fd3e0df7cef8273546d97e6c8f99f.zip
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)
-rw-r--r--docs/Makefile12
1 files changed, 7 insertions, 5 deletions
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