mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-12 12:05:57 +02:00
+ Make targets fixed (hopefully)
This commit is contained in:
parent
77ecf74f4e
commit
7e4dadd69a
@ -187,8 +187,8 @@ endif
|
|||||||
# Conversion from types
|
# Conversion from types
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
||||||
.PHONY: clean dvi help html ps psdist htmldist pdfdist txtdist \
|
.PHONY: clean dvi help html ps psdist htmldist htmdist htdist pdfdist \
|
||||||
htm txt pdf refex alldist messages onechap gtk \
|
txtdist htm txt pdf refex alldist messages onechap gtk \
|
||||||
user ref prog rtl
|
user ref prog rtl
|
||||||
|
|
||||||
.SUFFIXES: .dvi .tex .ps .txt .pdf
|
.SUFFIXES: .dvi .tex .ps .txt .pdf
|
||||||
@ -199,7 +199,7 @@ endif
|
|||||||
$(DVIPS) $<
|
$(DVIPS) $<
|
||||||
|
|
||||||
.tex.dvi:
|
.tex.dvi:
|
||||||
-rm $(basename $<).aux
|
-rm $*.aux $*.idx $*.ilg $*.ind $*.log $*.out $*.toc $*.tmp $*.xref $*.4ht
|
||||||
$(LATEX) $*
|
$(LATEX) $*
|
||||||
-$(MAKEINDEX) $*
|
-$(MAKEINDEX) $*
|
||||||
$(LATEX) $*
|
$(LATEX) $*
|
||||||
@ -210,7 +210,7 @@ endif
|
|||||||
$(DVITXT) -o $*.txt $*.dvi
|
$(DVITXT) -o $*.txt $*.dvi
|
||||||
|
|
||||||
.tex.pdf:
|
.tex.pdf:
|
||||||
-rm $(basename $<).aux
|
-rm $*.aux $*.idx $*.ilg $*.ind $*.log $*.out $*.toc $*.tmp $*.xref $*.4ht
|
||||||
$(PDFLATEX) $*
|
$(PDFLATEX) $*
|
||||||
-$(MAKEINDEX) $*
|
-$(MAKEINDEX) $*
|
||||||
$(PDFLATEX) $*
|
$(PDFLATEX) $*
|
||||||
@ -404,10 +404,10 @@ RTLOPTS+= --descr=x86.xml --input="../rtl/unix/x86.pp"
|
|||||||
RTLOPTS+= --descr=dynlibs.xml --input="../rtl/inc/dynlibs.pp -Fi../rtl/unix"
|
RTLOPTS+= --descr=dynlibs.xml --input="../rtl/inc/dynlibs.pp -Fi../rtl/unix"
|
||||||
RTLOPTS+= --descr=linux.xml --input="../rtl/unix/linux.pp -Fi../rtl/linux -Fi../rtl/unix"
|
RTLOPTS+= --descr=linux.xml --input="../rtl/unix/linux.pp -Fi../rtl/linux -Fi../rtl/unix"
|
||||||
RTLOPTS+= --descr=math.xml --input="../rtl/objpas/math.pp -Fi../rtl/i386 -dFPC_HAS_TYPE_EXTENDED"
|
RTLOPTS+= --descr=math.xml --input="../rtl/objpas/math.pp -Fi../rtl/i386 -dFPC_HAS_TYPE_EXTENDED"
|
||||||
RTLOPTS+= --descr=system.xml --input="-dfpdocsystem -dSUPPORT_DOUBLE ../rtl/$(HOSTOS)/system.pp -Fi../rtl/unix -Fi../rtl/inc -Fi../rtl/i386 -dCPU32 -dHASVARIANT -dFPC_HAS_TYPE_EXTENDED -dHASWIDECHAR"
|
RTLOPTS+= --descr=system.xml --input="-dfpdocsystem -dHASGETHEAPSTATUS -dSUPPORT_DOUBLE ../rtl/$(HOSTOS)/system.pp -Fi../rtl/unix -Fi../rtl/inc -Fi../rtl/i386 -dCPU32 -dHASVARIANT -dFPC_HAS_TYPE_EXTENDED -dHASWIDECHAR"
|
||||||
else
|
else
|
||||||
RTLXML=system.xml
|
RTLXML=system.xml
|
||||||
RTLOPTS+=--descr=system.xml --input="-dfpdocsystem -dSUPPORT_DOUBLE ../rtl/$(HOSTOS)/system.pp -Fi../rtl/unix -Fi../rtl/inc -Fi../rtl/i386 -dCPU32 -dHASVARIANT -dFPC_HAS_TYPE_EXTENDED -dHASWIDECHAR"
|
RTLOPTS+=--descr=system.xml --input="-dfpdocsystem -dHASGETHEAPSTATUS -dSUPPORT_DOUBLE ../rtl/$(HOSTOS)/system.pp -Fi../rtl/unix -Fi../rtl/inc -Fi../rtl/i386 -dCPU32 -dHASVARIANT -dFPC_HAS_TYPE_EXTENDED -dHASWIDECHAR"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
rtl.inc: $(RTLXML)
|
rtl.inc: $(RTLXML)
|
||||||
@ -450,9 +450,9 @@ fcl.pdf: fcl.tex fcl.inc includes
|
|||||||
|
|
||||||
chart.pdf: chart.tex
|
chart.pdf: chart.tex
|
||||||
|
|
||||||
rtl.dvi: rtl.tex rtl.inc
|
rtl.dvi: rtl.tex rtl.inc includes
|
||||||
|
|
||||||
rtl.pdf: rtl.tex rtl.inc
|
rtl.pdf: rtl.tex rtl.inc includes
|
||||||
|
|
||||||
dvi : $(DVI)
|
dvi : $(DVI)
|
||||||
|
|
||||||
@ -580,32 +580,42 @@ ifndef SKIPINSTALL
|
|||||||
$(MAKE) htmlinstall DOCINSTALLDIR=$(DOCPREFIX)
|
$(MAKE) htmlinstall DOCINSTALLDIR=$(DOCPREFIX)
|
||||||
endif
|
endif
|
||||||
cd $(DOCPREFIX) ; tar cz * > $(BASEDIR)/fpcdoc.tar.gz ; cd $(BASEDIR)
|
cd $(DOCPREFIX) ; tar cz * > $(BASEDIR)/fpcdoc.tar.gz ; cd $(BASEDIR)
|
||||||
|
ifndef SKIPINSTALL
|
||||||
rm -rf $(DOCPREFIX)
|
rm -rf $(DOCPREFIX)
|
||||||
|
endif
|
||||||
|
|
||||||
htmlzip:
|
htmlzip:
|
||||||
ifndef SKIPINSTALL
|
ifndef SKIPINSTALL
|
||||||
$(MAKE) htmlinstall DOCINSTALLDIR=$(DOCPREFIX)
|
$(MAKE) htmlinstall DOCINSTALLDIR=$(DOCPREFIX)
|
||||||
endif
|
endif
|
||||||
zip -D9rq doc-html $(DOCPREFIX)/*
|
zip -D9rq doc-html $(DOCPREFIX)/*
|
||||||
|
ifndef SKIPINSTALL
|
||||||
rm -rf $(DOCPREFIX)
|
rm -rf $(DOCPREFIX)
|
||||||
|
endif
|
||||||
|
|
||||||
htmzip:
|
htmzip: makehtm
|
||||||
ifndef SKIPINSTALL
|
ifndef SKIPINSTALL
|
||||||
$(MAKE) htmlinstall DOCINSTALLDIR=$(DOCPREFIX)
|
$(MAKE) htmlinstall DOCINSTALLDIR=$(DOCPREFIX)
|
||||||
endif
|
endif
|
||||||
makehtm -r ($DOCPREFIX)
|
makehtm -r $(DOCPREFIX)
|
||||||
zip -D9rq doc-htm $(DOCPREFIX)
|
zip -D9rq doc-htm $(DOCPREFIX)
|
||||||
rm -rf $(DOCPREFIX)
|
rm -rf $(DOCPREFIX)
|
||||||
|
|
||||||
|
# html only, no htm
|
||||||
htmldist: htmlzip htmltar
|
htmldist: htmlzip htmltar
|
||||||
|
|
||||||
|
# htm only, no html
|
||||||
htmdist: makehtm htmzip
|
htmdist: makehtm htmzip
|
||||||
|
|
||||||
alldist: dvidist psdist txtdist pdfdist
|
# html and htm, optimized.
|
||||||
$(MAKE) htmltar
|
htdist:
|
||||||
|
$(MAKE) htmlinstall DOCINSTALLDIR=$(DOCPREFIX)
|
||||||
|
$(MAKE) htmltar SKIPINSTALL=Y
|
||||||
$(MAKE) htmlzip SKIPINSTALL=Y
|
$(MAKE) htmlzip SKIPINSTALL=Y
|
||||||
$(MAKE) htmzip SKIPINSTALL=Y
|
$(MAKE) htmzip SKIPINSTALL=Y
|
||||||
|
|
||||||
|
alldist: dvidist psdist txtdist pdfdist htdist
|
||||||
|
|
||||||
distclean: clean
|
distclean: clean
|
||||||
-rm -f *.tar.gz *.zip
|
-rm -f *.tar.gz *.zip
|
||||||
|
|
||||||
@ -654,7 +664,10 @@ execute:
|
|||||||
|
|
||||||
#
|
#
|
||||||
# $Log$
|
# $Log$
|
||||||
# Revision 1.33 2004-12-14 21:50:02 michael
|
# Revision 1.34 2004-12-15 22:14:14 michael
|
||||||
|
# + Make targets fixed (hopefully)
|
||||||
|
#
|
||||||
|
# Revision 1.33 2004/12/14 21:50:02 michael
|
||||||
# + Delete aux file before running (pdf)latex.
|
# + Delete aux file before running (pdf)latex.
|
||||||
#
|
#
|
||||||
# Revision 1.32 2004/12/14 21:44:54 michael
|
# Revision 1.32 2004/12/14 21:44:54 michael
|
||||||
|
Loading…
Reference in New Issue
Block a user