X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=doc%2FMakefile.in;h=b8e3c26fac85b606e1c71d9224f3849a78bde2e7;hb=5a1d5e778e85664f4e6657019348b4756b16eacb;hp=7e1cf860e24ec09bf02585aef1a7b8f1d19436de;hpb=657a8d7401e72525fd59787b3e1238ff01b64682;p=fw%2Fsdcc

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 7e1cf860..b8e3c26f 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -2,14 +2,13 @@ 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
 
 MANUAL = sdccman
@@ -32,54 +31,38 @@ 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
-	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 $<
-
-$(TSS).html/index.html: $(TSS).tex
+$(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 0 -local_icons -info "" -dir $(TSS).html $(TSS)
-	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
 
-$(CDB).html/index.html: $(CDB).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 -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) $*
@@ -96,12 +79,9 @@ $(CDB).html/index.html: $(CDB).tex
 
 %.tex: %.lyx
 	if [ "$(srcdir)" != "." ] ; then \
-	  cp $< . ; \
-	  $(LYX) -e latex $(notdir $<) ; \
-	  rm $(notdir $<) ; \
-	else \
-	  $(LYX) -e latex $< ; \
+	  cp -f $(srcdir)/$(notdir $<) . ; \
 	fi
+	$(LYX) -e latex $(notdir $<);
 
 #%.ind: %.dvi
 #	$(LATEX) $*
@@ -117,14 +97,15 @@ $(CDB).html/index.html: $(CDB).tex
 #	# the glossary, not implemented yet
 #	# $(MAKEINDEX) -s l2hglo.ist -o $@ $<
 
-%.pdf: %.tex
-	$(PDFLATEX) $*
-	-$(MAKEINDEX) $*
-	$(PDFLATEX) $*
-	$(PDFLATEX) $*
-	$(PDFOPT) $*.pdf tmp.pdf
+%.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
+	mv $*-tmp.pdf $*.pdf
 
 archive: all
 	rm -rf sdcc-doc sdcc-doc.tar.bz2