X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=doc%2FMakefile.in;h=3d8274f0874a08a5169c5769b3353ff5d25aea6d;hb=80972b2e54c9b88f11c27b878874fd2a6a681391;hp=b483ac11a597b4466e85bd8c8b7871c559948930;hpb=a8e264a929f170ce24db46655dfeb9de1b3eca1d;p=fw%2Fsdcc

diff --git a/doc/Makefile.in b/doc/Makefile.in
index b483ac11..3d8274f0 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -2,12 +2,12 @@ VPATH  = @srcdir@
 srcdir = @srcdir@
 
 LYX        = @LYX@
-LATEX      = @LATEX@
 LATEX2HTML = @LATEX2HTML@
 PDFLATEX   = @PDFLATEX@
-DVIPDF     = @DVIPDF@
-DVIPS      = @DVIPS@
 MAKEINDEX  = @MAKEINDEX@
+PDFOPT     = @PDFOPT@
+
+QUIET	   = >/dev/null 2>/dev/null
 
 include ../Makefile.common
 
@@ -31,90 +31,81 @@ 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).aux ;#$(MANUAL).ind $(MANUAL).glo
 	mkdir -p $(dir $@)
 	@# fixes $(LATEX2HTML) problems with two consecutive dashes for long-options: --stack-auto
 	@# fixes $(LATEX2HTML) problems with \tabularnewline
-	mv $< $(basename $<).orig.tex
 	sed -e 's,-\\/-,-\\/-\\/-,g' \
-	    -e 's,\\tabularnewline$$,\\\\,g' < $(basename $<).orig.tex > $<
-	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 $<
+	    -e 's,\\tabularnewline$$,\\\\,g' < $< > $(dir $@)$(notdir $<)
+	cp $(MANUAL).aux $(dir $@)
+	-cd $(dir $@); $(LATEX2HTML) -split 5 -show_section_numbers -local_icons -info "" -nosubdir $(MANUAL) $(QUIET)
+	rm -f $(dir $@)WARNINGS $(dir $@)labels.pl $(dir $@)$(notdir $<) $(dir $@)$*.aux
 
-$(TSS).html/index.html: $(TSS).tex
+%.html/index.html: %.tex %.aux
 	mkdir -p $(dir $@)
 	@# fixes $(LATEX2HTML) problems with two consecutive dashes for long-options: --stack-auto
 	@# fixes $(LATEX2HTML) problems with \tabularnewline
-	mv $< $(basename $<).orig.tex
 	sed -e 's,-\\/-,-\\/-\\/-,g' \
-	    -e 's,\\tabularnewline$$,\\\\,g' < $(basename $<).orig.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 $<
-
-$(CDB).html/index.html: $(CDB).tex
-	mkdir -p $(dir $@)
-	@# fixes $(LATEX2HTML) problems with two consecutive dashes for long-options: --stack-auto
-	@# fixes $(LATEX2HTML) problems with \tabularnewline
-	mv $< $(basename $<).orig.tex
-	sed -e 's,-\\/-,-\\/-\\/-,g' \
-	    -e 's,\\tabularnewline$$,\\\\,g' < $(basename $<).orig.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 $<
+	    -e 's,\\tabularnewline$$,\\\\,g' < $< > $(dir $@)$(notdir $<)
+	cp $*.aux $(dir $@)
+	-cd $(dir $@); $(LATEX2HTML) -split 0 -local_icons -info "" -nosubdir $* $(QUIET)
+	rm -f $(dir $@)WARNINGS $(dir $@)labels.pl $(dir $@)$(notdir $<) $(dir $@)$*.aux
 
 %.txt: %.lyx
 	@# $(LYX) will export the file in the directory of the $(LYX) file
 	@# if VPATH is used the $(LYX) file is copied first
 	if [ "$(srcdir)" != "." ]; then \
-	  cp $< . ; \
-	  $(LYX) -e text $(notdir $<) ; \
-	  rm $(notdir $<) ; \
-	else \
-	  $(LYX) -e text $< ; \
+	  cp -f $(srcdir)/$(notdir $<) . ; \
 	fi
+	$(LYX) -e text $(notdir $<);
 
-%.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 \
-	  cp $< . ; \
-	  $(LYX) -e latex $(notdir $<) ; \
-	  rm $(notdir $<) ; \
-	else \
-	  $(LYX) -e latex $< ; \
-	fi
-
-%.ind: %.dvi
-	$(LATEX) $*
-	# is there an index?
-	if [ -f $*.idx ] ; then \
-	  $(MAKEINDEX) $*; \
-	  $(LATEX) $*; \
-	  $(LATEX) $*; \
+	  cp -f $(srcdir)/$(notdir $<) . ; \
 	fi
-#	  -$(MAKEINDEX) -s l2hidx.ist $*; \
-
-%.glo: %.dvi
-	# the glossary, not implemented yet
-	# $(MAKEINDEX) -s l2hglo.ist -o $@ $<
+	$(LYX) -e latex $(notdir $<);
+
+#%.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 %.aux: %.tex
+	$(PDFLATEX) $* $(QUIET)
+	[ ! -e "$*.idx" ] || $(MAKEINDEX) $* $(QUIET)
+	$(PDFLATEX) $* $(QUIET)
+	[ ! -e "$*.idx" ] || $(MAKEINDEX) $* $(QUIET)
+	$(PDFLATEX) $* $(QUIET)
+	$(PDFOPT) $*.pdf tmp.pdf
+	rm $*.pdf
+	mv tmp.pdf $*.pdf
 
 archive: all
 	rm -rf sdcc-doc sdcc-doc.tar.bz2