Merge branch 'master' of ssh://gapil.gnulinux.it/srv/git/gapil

[gapil.git] / Makefile

diff --git a/Makefile b/Makefile
index a6a12e61889e38ba04174ede07fc04c91ff72c9b..00a8e2ff4ccec1d0fd26a644376f046b19c754b4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,17 @@
-SOURCE_IMG = $(wildcard img/*.dia)
-PS_IMG = $(SOURCE_IMG:.dia=.ps)
-EPS_IMG = $(SOURCE_IMG:.dia=.eps)
-PDF_IMG = $(SOURCE_IMG:.dia=.pdf)
-SOURCE =  $(wildcard sources/*.c) $(wildcard sources/*.h) sources/Makefile
+SRC_IMG = $(wildcard img/*.dia)
+PS_IMG  = $(SRC_IMG:.dia=.ps)
+EPS_IMG = $(SRC_IMG:.dia=.eps)
+PDF_IMG = $(SRC_IMG:.dia=.pdf)
+SRC    =  $(wildcard sources/*.c) $(wildcard sources/*.h) sources/Makefile
 CODE_C =  $(wildcard listati/*.c) 
 CODE_H =  $(wildcard listati/*.h)
 HTML_C =  $(CODE_C:.c=.c.html) 
 HTML_H =  $(CODE_H:.h=.h.html) 
+VARIE = README ChangeLog *.sh htgapil.cfg tex4ht.env htgapil/* html/*.html 
+ALL_SRC = $(SRC_IMG) $(SRC) *.tex Makefile $(VARIE) *.bib $(CODE_C) $(CODE_H)
 
-all: $(PDF_IMG) gapil.tgz $(HTML_C) $(HTML_H) #htm 
+
+all: $(PDF_IMG) $(HTML_C) $(HTML_H) gapil.pdf
 
 $(HTML_C):  %.c.html: %.c
        source-highlight -f html -s cpp $<
@@ -16,8 +19,8 @@ $(HTML_C):  %.c.html: %.c
 $(HTML_H):  %.h.html: %.h
        source-highlight -f html -s cpp $<
 
-$(PDF_IMG): %.pdf: %.ps
-       epstopdf $< --outfile=$@
+$(PDF_IMG): %.pdf: %.eps
+       GS_OPTIONS="-dAutoRotatePages=/None" epstopdf $< --outfile=$@
 
 $(PS_IMG): %.ps : %.eps
        eps2eps $< $@ 
@@ -25,27 +28,31 @@ $(PS_IMG): %.ps : %.eps
 $(EPS_IMG): %.eps : %.dia
        dia --nosplash -e $@ $< 
 
-gapil.tgz: $(SOURCE) sources/Makefile
+gapil_source.tgz: $(SRC) 
        tar -cvz -f $@ $^
 
-htm: *.tex
-       scp -r gapil/* piccardi@firenze.linux.it:public_html/gapil/html
-       scp gapil.p* piccardi@firenze.linux.it:public_html/gapil/
+gapil.tgz:  $(ALL_SRC)
+       tar -cvz -f $@ $^
 
 gapil.dvi:  *.tex
        latex gapil.tex
 
-gapil.pdf:  *.tex
+gapil.pdf:  *.tex Makefile
+       pdflatex gapil.tex
+       bibtex gapil
+       makeindex gapil.idx
        pdflatex gapil.tex
 
 gapil.ps: gapil.dvi 
        dvips -o gapil.ps gapil.dvi
 
-install:
-       scp -r gapil.p*  piccardi@firenze.linux.it:public_html/gapil
-       scp -r gapil/*  piccardi@firenze.linux.it:public_html/gapil/html
-       scp html/*.html piccardi@firenze.linux.it:public_html/gapil/
+#install: gapil.pdf gapil.dvi 
+#      scp gapil.p* gapil_source.* piccardi@firenze.linux.it:public_html/gapil
+#      scp html/*.html piccardi@firenze.linux.it:public_html/gapil/
+#      scp gapil.p* gapil_source.tgz root@truelite.it:/var/www/gapil
+#      scp html/*.html root@truelite.it:/var/www/gapil/
+
 clean: 
        rm -f *.dvi *.log *.ps *.html *.aux *.toc *.rel *.ilg *.rip *.ind \
-       *.pdf  *.out *.idx *~ listati/*.html img/*.ps img/*.pdf
+       *.pdf  *.out *.idx *~ listati/*.html img/*.ps img/*.eps img/*.pdf