Changeset 5 for trunk

Timestamp:

Jul 12, 2011, 9:15:33 AM (14 years ago)

Author:

g7moreau

Message:

• Add ARBO_BIB folder and search .bib inside
• Parametrized viewer
• Convert eps fig to pdf

File:

• trunk/Makefile (modified) (14 diffs)

trunk/Makefile

@@ -21 +21 @@
 ARBO_TEX := ./
 ARBO_FIG := $(ARBO_TEX)
+ARBO_BIB := $(ARBO_TEX)
 
 ################################################################
@@ -36 +37 @@
 BIBTEX        := bibtex
 L2H           := latex2html
-PDFTEXPRE     := export TEXMFOUTPUT="$(DIR_TMP)";
-PDFTEXPRE     += export TEXINPUTS="$(DIR_PROJET)/src:toto:$(DIR_TMP):";
-PDFTEXPRE     += export LANG="C";
 PDFTEX        := pdflatex
 DVIPS         := dvips 
@@ -45 +43 @@
 BIN_UNPROTECT := chmod u+w .
 
+DVI_VIEWER := xdvi
+PDF_VIEWER := xpdf
+PS_VIEWER  := gv
+
+
 # User Config
 ################################################################
@@ -54 +57 @@
 
 SRC_FIG     := $(notdir $(foreach dir,$(ARBO_FIG),$(wildcard $(dir)/*.fig)))
+SRC_EPS     := $(notdir $(foreach dir,$(ARBO_FIG),$(wildcard $(dir)/*.eps)))
+SRC_PDF     := $(notdir $(foreach dir,$(ARBO_FIG),$(wildcard $(dir)/*.pdf)))
+SRC_JPG     := $(notdir $(foreach dir,$(ARBO_FIG),$(wildcard $(dir)/*.jpg)))
+SRC_PNG     := $(notdir $(foreach dir,$(ARBO_FIG),$(wildcard $(dir)/*.png)))
+SRC_GIF     := $(notdir $(foreach dir,$(ARBO_FIG),$(wildcard $(dir)/*.gif)))
 SRC_TEX     := $(notdir $(foreach dir,$(ARBO_TEX),$(wildcard $(dir)/*.tex)))
-SRC_BIB     := biblio.bib
+SRC_BIB     := $(notdir $(foreach dir,$(ARBO_BIB),$(wildcard $(dir)/*.bib)))
 
 #OBJ_PSTEX   := $(patsubst %.fig,$(DIR_TMP)/%.pstex,  $(SRC_FIG))
@@ -64 +72 @@
 OBJ_PDFTEX_T := $(patsubst %.fig,$(DIR_TMP)/%.pdftex_t, $(SRC_FIG))
 
+OBJ_PDF4EPS  := $(patsubst %.eps,$(DIR_TMP)/%.pdf,      $(SRC_EPS))
+
+
 OBJ_BASE    := $(DIR_TMP)/$(DOCUMENT)
 
+PDFTEXPRE       := export TEXMFOUTPUT="$(DIR_TMP)";
+PDFTEXPRE       += export TEXINPUTS="$(DIR_PROJET)/src//:$(DIR_TMP):";
+PDFTEXPRE       += export LANG="C";
+
+BIBINPUTS       := $(subst //,/,$(subst / /,:/,$(foreach dir,$(ARBO_BIB),$(strip $(DIR_PROJET)/src/$(dir)/))))
+BIBTEXPRE   := cd $(DIR_TMP);
+BIBTEXPRE   += BIBINPUTS="$(BIBINPUTS)"
 
 RERUNTEX := "(There were undefined references|Rerun to get (cross-references|the bars) right)"
@@ -77 +95 @@
 vpath %.pdftex    $(DIR_TMP)
 vpath %.pdftex_t  $(DIR_TMP)
-vpath %.pdf     . $(DIR_TMP)
-vpath %.eps     . $(DIR_TMP)
+vpath %.pdf       $(ARBO_FIG) $(DIR_TMP)
+vpath %.eps       $(ARBO_FIG) $(DIR_TMP)
+vpath %.jpg       $(ARBO_FIG)
+vpath %.png       $(ARBO_FIG)
+vpath %.gif       $(ARBO_FIG)
+
+vpath %.bib                     $(ARBO_BIB)
 
 .PHONY: all dossier
@@ -104 +127 @@
 
 xpdf: $(DIR_TMP)/$(DOCUMENT).pdf
-        xpdf $(DIR_TMP)/$(DOCUMENT).pdf &
+        $(PDF_VIEWER) $(DIR_TMP)/$(DOCUMENT).pdf &
         @echo '############################################################'
         @echo '####  Visualisation de $(DOCUMENT)'
@@ -111 +134 @@
 xdvi: $(DIR_TMP)/$(DOCUMENT).dvi
         export XEDITOR="nedit-nc -line %l %f"; \
-        xdvi -bg grey95 $(DIR_TMP)/$(DOCUMENT) &
+        $(DVI_VIEWER) -bg grey95 $(DIR_TMP)/$(DOCUMENT) &
         @echo '############################################################'
         @echo '####  Visualisation de $(DOCUMENT)'
@@ -118 +141 @@
 
 gv:$(DIR_PS)/$(DOCUMENT).ps 
-        gv $(DIR_PS)/$(DOCUMENT).ps &
+        $(PS_VIEWER) $(DIR_PS)/$(DOCUMENT).ps &
         @echo '############################################################'
         @echo '####  Visualisation de $(DOCUMENT)'
@@ -141 +164 @@
 
 html: $(DIR_HTML)
-        latex2html -split 3 -local_icons -no_math -white \
+        $(L2H) -split 3 -local_icons -no_math -white \
         -tmp /tmp -dir $(DIR_HTML) -prefix $(DOCUMENT) -antialias $(DOCUMENT).tex
 
@@ -173 +196 @@
         @echo OBJ_PSTEX     $(OBJ_PSTEX)
         @echo OBJ_PSTEX_T   $(OBJ_PSTEX_T)
+        @echo OBJ_PDF4EPS   $(OBJ_PDF4EPS)
         @echo OBJ_PDF       $(OBJ_PDF)
 
@@ -211 +235 @@
 #--------------------------------------------------------------#
 
-figure: $(OBJ_PDF) $(OBJ_PDFTEX_T) $(OBJ_EPS) $(OBJ_PSTEX_T)
+figure: $(OBJ_PDF) $(OBJ_PDFTEX_T) $(OBJ_EPS) $(OBJ_PSTEX_T) $(OBJ_PDF4EPS)
         @echo '############################################################'
         @echo '####  Fin des figures'
@@ -258 +282 @@
         @echo '####  Debut de la bibliographie'
         @echo '############################################################'
-        $(BIBTEX) $(OBJ_BASE)
+        $(BIBTEXPRE) $(BIBTEX) $(OBJ_BASE)
         @echo '############################################################'
         @echo '####  Fin de la bibliographie'
@@ -368 +392 @@
 #       fig2dev -L pstex_t -p $^ $@
 
+$(DIR_TMP)/%.pdf: %.eps
+        @echo eps2pdf $< $@
+        epstopdf $< --outfile $@
+
 ifeq "$(QUIX)" "A.linux"
 $(DIR_TMP)/%.pdftex: %.fig