Ignore:
Timestamp:
Nov 24, 2016, 1:14:11 PM (9 years ago)
Author:
Silvan Scherrer
Message:

Samba Server: update vendor to version 4.4.3

File:
1 edited

Legend:

Unmodified
Added
Removed

  • vendor/current/docs-xml/Makefile

    r618 r988  
    99# Docs to build
    1010MAIN_DOCS = $(patsubst %/index.xml,%,$(wildcard */index.xml))
    11 MANPAGES3 = $(wildcard $(MANPAGEDIR3)/*.?.xml)
     11MANPAGES = $(wildcard $(MANPAGEDIR)/*.?.xml)
    1212
    1313# Lists of files to process
    14 MANPAGES_PLUCKER = $(patsubst $(MANPAGEDIR3)/%.xml,$(PLUCKERDIR)/%.pdb,$(MANPAGES3))
     14MANPAGES_PLUCKER = $(patsubst $(MANPAGEDIR)/%.xml,$(PLUCKERDIR)/%.pdb,$(MANPAGES))
    1515DBLATEX_OPTIONS = -p xslt/latex.xsl -i xslt/latex
    1616
    … …  
    3434        @echo " all - Build all docs that can be build using the utilities found by configure"
    3535        @echo " everything - Build all of the above"
    36         @echo " pdf,tex,ps,manpages3,txt,pearson,htmlhelp - Build specific output format"
     36        @echo " pdf,tex,ps,manpages,txt,pearson,htmlhelp - Build specific output format"
    3737        @echo " html - Build multi-file HTML versions"
    3838        @echo " html-single - Build single-file HTML versions"
    39         @echo " htmlman3 - Build HTML version of manpages"
    40         @echo " undocumented - Output list of undocumented smb.conf options"
     39        @echo " htmlman - Build HTML version of manpages"
    4140        @echo " samples - Extract examples"
    4241
    4342$(PDFDIR)/Samba3-ByExample.pdf $(PSDIR)/Samba3-ByExample.ps $(DOCBOOKDIR)/Samba3-ByExample.xml Samba3-ByExample.tex: $(wildcard Samba3-ByExample/*.xml)
    4443$(PDFDIR)/Samba3-HOWTO.pdf $(PSDIR)/Samba3-HOWTO.ps Samba3-HOWTO.tex $(DOCBOOKDIR)/Samba3-HOWTO.xml: $(wildcard Samba3-HOWTO/*.xml) Samba3-HOWTO-attributions.xml
    45 Samba3-HOWTO/manpages.xml: $(MANPAGEDIR3)/smb.conf.5.xml
     44Samba3-HOWTO/manpages.xml: $(MANPAGEDIR)/smb.conf.5.xml
    4645$(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
    47 $(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
    4846
    4947# Pseudo targets
    5048all:: $(TARGETS)
    51 everything:: manpages3 pdf html-single html htmlman3 txt ps fo htmlhelp pearson
    52 release:: manpages3 htmlman3 html pdf
     49everything:: manpages pdf html-single html htmlman txt ps fo htmlhelp pearson
     50release:: manpages htmlman html pdf
    5351clean::
    5452        @echo "Cleaning up..."
    5553        rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)
    56         rm -f $(patsubst %.svg,%.png,$(wildcard */images/*.svg)) \
    57                   $(patsubst %.svg,%.eps,$(wildcard */images/*.svg)) \
    58                   $(patsubst %.png,%.eps,$(wildcard */images/*.png))
    5954        rm -f *-attributions.xml
     55        rm -f $(patsubst %.svg,%.png,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-dia))) \
     56                        $(patsubst %.svg,%.pdf,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
     57                        $(patsubst %.svg,%.eps,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg))) \
     58                        $(patsubst %.svg,%.png,$(foreach DOC,$(MAIN_DOCS),$($(DOC)-images-latex-svg)))
     59        rm -f *-attributions.xml *.d *.tpt *.tex *.loc *.toc *.lof *.glo *.idx *.aux
     60        rm -f *-images-html*
     61        rm -f *-images-latex-* $(LATEX_FIGURES)
     62        rm -f xslt/figures/*pdf
    6063        rm -f $(SMBDOTCONFDOC)/parameters.*.xml
    6164        rm -f build/catalog.xml
    … …  
    6871texi:: $(patsubst %,$(TEXINFODIR)/%.texi,$(MAIN_DOCS))
    6972texiinfo:: $(patsubst %,$(TEXINFODIR)/%.info,$(MAIN_DOCS))
    70 manpages3:: $(patsubst $(MANPAGEDIR3)/%.xml,$(OUTPUTDIR)/manpages-3/%,$(MANPAGES3))
     73manpages:: $(patsubst $(MANPAGEDIR)/%.xml,$(OUTPUTDIR)/manpages/%,$(MANPAGES))
    7174pearson:: $(PEARSONDIR)/Samba3-HOWTO.xml
    7275pearson-verify:: $(PEARSONDIR)/Samba3-HOWTO.report.html
    7376plucker:: $(patsubst %,$(PLUCKERDIR)/%.pdb,$(MAIN_DOCS))
    74 htmlman3:: $(patsubst $(MANPAGEDIR3)/%.xml,$(HTMLDIR)/manpages-3/%.html,$(MANPAGES3)) $(HTMLDIR)/manpages-3/index.html
     77htmlman:: $(patsubst $(MANPAGEDIR)/%.xml,$(HTMLDIR)/manpages/%.html,$(MANPAGES)) $(HTMLDIR)/manpages/index.html
    7578html-single:: $(patsubst %,$(HTMLDIR)/%.html,$(MAIN_DOCS))
    7679html:: $(patsubst %,$(HTMLDIR)/%/index.html,$(MAIN_DOCS)) $(HTMLDIR)/index.html
    … …  
    8184check:: validate
    8285
    83 .PHONY: test check validate
     86.PHONY: test check validate manpages
    8487
    8588# Intermediate docbook docs
    … …  
    9093        @$(XSLTPROC) --stringparam latex.imagebasedir "$*/"  --stringparam noreference 0  --xinclude --output $@ xslt/expand-sambadoc.xsl $<
    9194
    92 $(DOCBOOKDIR)/manpages-3/%.xml: $(MANPAGEDIR3)/%.xml xslt/expand-sambadoc.xsl
     95$(DOCBOOKDIR)/manpages/%.xml: $(MANPAGEDIR)/%.xml xslt/expand-sambadoc.xsl
    9396        @mkdir -p $(@D)
    9497        $(XSLTPROC) --xinclude --stringparam noreference 0 --output $@ xslt/expand-sambadoc.xsl $<
    9598
    96 $(DOCBOOKDIR)/manpages-3/index.xml: $(MANPAGES3) xslt/manpage-summary.xsl
     99$(DOCBOOKDIR)/manpages/index.xml: $(MANPAGES) xslt/manpage-summary.xsl
    97100        @mkdir -p $(@D)
    98101        echo "<article><variablelist>" > $@
    99         $(XSLTPROC) xslt/manpage-summary.xsl $(MANPAGES3) >> $@
     102        $(XSLTPROC) xslt/manpage-summary.xsl $(MANPAGES) >> $@
    100103        @echo "</variablelist></article>" >> $@
    101104
    … …  
    104107        @mkdir -p $(@D)
    105108        cp $< $@
    106        
    107 $(HTMLDIR)/%/index.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/%/samba.css xslt/html-chunk.xsl
     109
     110$(HTMLDIR)/%/index.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/%/samba.css xslt/html-chunk.xsl %-images-html-chunks
    108111        @mkdir -p $(@D)
    109112        $(XSLTPROC) --stringparam base.dir "$(HTMLDIR)/$*/" xslt/html-chunk.xsl $<
    … …  
    114117        cp $< $@
    115118
    116 $(patsubst %,$(HTMLDIR)/%.html,$(MAIN_DOCS)): $(HTMLDIR)/%.html: %-images-png
    117 
    118 define IMAGES_TEMPLATE
    119 $(1)-images-png:: $$(patsubst %.svg,%.png,$$(wildcard $(1)/images/*.svg)) ;
    120 $(1)-images-eps:: $$(patsubst %.svg,%.eps,$$(wildcard $(1)/images/*.svg)) ;
    121 $(1)-images-eps:: $$(patsubst %.png,%.eps,$$(wildcard $(1)/images/*.png)) ;
    122 
    123 endef
    124 
    125 $(eval $(foreach DOC, $(MAIN_DOCS),$(call IMAGES_TEMPLATE,$(DOC))))
     119$(patsubst %,$(HTMLDIR)/%.html,$(MAIN_DOCS)): $(HTMLDIR)/%.html: %-images-html-single
    126120
    127121$(HTMLDIR)/%.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/samba.css xslt/html.xsl
    … …  
    145139        @$(DBLATEX) $(DBLATEX_OPTIONS) -t tex -o $@ $<
    146140
     141# Dependency files
     142%.d: $(DOCBOOKDIR)/%.xml xslt/generate-dependencies.xsl
     143        @echo "Generating dependency file for $*"
     144        @$(XSLTPROC) --novalid \
     145                --stringparam txtbasedir "$(TXTDIR)/$*/" \
     146                --stringparam target "$*" \
     147                -o $@ xslt/generate-dependencies.xsl $<
     148        @echo "$*-images-latex-svg = \$$(wildcard \$$(addsuffix .svg, \$$($*-images-latex)))" >> $@
     149        @echo "$*-images-latex-eps: \$$(addsuffix .eps, \$$($*-images-latex))" >> $@
     150        @echo "$*-images-latex-pdf: \$$(patsubst %.svg, %.pdf, \$$($*-images-latex-svg))" >> $@
     151        @echo "$*-images-latex-png: \$$(filter-out \$$(patsubst %.svg,%.png,\$$($*-images-latex-svg)), \$$(addsuffix .png, \$$($*-images-latex)))" >> $@
     152
     153        @echo >> $@
     154        @echo "\$$(HTMLDIR)/%: $*/%" >> $@
     155        @echo " @mkdir -p \$$(@D)" >> $@
     156        @echo " @cp \$$< \$$@" >> $@
     157        @echo >> $@
     158        @echo "\$$(HTMLDIR)/$*/%: $*/%" >> $@
     159        @echo " @mkdir -p \$$(@D)" >> $@
     160        @echo " @cp \$$< \$$@" >> $@
     161        @echo >> $@
     162        @echo "\$$(HTMLHELPDIR)/$*/%: $*/%" >> $@
     163        @echo " @mkdir -p \$$(@D)" >> $@
     164        @echo " @cp \$$< \$$@" >> $@
     165        @echo >> $@
     166        @echo "$*-images-html-single: \$$(addprefix \$$(HTMLDIR)/, \$$($*-images-html))" >> $@
     167        @echo "$*-images-html-chunks: \$$(addprefix \$$(HTMLDIR)/$*/, \$$($*-images-html))" >> $@
     168        @echo "$*-images-htmlhelp: \$$(addprefix \$$(HTMLHELPDIR)/$*/, \$$($*-images-html))" >> $@
     169
     170ifdef OUTPUTDIR
     171ifneq ($(MAKECMDGOALS),clobber)
     172-include $(addsuffix .d,$(MAIN_DOCS))
     173endif
     174endif
     175
    147176# Adobe PDF files 
    148 $(PDFDIR)/%.pdf: %/index.xml $(PDFDIR) xslt/latex.xsl %-images-png
     177$(PDFDIR)/%.pdf: %/index.xml $(PDFDIR) xslt/latex.xsl %-images-latex-png %-images-latex-pdf
    149178        $(DBLATEX) $(DBLATEX_OPTIONS) -I $*/images -t pdf -o $@ $<
    150179
    151180# PostScript files
    152 $(PSDIR)/%.ps: %/index.xml $(PSDIR) xslt/latex.xsl %-images-eps
     181$(PSDIR)/%.ps: %/index.xml $(PSDIR) xslt/latex.xsl %-images-latex-eps
    153182        $(DBLATEX) $(DBLATEX_OPTIONS) -I $*/images -t ps -o $@ $<
    154183
    … …  
    162191        $(PNGTOPNM) $< | $(PNMTOPS) > $@
    163192
    164 $(HTMLHELPDIR)/%: $(DOCBOOKDIR)/%.xml %-images-png
     193%.pdf: %.svg
     194        $(INKSCAPE) -z -f $(abspath $<) --export-pdf=$(abspath $@)
     195
     196$(HTMLHELPDIR)/%: $(DOCBOOKDIR)/%.xml %-images-htmlhelp
    165197        $(XSLTPROC) --stringparam htmlhelp.chm $*.chm \
    166198                                --stringparam manifest.in.base.dir "$@/" \
    … …  
    182214
    183215# Manpages
    184 $(MANPAGEDIR3)/smb.conf.5.xml: parameters
     216$(MANPAGEDIR)/smb.conf.5.xml: parameters
    185217
    186218# The phony parameters target exists in order to always create the
    … …  
    190222.PHONY: parameters
    191223
    192 parameters: $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/parameters.service.xml $(SMBDOTCONFDOC)/parameters.global.xml
     224parameters: $(SMBDOTCONFDOC)/parameters.all.xml
    193225
    194226$(SMBDOTCONFDOC)/parameters.all.xml: $(wildcard $(SMBDOTCONFDOC)/*/*.xml) $(SMBDOTCONFDOC)/generate-file-list.sh
    195227        $(SMBDOTCONFDOC)/generate-file-list.sh $(SMBDOTCONFDOC) > $@
    196228
    197 $(SMBDOTCONFDOC)/parameters.global.xml: $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/generate-context.xsl
    198         @echo "Generating list of global smb.conf options"
    199         $(XSLTPROC) --xinclude --param smb.context "'G'" --output $(SMBDOTCONFDOC)/parameters.global.xml $(SMBDOTCONFDOC)/generate-context.xsl $<
    200 
    201 $(SMBDOTCONFDOC)/parameters.service.xml: $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/generate-context.xsl
    202         @echo "Generating list of share-mode smb.conf options"
    203         $(XSLTPROC) --xinclude --param smb.context "'S'" --output $(SMBDOTCONFDOC)/parameters.service.xml $(SMBDOTCONFDOC)/generate-context.xsl $<
    204 
    205229$(OUTPUTDIR):
    206230        test -d $@ || mkdir $@
    … …  
    212236# Individual smb.conf parameters
    213237smb.conf-chunks: $(patsubst $(SMBDOTCONFDOC)/%.xml,$(HTMLDIR)/smb.conf/%.html,$(wildcard $(SMBDOTCONFDOC)/*/*.xml))
    214        
     238
    215239$(HTMLDIR)/smb.conf/%.html: $(SMBDOTCONFDOC)/%.xml
    216240        @mkdir -p $(@D)
    … …  
    229253%-validate: %/index.xml
    230254        cd $(<D) && $(XMLLINT) --xinclude --noent --postvalid --noout $(<F)
    231 
    232 # Find undocumented parameters
    233 undocumented: $(SMBDOTCONFDOC)/parameters.all.xml scripts/find_missing_doc.pl scripts/find_missing_manpages.pl
    234         $(PERL) scripts/find_missing_doc.pl $(SRCDIR)
    235         $(PERL) scripts/find_missing_manpages.pl $(SRCDIR)
    236255
    237256samples: $(DOCBOOKDIR)/Samba3-HOWTO.xml xslt/extract-examples.xsl scripts/indent-smb.conf.pl
    … …  
    249268xslt/html.xsl: xslt/html-common.xsl
    250269xslt/html-chunk.xsl: xslt/html-common.xsl
     270xslt/latex.xsl:
     271xslt/expand-sambadoc.xsl:
     272xslt/generate-attributions.xsl:
     273xslt/man.xsl:
     274xslt/pearson.xsl:
    251275
    252276distclean clobber:: clean
Note: See TracChangeset for help on using the changeset viewer.