sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

Don't generate the Makefile, but rather include an autogenerated settings file

Browse Source 
(I spend a lot of time editting the Makefile, and running config.status every time
 I change something gets annoying)
(This used to be commit 90f297cbb6d89d93c33b9691b407df23471b4771)
This commit is contained in:
Jelmer Vernooij 2005-01-29 20:05:52 +00:00 committed by Gerald W. Carter
parent b0eafa6e39
commit cdd0b10ffa
3 changed files with 59 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
docs/Makefile.in → docs/Makefile
View File

@ -4,49 +4,7 @@
# James Moore <jmoore@php.net>
# Gerald Carter <jerry@samba.org>
# Jelmer Vernooij <jelmer@samba.org>
# Programs
XSLTPROC = @XSLTPROC@
XMLLINT = @XMLLINT@
DVIPS = @DVIPS@
PNGTOPNM = @PNGTOPNM@
EPSTOPNM = @EPSTOPNM@
PNMTOPNG = @PNMTOPNG@
DIA = @DIA@
PNMTOPS = @PNMTOPS@
HTML2TEXT = @HTML2TEXT@
PLUCKERBUILD = @PLUCKERBUILD@
COPY_IMAGES = ./scripts/copy-images.sh
THUMBPDF = @THUMBPDF@
PDFLATEX = TEXINPUTS=xslt/latex:.: @PDFLATEX@ --file-line-error-style
LATEX = TEXINPUTS=xslt/latex:.: @LATEX@ --file-line-error-style
RM = @RM@
ifndef DEBUG_LATEX
PDFLATEX += --interaction nonstopmode
LATEX += --interaction nonstopmode
endif
# Paths
OUTPUTDIR = output
ARCHIVEDIR = archive
SRCDIR = @SAMBASOURCEDIR@
MANDIR = $(OUTPUTDIR)/manpages
EPSTOPDF = @EPSTOPDF@
MANPAGEDIR = manpages
MAKEINDEX = @MAKEINDEX@
EXAMPLESDIR = examples
SMBDOTCONFDOC = smbdotconf
DOCBOOKDIR = tmp
PSDIR = $(OUTPUTDIR)
PDFDIR = $(OUTPUTDIR)
DVIDIR = $(OUTPUTDIR)
FODIR = $(OUTPUTDIR)
HTMLHELPDIR = $(OUTPUTDIR)/htmlhelp
VALIDATEDIR = $(OUTPUTDIR)/validate
PEARSONDIR = $(OUTPUTDIR)/pearson
TXTDIR = $(OUTPUTDIR)/textdocs
HTMLDIR=$(OUTPUTDIR)/htmldocs
PLUCKERDIR=$(OUTPUTDIR)/plucker
-include Makefile.settings
# Docs to build
MAIN_DOCS = $(patsubst %/index.xml,$(DOCBOOKDIR)/%.xml,$(wildcard */index.xml))
@ -56,6 +14,16 @@ MANPAGES = $(wildcard $(MANPAGEDIR)/*.?.xml)
LATEX_FIGURES = xslt/figures/caution.pdf xslt/figures/important.pdf xslt/figures/note.pdf xslt/figures/tip.pdf xslt/figures/warning.pdf
MANPAGES_PLUCKER = $(patsubst $(MANPAGEDIR)/%.xml,$(PLUCKERDIR)/%.pdb,$(MANPAGES))
ifndef OUTPUTDIR
Makefile.settings: Makefile.settings.in configure
@echo Makefile.settings not present, trying to run configure...
@./configure
configure: configure.in
@echo configure not present, trying to generate
@autoreconf
endif
help:
@echo "Supported make targets:"
@echo " release - Build the docs needed for a Samba release"
@ -69,6 +37,8 @@ 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
@ -137,7 +107,7 @@ $(HTMLDIR)/%.html: $(DOCBOOKDIR)/%.xml $(HTMLDIR)/samba.css xslt/html.xsl
$(XSLTPROC) --xinclude xslt/generate-attributions.xsl $*/index.xml > $@
clobber: clean
rm Makefile settings.xsl config.status config.log configure
rm Makefile.settings settings.xsl config.status config.log configure
clean:
rm -rf $(OUTPUTDIR)/* $(DOCBOOKDIR)

44
docs/Makefile.settings.in Normal file
View File

@ -0,0 +1,44 @@
# Programs
XSLTPROC = @XSLTPROC@
XMLLINT = @XMLLINT@
DVIPS = @DVIPS@
PNGTOPNM = @PNGTOPNM@
EPSTOPNM = @EPSTOPNM@
PNMTOPNG = @PNMTOPNG@
DIA = @DIA@
PNMTOPS = @PNMTOPS@
HTML2TEXT = @HTML2TEXT@
PLUCKERBUILD = @PLUCKERBUILD@
COPY_IMAGES = ./scripts/copy-images.sh
THUMBPDF = @THUMBPDF@
PDFLATEX = TEXINPUTS=xslt/latex:.: @PDFLATEX@ --file-line-error-style
LATEX = TEXINPUTS=xslt/latex:.: @LATEX@ --file-line-error-style
RM = @RM@
ifndef DEBUG_LATEX
PDFLATEX += --interaction nonstopmode
LATEX += --interaction nonstopmode
endif
# Paths
OUTPUTDIR = output
ARCHIVEDIR = archive
SRCDIR = @SAMBASOURCEDIR@
MANDIR = $(OUTPUTDIR)/manpages
EPSTOPDF = @EPSTOPDF@
MANPAGEDIR = manpages
MAKEINDEX = @MAKEINDEX@
EXAMPLESDIR = examples
SMBDOTCONFDOC = smbdotconf
DOCBOOKDIR = tmp
PSDIR = $(OUTPUTDIR)
PDFDIR = $(OUTPUTDIR)
DVIDIR = $(OUTPUTDIR)
FODIR = $(OUTPUTDIR)
HTMLHELPDIR = $(OUTPUTDIR)/htmlhelp
VALIDATEDIR = $(OUTPUTDIR)/validate
PEARSONDIR = $(OUTPUTDIR)/pearson
TXTDIR = $(OUTPUTDIR)/textdocs
HTMLDIR=$(OUTPUTDIR)/htmldocs
PLUCKERDIR=$(OUTPUTDIR)/plucker
TARGETS = @TARGETS@

2
docs/configure.in
View File

@ -95,4 +95,4 @@ fi
AC_SUBST(TARGETS)
AC_OUTPUT( Makefile settings.xsl )
AC_OUTPUT( Makefile.settings settings.xsl )