X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=all%2FMakefile;h=d16d41d911f2883eee218d0b2811dfb12001a469;hb=71591254f1348712bb2027592e1b83f605e94b04;hp=a45b7e46a9b6428f2ef298934cfbd932ebdb5fc1;hpb=e4275f14cd4e66ad194d92748007d6f9b83b0f40;p=ads1.git

diff --git a/all/Makefile b/all/Makefile
index a45b7e4..d16d41d 100644
--- a/all/Makefile
+++ b/all/Makefile
@@ -1,5 +1,5 @@
 P=ads
-X:=$(shell for a in 0 ; do echo ../$$a-*/$$a-*.tex ; done)
+X:=$(shell for a in 1 2 3 4 6 ; do echo ../$$a-*/$$a-*.tex ; done)
 
 %universe: all ChangeLog
 
@@ -11,15 +11,15 @@ ads.dvi: ads.tex body.tex
 body.tex: $(X) preprocess
 	./preprocess $(X) >$@
 
-%ChangeLog:
-%	git-log -C --pretty=medium --since='4 weeks ago' --stat | grep -v '^---' >ChangeLog
+ChangeLog:
+	git-log -C --pretty=medium --since='4 weeks ago' --stat | grep -v '^---' >ChangeLog
 
 clean::
 	rm -f body.tex ChangeLog
 
 upload::
 	make $P.ps $P-2in1.ps
-	scp -C $P.ps $P-2in1.ps jabberwock:www/vyuka/0607/ads/
+	scp -C $P.ps $P-2in1.ps jabberwock:www/vyuka/0607/ads1/
 	( cd .. && make clean )
-	( cd ../.. && tar czf - --exclude .git ads ) | ssh jabberwock 'cd www/vyuka/0607/ads/ && cat >ads.tar.gz.new && mv ads.tar.gz.new ads.tar.gz'
-	#make ChangeLog && cat ChangeLog | ssh jabberwock 'cd www/vyuka/ads && cat >ChangeLog.new && mv ChangeLog.new ChangeLog'
+	( cd ../.. && tar czf - --exclude .git ads ) | ssh jabberwock 'cd www/vyuka/0607/ads1/ && cat >ads.tar.gz.new && mv ads.tar.gz.new ads.tar.gz'
+	make ChangeLog && cat ChangeLog | ssh jabberwock 'cd www/vyuka/ads1 && cat >ChangeLog.new && mv ChangeLog.new ChangeLog'