Changeset 10 for trunk/Makefile

Timestamp:

Jul 12, 2011, 7:29:11 PM (14 years ago)

Author:

g7moreau

Message:

• Transcode figure to eps for latex

File:

• trunk/Makefile (modified) (14 diffs)

trunk/Makefile

@@ -69 +69 @@
 SRC_BIB     := $(notdir $(foreach dir,$(ARBO_BIB),$(wildcard $(dir)/*.bib)))
 
-#OBJ_PSTEX   := $(patsubst %.fig,$(DIR_TMP)/%.pstex,  $(SRC_FIG))
-#OBJ_PDFTEX   := $(patsubst %.fig,$(DIR_TMP)/%.pdftex,   $(SRC_FIG))
-OBJ_EPS      := $(patsubst %.fig,$(DIR_TMP)/%.eps,      $(SRC_FIG))
-OBJ_PSTEX_T  := $(patsubst %.fig,$(DIR_TMP)/%.pstex_t,  $(SRC_FIG))
-OBJ_PDF      := $(patsubst %.fig,$(DIR_TMP)/%.pdf,      $(SRC_FIG))
-OBJ_PDFTEX_T := $(patsubst %.fig,$(DIR_TMP)/%.pdftex_t, $(SRC_FIG))
-
-OBJ_PDF4EPS  := $(patsubst %.eps,$(DIR_TMP)/%.pdf,      $(SRC_EPS))
-
+OBJ_FIG2EPS      := $(patsubst %.fig,$(DIR_TMP)/%.eps,      $(SRC_FIG))
+OBJ_FIG2PSTEX_T  := $(patsubst %.fig,$(DIR_TMP)/%.pstex_t,  $(SRC_FIG))
+OBJ_FIG2PDF      := $(patsubst %.fig,$(DIR_TMP)/%.pdf,      $(SRC_FIG))
+OBJ_FIG2PDFTEX_T := $(patsubst %.fig,$(DIR_TMP)/%.pdftex_t, $(SRC_FIG))
+OBJ_EPS2PDF      := $(patsubst %.eps,$(DIR_TMP)/%.pdf,      $(SRC_EPS))
+OBJ_JPG2EPS      := $(patsubst %.jpg,$(DIR_TMP)/%.eps,      $(SRC_JPG))
+OBJ_PNG2EPS      := $(patsubst %.png,$(DIR_TMP)/%.eps,      $(SRC_PNG))
+OBJ_GIF2EPS      := $(patsubst %.gif,$(DIR_TMP)/%.eps,      $(SRC_GIF))
 
 OBJ_BASE    := $(DIR_TMP)/$(DOCUMENT)
@@ -85 +84 @@
 
 PDFTEXPRE   := export TEXMFOUTPUT="$(DIR_TMP)";
-#PDFTEXPRE   += export TEXINPUTS="$(DIR_PROJET)/src//:$(DIR_PROJET)/src/Figures:$(DIR_TMP):";
 PDFTEXPRE   += export TEXINPUTS="$(TEXINPUTS)";
 PDFTEXPRE   += export LANG="C";
@@ -108 +106 @@
 vpath %.png       $(ARBO_FIG)
 vpath %.gif       $(ARBO_FIG)
-
-vpath %.bib                     $(ARBO_BIB)
+vpath %.bib       $(ARBO_BIB)
 
 .PHONY: all folder
@@ -155 +152 @@
         @echo '############################################################'
 
+#--------------------------------------------------------------#
+
 vims:
         vim --servername DOC $(DOCUMENT).tex
@@ -207 +206 @@
         @echo '### Liste des variables '
         @echo '############################################################'
-        @echo SRC_FIG       $(SRC_FIG)
-        @echo SRC_TEX       $(SRC_TEX)
-        @echo OBJ_PSTEX     $(OBJ_PSTEX)
-        @echo OBJ_PSTEX_T   $(OBJ_PSTEX_T)
-        @echo OBJ_PDF4EPS   $(OBJ_PDF4EPS)
-        @echo OBJ_PDF       $(OBJ_PDF)
+        @echo SRC_FIG         $(SRC_FIG)
+        @echo SRC_TEX         $(SRC_TEX)
+        @echo OBJ_PSTEX       $(OBJ_PSTEX)
+        @echo OBJ_FIG2PSTEX_T $(OBJ_FIG2PSTEX_T)
+        @echo OBJ_EPS2PDF     $(OBJ_EPS2PDF)
+        @echo OBJ_FIG2PDF     $(OBJ_FIG2PDF)
 
 clean: 
@@ -235 +234 @@
         $(DOCUMENT).pdf \
         $(OBJ_PSTEX) \
-        $(OBJ_PSTEX_T) \
-        $(OBJ_PDF) \
+        $(OBJ_FIG2PSTEX_T) \
+        $(OBJ_FIG2PDF) \
         $(DIR_PDF)/$(DOCUMENT).pdf \
         $(DIR_TMP)/*
@@ -250 +249 @@
 #--------------------------------------------------------------#
 
-figure: $(OBJ_PDF) $(OBJ_PDFTEX_T) $(OBJ_EPS) $(OBJ_PSTEX_T) $(OBJ_PDF4EPS)
+figure: $(OBJ_FIG2PDF) $(OBJ_FIG2PDFTEX_T) $(OBJ_FIG2EPS) $(OBJ_FIG2PSTEX_T)
         @echo '############################################################'
         @echo '####  Fin des figures'
@@ -271 +270 @@
 #--------------------------------------------------------------#
 
-pdflatex: folder figure
+pdflatex: folder figure $(OBJ_EPS2PDF)
         @echo '############################################################'
         @echo '####  Debut du formateur pdflatex'
@@ -282 +281 @@
         @echo '############################################################'
 
-latex: figure
+latex: folder figure $(OBJ_JPG2EPS) $(OBJ_PNG2EPS) $(OBJ_GIF2EPS)
         @echo '############################################################'
         @echo '####  Debut du formateur latex'
@@ -329 +328 @@
 dvi: $(DIR_TMP)/dvi.ok
 
-$(DIR_TMP)/pdf.ok: $(DOCUMENT).tex $(SRC_TEX) $(OBJ_PDF) $(OBJ_PDFTEX_T)
+$(DIR_TMP)/pdf.ok: $(DOCUMENT).tex $(SRC_TEX) $(OBJ_FIG2PDF) $(OBJ_FIG2PDFTEX_T)
         make pdflatex
         touch $<
 
-$(DIR_TMP)/dvi.ok: $(DOCUMENT).tex $(SRC_TEX) $(OBJ_EPS) $(OBJ_PSTEX_T)
+$(DIR_TMP)/dvi.ok: $(DOCUMENT).tex $(SRC_TEX) $(OBJ_FIG2EPS) $(OBJ_FIG2PSTEX_T)
         make latex
         touch $<
@@ -339 +338 @@
 ################################################################
 
-$(DIR_TMP)/$(DOCUMENT).pdf: $(DOCUMENT).tex $(SRC_BIB) $(SRC_TEX) $(OBJ_PDF) $(OBJ_PSTEX_T)
+$(DIR_TMP)/$(DOCUMENT).pdf: $(DOCUMENT).tex $(SRC_BIB) $(SRC_TEX) $(OBJ_FIG2PDF) $(OBJ_FIG2PSTEX_T)
         $(COPYTOC)
         make pdflatex
@@ -354 +353 @@
 ################################################################
 
-$(DIR_TMP)/$(DOCUMENT).dvi: $(DOCUMENT).tex $(SRC_BIB) $(SRC_TEX) $(OBJ_EPS) $(OBJ_PSTEX_T)
+$(DIR_TMP)/$(DOCUMENT).dvi: $(DOCUMENT).tex $(SRC_BIB) $(SRC_TEX) $(OBJ_FIG2EPS) $(OBJ_FIG2PSTEX_T)
         $(COPYTOC)
         make latex
@@ -407 +406 @@
 #       fig2dev -L pstex_t -p $^ $@
 
-$(DIR_TMP)/%.pdf: %.eps
-        @echo eps2pdf $< $@
-        epstopdf $< --outfile $@
-
 ifeq "$(QUIX)" "A.linux"
 $(DIR_TMP)/%.pdftex: %.fig
@@ -435 +430 @@
 #       fig2dev -L pdftex_t -E 1 -p $* $< $@
 
+
+$(DIR_TMP)/%.pdf: %.eps
+        epstopdf $< --outfile $@
+
+$(DIR_TMP)/%.eps: %.jpg
+        convert $< $@
+
+$(DIR_TMP)/%.eps: %.png
+        convert $< $@
+
+$(DIR_TMP)/%.eps: %.gif
+        convert $< $@
+
 ################################################################
 # dossier