Changeset 6

Timestamp:

Jul 12, 2011, 3:58:28 PM (14 years ago)

Author:

g7moreau

Message:

• Auto adjust TEXINPUTS
• Add BSTINPUTS for bibtex
• Change dossier by folder keyword
• Create folder when use make pdflatex

File:

• trunk/Makefile (modified) (5 diffs)

trunk/Makefile

@@ -77 +77 @@
 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)/))))
+TEXINPUTS   := $(subst //,/,$(subst / /,:/,$(foreach dir,$(ARBO_TEX),$(strip $(DIR_PROJET)/src/$(dir)/)))):$(DIR_TMP):
+BIBINPUTS   := $(subst //,/,$(subst / /,:/,$(foreach dir,$(ARBO_BIB),$(strip $(DIR_PROJET)/src/$(dir)/))))
+
+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";
+
 BIBTEXPRE   := cd $(DIR_TMP);
 BIBTEXPRE   += BIBINPUTS="$(BIBINPUTS)"
+BIBTEXPRE   += BSTINPUTS="$(BIBINPUTS)"
 
 RERUNTEX := "(There were undefined references|Rerun to get (cross-references|the bars) right)"
@@ -103 +107 @@
 vpath %.bib                     $(ARBO_BIB)
 
-.PHONY: all dossier
+.PHONY: all folder
 .PHONY: doc docps docpdf
 .PHONY: html
@@ -117 +121 @@
 #--------------------------------------------------------------#
 
-all: dossier doc
-
-dossier: $(DIR_HTML) $(DIR_PS) $(DIR_PDF) $(DIR_TMP)
+all: folder doc
+
+folder: $(DIR_HTML) $(DIR_PS) $(DIR_PDF) $(DIR_TMP)
         @echo '############################################################'
         @echo '### Fin de la gestion des dossiers'
@@ -256 +260 @@
 #--------------------------------------------------------------#
 
-pdflatex: figure
+pdflatex: folder figure
         @echo '############################################################'
         @echo '####  Debut du formateur pdflatex'
@@ -292 +296 @@
         @echo '############################################################'
         @echo '# all       -> compilation complete'
-        @echo '# dossier   -> création des dossiers du projet'
+        @echo '# folder    -> création des dossiers du projet'
         @echo '# clean     -> nettoyage partiel'
         @echo '# pdf       -> compilation simple avec dependance -> pdf'