X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=doc%2FMakefile.in;h=ed15fe896b92e058b105c2f6e34374ff66c255b8;hb=f7c87932da18ece131a20b61702b9314cbcff53b;hp=1b15441ed4ba5f004a54e03b84d6920d630b9da3;hpb=c42e9051755428d14eb620abc9eda86d43479a1a;p=fw%2Fsdcc

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 1b15441e..ed15fe89 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -2,12 +2,10 @@ VPATH  = @srcdir@
 srcdir = @srcdir@
 
 LYX        = @LYX@
-LATEX      = @LATEX@
 LATEX2HTML = @LATEX2HTML@
 PDFLATEX   = @PDFLATEX@
-DVIPDF     = @DVIPDF@
-DVIPS      = @DVIPS@
 MAKEINDEX  = @MAKEINDEX@
+PDFOPT     = @PDFOPT@
 
 include ../Makefile.common
 
@@ -22,7 +20,8 @@ all: $(MANUAL).pdf $(MANUAL).html/index.html $(MANUAL).txt \
 install:
 	$(INSTALL) -d $(DESTDIR)$(docdir)
 	cp -rf $(srcdir)/*.txt $(srcdir)/z80 $(srcdir)/avr $(DESTDIR)$(docdir)
-	cp -rf *.txt $(DESTDIR)$(docdir)
+	txtfiles=`echo *.txt | grep -v '\*\.txt' || true`
+	if [    $(txtfiles)               ]; then cp     $(txtfiles)    $(DESTDIR)$(docdir); fi
 	if [ -f $(MANUAL).html/index.html ]; then cp -rf $(MANUAL).html $(DESTDIR)$(docdir); fi
 	if [ -f $(TSS).html/index.html    ]; then cp -rf $(TSS).html    $(DESTDIR)$(docdir); fi
 	if [ -f $(CDB).html/index.html    ]; then cp -rf $(CDB).html    $(DESTDIR)$(docdir); fi
@@ -30,12 +29,12 @@ install:
 	if [ -f $(TSS).pdf                ]; then cp -rf $(TSS).pdf     $(DESTDIR)$(docdir); fi
 	if [ -f $(CDB).pdf                ]; then cp -rf $(CDB).pdf     $(DESTDIR)$(docdir); fi
 	rm -rf `find $(DESTDIR)$(docdir) -name .svn -type d`
-	rm -f $(DESTDIR)$(docdir)/*/WARNINGS $(DESTDIR)$(docdir)/*/*.pl $(DESTDIR)$(docdir)/*/images.*
+	rm -f $(DESTDIR)$(docdir)/*/images.*
 
 uninstall:
 	rm -rf $(DESTDIR)$(docdir)
 
-$(MANUAL).html/index.html: $(MANUAL).tex $(MANUAL).ind ;#$(MANUAL).glo
+$(MANUAL).html/index.html: $(MANUAL).tex ;#$(MANUAL).ind $(MANUAL).glo
 	mkdir -p $(dir $@)
 	@# fixes $(LATEX2HTML) problems with two consecutive dashes for long-options: --stack-auto
 	@# fixes $(LATEX2HTML) problems with \tabularnewline
@@ -45,6 +44,7 @@ $(MANUAL).html/index.html: $(MANUAL).tex $(MANUAL).ind ;#$(MANUAL).glo
 	touch $< -r $(basename $<).orig.tex # avoid warning that *.tex is newer than *.aux
 	-$(LATEX2HTML) -split 5 -show_section_numbers -local_icons -info "" -dir $(MANUAL).html $(MANUAL)
 	mv $(basename $<).orig.tex $<
+	rm -f $(MANUAL).html/WARNINGS $(MANUAL).html/labels.pl
 
 $(TSS).html/index.html: $(TSS).tex
 	mkdir -p $(dir $@)
@@ -56,6 +56,7 @@ $(TSS).html/index.html: $(TSS).tex
 	touch $< -r $(basename $<).orig.tex # avoid warning that *.tex is newer than *.aux
 	-$(LATEX2HTML) -split 0 -local_icons -info "" -dir $(TSS).html $(TSS)
 	mv $(basename $<).orig.tex $<
+	rm -f $(TSS).html/WARNINGS $(TSS).html/labels.pl
 
 $(CDB).html/index.html: $(CDB).tex
 	mkdir -p $(dir $@)
@@ -67,6 +68,7 @@ $(CDB).html/index.html: $(CDB).tex
 	touch $< -r $(basename $<).orig.tex # avoid warning that *.tex is newer than *.aux
 	-$(LATEX2HTML) -split 0 -show_section_numbers -local_icons -info "" -dir $(CDB).html $(CDB)
 	mv $(basename $<).orig.tex $<
+	rm -f $(CDB).html/WARNINGS $(CDB).html/labels.pl
 
 %.txt: %.lyx
 	@# $(LYX) will export the file in the directory of the $(LYX) file
@@ -79,18 +81,18 @@ $(CDB).html/index.html: $(CDB).tex
 	  $(LYX) -e text $< ; \
 	fi
 
-%.pdf: %.tex %.dvi %.ind
-	$(DVIPDF) $*
-# pdflatex creates documents for acrobat reader >= 5.0	
-#	which $(PDFLATEX) > /dev/null && $(PDFLATEX) $* || $(DVIPDF) $*
+#%.pdf: %.tex %.dvi %.ind
+#	$(DVIPDF) $*
+## pdflatex creates documents for acrobat reader >= 5.0	
+##	which $(PDFLATEX) > /dev/null && $(PDFLATEX) $* || $(DVIPDF) $*
 
-%.ps:  %.pdf
-	$(DVIPS) $*
+#%.ps:  %.pdf
+#	$(DVIPS) $*
 
-%.dvi: %.tex
-	$(LATEX) $<
-	@# rerun to in include aux
-	$(LATEX) $<
+#%.dvi: %.tex
+#	$(LATEX) $<
+#	@# rerun to in include aux
+#	$(LATEX) $<
 
 %.tex: %.lyx
 	if [ "$(srcdir)" != "." ] ; then \
@@ -101,19 +103,29 @@ $(CDB).html/index.html: $(CDB).tex
 	  $(LYX) -e latex $< ; \
 	fi
 
-%.ind: %.dvi
-	$(LATEX) $*
-	# is there an index?
-	if [ -f $*.idx ] ; then \
-	  $(MAKEINDEX) $*; \
-	  $(LATEX) $*; \
-	  $(LATEX) $*; \
-	fi
-#	  -$(MAKEINDEX) -s l2hidx.ist $*; \
-
-%.glo: %.dvi
-	# the glossary, not implemented yet
-	# $(MAKEINDEX) -s l2hglo.ist -o $@ $<
+#%.ind: %.dvi
+#	$(LATEX) $*
+#	# is there an index?
+#	if [ -f $*.idx ] ; then \
+#	  $(MAKEINDEX) $*; \
+#	  $(LATEX) $*; \
+#	  $(LATEX) $*; \
+#	fi
+##	  -$(MAKEINDEX) -s l2hidx.ist $*; \
+
+#%.glo: %.dvi
+#	# the glossary, not implemented yet
+#	# $(MAKEINDEX) -s l2hglo.ist -o $@ $<
+
+%.pdf: %.tex
+	$(PDFLATEX) $*
+	-$(MAKEINDEX) $*
+	$(PDFLATEX) $*
+	-$(MAKEINDEX) $*
+	$(PDFLATEX) $*
+	$(PDFOPT) $*.pdf tmp.pdf
+	rm $*.pdf
+	mv tmp.pdf $*.pdf
 
 archive: all
 	rm -rf sdcc-doc sdcc-doc.tar.bz2