git.samba.org / abartlet / samba.git / .git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
tsocket/bsd: fix do_bind logic for AF_INET
[abartlet/samba.git/.git] / docs-xml / Makefile
diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 68890306ed6250474a1f253c5af7575b83641ad5..40a6c7b6102a1effba506eb357508b35c989c903 100644 (file)
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -40,11 +40,11 @@ help:
        @echo " undocumented - Output list of undocumented smb.conf options"
        @echo " samples - Extract examples"
 
-$(DOCBOOKDIR)/Samba3-ByExample.xml: $(filter-out Samba3-ByExample/index.xml,$(wildcard Samba3-ByExample/*.xml))
-$(DOCBOOKDIR)/Samba3-HOWTO.xml: $(filter-out Samba3-HOWTO/index.xml,$(wildcard Samba3-HOWTO/*.xml)) Samba3-HOWTO-attributions.xml
+$(PDFDIR)/Samba3-ByExample.pdf $(PSDIR)/Samba3-ByExample.ps $(DOCBOOKDIR)/Samba3-ByExample.xml Samba3-ByExample.tex: $(wildcard Samba3-ByExample/*.xml)
+$(PDFDIR)/Samba3-HOWTO.pdf $(PSDIR)/Samba3-HOWTO.ps Samba3-HOWTO.tex $(DOCBOOKDIR)/Samba3-HOWTO.xml: $(wildcard Samba3-HOWTO/*.xml) Samba3-HOWTO-attributions.xml
 Samba3-HOWTO/manpages.xml: $(MANPAGEDIR3)/smb.conf.5.xml
-$(DOCBOOKDIR)/Samba3-Developers-Guide.xml: $(filter-out Samba3-Developers-Guide/index.xml,$(wildcard Samba3-Developers-Guide/*.xml)) Samba3-Developers-Guide-attributions.xml
-$(DOCBOOKDIR)/Samba4-HOWTO.xml: $(filter-out Samba4-HOWTO/index.xml,$(wildcard Samba4-HOWTO/*.xml)) Samba4-HOWTO-attributions.xml
+$(PDFDIR)/Samba3-Developers-Guide.pdf $(PSDIR)/Samba3-Developers-Guide.ps $(DOCBOOKDIR)/Samba3-Developers-Guide.xml Samba3-Developers-Guide.tex: $(wildcard Samba3-Developers-Guide/*.xml) Samba3-Developers-Guide-attributions.xml
+$(PDFDIR)/Samba4-HOWTO.pdf $(PSDIR)/Samba4-HOWTO.ps Samba4-HOWTO.tex $(DOCBOOKDIR)/Samba4-HOWTO.xml: $(filter-out Samba4-HOWTO/index.xml,$(wildcard Samba4-HOWTO/*.xml)) Samba4-HOWTO-attributions.xml
 
 # Pseudo targets 
 all:: $(TARGETS)
@@ -53,23 +53,17 @@ release:: manpages3 htmlman3 html pdf
 clean::
        @echo "Cleaning up..." 
        rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)
-       rm -f $(patsubst %.svg,%.png,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \
-                       $(patsubst %.svg,%.pdf,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
-                       $(patsubst %.svg,%.eps,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
-                       $(patsubst %.svg,%.png,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg)))
-       rm -f *-attributions.xml *.d *.tpt *.tex *.loc *.toc *.lof *.glo *.idx *.aux
-       rm -f *-images-html*
-       rm -f *-images-latex-* $(LATEX_FIGURES)
-       rm -f xslt/figures/*pdf
+       rm -f $(patsubst %.svg,%.png,$(wildcard */images/*.svg)) \
+                 $(patsubst %.svg,%.eps,$(wildcard */images/*.svg)) \
+                 $(patsubst %.png,%.eps,$(wildcard */images/*.png))
+       rm -f *-attributions.xml
        rm -f $(SMBDOTCONFDOC)/parameters.*.xml
-       rm -f $(addsuffix .*,$(MAIN_DOCS))
        rm -f build/catalog.xml
 
 # Output format targets
 pdf:: $(patsubst %,$(PDFDIR)/%.pdf,$(MAIN_DOCS))
 ps:: $(patsubst %,$(PSDIR)/%.ps,$(MAIN_DOCS))
 txt:: $(patsubst %,$(TXTDIR)/%.txt,$(MAIN_DOCS))
-txt-chunks:: $(addsuffix -txt-chunks,$(MAIN_DOCS))
 tex:: $(addsuffix .tex,$(MAIN_DOCS))
 texi:: $(patsubst %,$(TEXINFODIR)/%.texi,$(MAIN_DOCS))
 texiinfo:: $(patsubst %,$(TEXINFODIR)/%.info,$(MAIN_DOCS))
@@ -110,7 +104,7 @@ $(HTMLDIR)/index.html: htmldocs.html
        @mkdir -p $(@D)
        cp $< $@
        
-$(HTMLDIR)/%/index.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/%/samba.css xslt/html-chunk.xsl %-images-html-chunks
+$(HTMLDIR)/%/index.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/%/samba.css xslt/html-chunk.xsl
        @mkdir -p $(@D)
        $(XSLTPROC) --stringparam base.dir "$(HTMLDIR)/$*/" xslt/html-chunk.xsl $<
 
@@ -119,7 +113,16 @@ $(OUTPUTDIR)/%/samba.css: xslt/html/samba.css
        @mkdir -p $(@D)
        cp $< $@
 
-$(patsubst %,$(HTMLDIR)/%.html,$(MAIN_DOCS)): $(HTMLDIR)/%.html: %-images-html-single
+$(patsubst %,$(HTMLDIR)/%.html,$(MAIN_DOCS)): $(HTMLDIR)/%.html: %-images-png
+
+define IMAGES_TEMPLATE
+$(1)-images-png:: $$(patsubst %.svg,%.png,$$(wildcard $(1)/images/*.svg)) ;
+$(1)-images-eps:: $$(patsubst %.svg,%.eps,$$(wildcard $(1)/images/*.svg)) ;
+$(1)-images-eps:: $$(patsubst %.png,%.eps,$$(wildcard $(1)/images/*.png)) ;
+
+endef
+
+$(eval $(foreach DOC, $(MAIN_DOCS),$(call IMAGES_TEMPLATE,$(DOC))))
 
 $(HTMLDIR)/%.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/samba.css xslt/html.xsl 
        $(XSLTPROC) --output $@ xslt/html.xsl $<
@@ -141,62 +144,24 @@ $(TXTDIR)/%.txt: $(HTMLDIR)/%.html
        @mkdir -p $(@D)
        @$(DBLATEX) $(DBLATEX_OPTIONS) -t tex -o $@ $<
 
-# Dependency files
-%.d: $(DOCBOOKDIR)/%.xml xslt/generate-dependencies.xsl
-       @echo "Generating dependency file for $*" 
-       @$(XSLTPROC) --novalid \
-               --stringparam txtbasedir "$(TXTDIR)/$*/" \
-               --stringparam target "$*" \
-               -o $@ xslt/generate-dependencies.xsl $<
-       @echo "$*-images-latex-svg = \$$(wildcard \$$(addsuffix .svg, \$$($*-images-latex)))" >> $@
-       @echo "$*-images-latex-eps: \$$(addsuffix .eps, \$$($*-images-latex))" >> $@
-       @echo "$*-images-latex-pdf: \$$(patsubst %.svg, %.pdf, \$$($*-images-latex-svg))" >> $@
-       @echo "$*-images-latex-png: \$$(filter-out \$$(patsubst %.svg,%.png,\$$($*-images-latex-svg)), \$$(addsuffix .png, \$$($*-images-latex)))" >> $@
-
-       @echo >> $@
-       @echo "\$$(HTMLDIR)/%: $*/%" >> $@
-       @echo " @mkdir -p \$$(@D)" >> $@
-       @echo " @cp \$$< \$$@" >> $@
-       @echo >> $@
-       @echo "\$$(HTMLDIR)/$*/%: $*/%" >> $@
-       @echo " @mkdir -p \$$(@D)" >> $@
-       @echo " @cp \$$< \$$@" >> $@
-       @echo >> $@
-       @echo "\$$(HTMLHELPDIR)/$*/%: $*/%" >> $@
-       @echo " @mkdir -p \$$(@D)" >> $@
-       @echo " @cp \$$< \$$@" >> $@
-       @echo >> $@
-       @echo "$*-images-html-single: \$$(addprefix \$$(HTMLDIR)/, \$$($*-images-html))" >> $@
-       @echo "$*-images-html-chunks: \$$(addprefix \$$(HTMLDIR)/$*/, \$$($*-images-html))" >> $@
-       @echo "$*-images-htmlhelp: \$$(addprefix \$$(HTMLHELPDIR)/$*/, \$$($*-images-html))" >> $@
-
-ifdef OUTPUTDIR 
-ifneq ($(MAKECMDGOALS),clobber)
--include $(addsuffix .d,$(MAIN_DOCS))
-endif
-endif
-
 # Adobe PDF files  
-$(PDFDIR)/%.pdf: %/index.xml $(PDFDIR) xslt/latex.xsl %-images-latex-png %-images-latex-pdf
+$(PDFDIR)/%.pdf: %/index.xml $(PDFDIR) xslt/latex.xsl %-images-png
        $(DBLATEX) $(DBLATEX_OPTIONS) -I $*/images -t pdf -o $@ $<
 
 # PostScript files
-$(PSDIR)/%.ps: %/index.xml $(PSDIR) xslt/latex.xsl %-images-latex-eps
+$(PSDIR)/%.ps: %/index.xml $(PSDIR) xslt/latex.xsl %-images-eps 
        $(DBLATEX) $(DBLATEX_OPTIONS) -I $*/images -t ps -o $@ $<
 
 %.eps: %.svg
-       $(INKSCAPE) -z -f $< --export-eps=$@
+       $(INKSCAPE) -z -f $(abspath $<) --export-eps=$(abspath $@)
 
 %.png: %.svg
-       $(INKSCAPE) -z -f $< --export-png=$@
-
-%.pdf: %.eps
-       $(EPSTOPDF) $<
+       $(INKSCAPE) -z -f $(abspath $<) --export-png=$(abspath $@)
 
 %.eps: %.png
        $(PNGTOPNM) $< | $(PNMTOPS) > $@
 
-$(HTMLHELPDIR)/%: $(DOCBOOKDIR)/%.xml %-images-htmlhelp
+$(HTMLHELPDIR)/%: $(DOCBOOKDIR)/%.xml %-images-png
        $(XSLTPROC) --stringparam htmlhelp.chm $*.chm \
                                --stringparam manifest.in.base.dir "$@/" \
                                --stringparam base.dir "$@/" \
@@ -275,11 +240,6 @@ archive: pdf
 # XSL scripts
 xslt/html.xsl: xslt/html-common.xsl 
 xslt/html-chunk.xsl: xslt/html-common.xsl 
-xslt/latex.xsl: 
-xslt/expand-sambadoc.xsl: 
-xslt/generate-attributions.xsl: 
-xslt/man.xsl:
-xslt/pearson.xsl:
 
 distclean clobber:: clean
        rm -f Makefile.settings config.status config.log
@@ -287,6 +247,7 @@ distclean clobber:: clean
 realdistclean:: distclean
        rm -f configure
        rm -rf autom4te.cache
+       rm -rf output
 
 # Always keep intermediate files if we can
 .SECONDARY:
Unnamed repository; edit this file to name it for gitweb.