changed the log names, so they all begin with LOG_, made a var MASTER_FILE so that it can be passed in, so it will echo correct things when making a thornguide for a configuration (e.g., it will echo ''creating thornguide-einstein.ps instead of thornguide.ps)

git-svn-id: http://svn.cactuscode.org/flesh/trunk@2761 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 18 insertions, 15 deletions

diff --git a/doc/ThornGuide/Makefile b/doc/ThornGuide/Makefile
index 63b03191..26acb1f7 100644
--- a/doc/ThornGuide/Makefile
+++ b/doc/ThornGuide/Makefile
@@ -24,9 +24,12 @@ ifeq ($(strip $(PERL)), )
    PERL=/usr/bin/perl
 endif
 
+ifeq ($(strip $(MASTER_FILE)), )
+   MASTER_FILE=ThornGuide
+endif
+
 IMAGE_FILE=$(CCTK_HOME)/doc/UsersGuide/bincactus2.eps
 
-MASTER_FILE=ThornGuide
 
 -include make.thornlist
 
@@ -36,7 +39,7 @@ default : $(MASTER_FILE).ps
 
 $(MASTER_FILE).ps: $(MASTER_FILE).dvi 
 	@echo "  Running dvips on $<"
-	dvips -f $< 2> DVIPS_MESSAGES | $(CCTK_HOME)/lib/sbin/FixPageNumbersInPostscript.pl > $@ 
+	dvips -f $< 2> LOG_DVIPS_MSGS | $(CCTK_HOME)/lib/sbin/FixPageNumbersInPostscript.pl > $@ 
 	if test -e "$@"; then                                  \
 	   echo "     $@ created.";                              \
 	else                                                   \
@@ -45,10 +48,10 @@ $(MASTER_FILE).ps: $(MASTER_FILE).dvi
 
 $(MASTER_FILE).dvi: $(MASTER_FILE).tex
 	@echo "  Latexing $<"
-	latex -interaction=nonstopmode $< >  LATEX_MSGS 2>&1; \
-	latex -interaction=nonstopmode $< >> LATEX_MSGS 2>&1; \
-	latex -interaction=nonstopmode $< >> LATEX_MSGS 2>&1; \
-	latex -interaction=nonstopmode $< >> LATEX_MSGS 2>&1;  \
+	latex -interaction=nonstopmode $< >  LOG_LATEX_MSGS 2>&1; \
+	latex -interaction=nonstopmode $< >> LOG_LATEX_MSGS 2>&1; \
+	latex -interaction=nonstopmode $< >> LOG_LATEX_MSGS 2>&1; \
+	latex -interaction=nonstopmode $< >> LOG_LATEX_MSGS 2>&1;  \
 	if test -e "$@"; then                                  \
 	   echo "     $@ created.";                              \
 	else                                                   \
@@ -58,10 +61,10 @@ $(MASTER_FILE).dvi: $(MASTER_FILE).tex
 $(MASTER_FILE).pdf: $(MASTER_FILE).tex
 	@echo "  Running pdflatex on $<"
 
-	pdflatex -interaction=nonstopmode $< >  PDFLATEX_MSGS 2>&1; \
-	pdflatex -interaction=nonstopmode $< >> PDFLATEX_MSGS 2>&1; \
-	pdflatex -interaction=nonstopmode $< >> PDFLATEX_MSGS 2>&1; \
-	pdflatex -interaction=nonstopmode $< >> PDFLATEX_MSGS 2>&1
+	pdflatex -interaction=nonstopmode $< >  LOG_PDFLATEX_MSGS 2>&1; \
+	pdflatex -interaction=nonstopmode $< >> LOG_PDFLATEX_MSGS 2>&1; \
+	pdflatex -interaction=nonstopmode $< >> LOG_PDFLATEX_MSGS 2>&1; \
+	pdflatex -interaction=nonstopmode $< >> LOG_PDFLATEX_MSGS 2>&1
 
 	if test -e "$@"; then                                  \
 	   echo "     $@ created.";                              \
@@ -70,16 +73,16 @@ $(MASTER_FILE).pdf: $(MASTER_FILE).tex
 	fi ;                                                  
 
 $(MASTER_FILE).tex:  $(foreach thorn, $(THORNS), $(thorn)/param.ccl $(thorn)/interface.ccl $(thorn)/schedule.ccl)
-	@echo "  Creating thorn documentation ThornGuide.tex"
+	@echo "  Creating thorn documentation $(MASTER_FILE).tex"
 	@echo "    Processing ..."
 	@echo "       param.ccl ..."
-	$(PERL) -s $(CCTK_HOME)/lib/sbin/ParamLatex.pl -cctk_home=$(CCTK_HOME) -directory=$(ARRANGEMENTS_DIR) -thornlist=$(THORNLIST) -outdir=./ -section -grouping=bythorn -sort=scope > PARAMLATEX_MSGS 2>&1
+	$(PERL) -s $(CCTK_HOME)/lib/sbin/ParamLatex.pl -cctk_home=$(CCTK_HOME) -directory=$(ARRANGEMENTS_DIR) -thornlist=$(THORNLIST) -outdir=./ -section -grouping=bythorn -sort=scope > LOG_PARAMLATEX_MSGS 2>&1
 	@echo "       interface.ccl ..."
-	$(PERL) -s $(CCTK_HOME)/lib/sbin/InterLatex.pl -cctk_home=$(CCTK_HOME) -directory=$(ARRANGEMENTS_DIR) -thornlist=$(THORNLIST) -outdir=./ -section -grouping=bythorn > INTERLATEX_MSGS 2>&1
+	$(PERL) -s $(CCTK_HOME)/lib/sbin/InterLatex.pl -cctk_home=$(CCTK_HOME) -directory=$(ARRANGEMENTS_DIR) -thornlist=$(THORNLIST) -outdir=./ -section -grouping=bythorn > LOG_INTERLATEX_MSGS 2>&1
 	@echo "       schedule.ccl ..."
-	$(PERL) -s $(CCTK_HOME)/lib/sbin/SchedLatex.pl -cctk_home=$(CCTK_HOME) -directory=$(ARRANGEMENTS_DIR) -thornlist=$(THORNLIST) -outdir=./ -section > SCHEDLATEX_MSGS 2>&1
+	$(PERL) -s $(CCTK_HOME)/lib/sbin/SchedLatex.pl -cctk_home=$(CCTK_HOME) -directory=$(ARRANGEMENTS_DIR) -thornlist=$(THORNLIST) -outdir=./ -section > LOG_SCHEDLATEX_MSGS 2>&1
 	@echo "  Creating $@ ..."
-	$(PERL) -s $(CCTK_HOME)/lib/sbin/ThornGuide.pl -cctk_home=$(CCTK_HOME) -directory=$(ARRANGEMENTS_DIR) -thornlist=$(THORNLIST) -outdir=./ > THORNGUIDE_MSGS 2>&1
+	$(PERL) -s $(CCTK_HOME)/lib/sbin/ThornGuide.pl -cctk_home=$(CCTK_HOME) -directory=$(ARRANGEMENTS_DIR) -thornlist=$(THORNLIST) -outdir=./ -outfile=$(MASTER_FILE).tex > LOG_THORNGUIDE_MSGS 2>&1
 	if test -e $(IMAGE_FILE) && test ! -e "bincactus.eps"; then \
 	   cp $(IMAGE_FILE) bincactus.eps;                          \
 	fi ;