X-Git-Url: http://git.megacz.com/?p=coq-hetmet.git;a=blobdiff_plain;f=Makefile;h=b8851aaa768287b7c09c178ce4379ef2af9c2519;hp=7959831e0c9099f3f3e81fa1f0a7cc7ab9e6dead;hb=2202d864c3a2779a33f3f7d6c411d2d16770073e;hpb=dceacf3f8630d0562bfb4e1bd2dc16880dbf3b7d

diff --git a/Makefile b/Makefile
index 7959831..b8851aa 100644
--- a/Makefile
+++ b/Makefile
@@ -10,16 +10,30 @@ build/CoqPass.hs: $(allfiles)
 	cat src/Extraction-prefix.hs                                     > build/CoqPass.hs
 	cat build/Extraction.hs | grep -v '^module' | grep -v '^import' >> build/CoqPass.hs
 
-build/Makefile.coq: $(coqfiles)
+build/Makefile.coq: $(coqfiles) src/categories/src
 	mkdir -p build
 	rm -f build/*.v
 	rm -f build/*.d
-	cd build; ln -s ../src/*.v .
+	cd build; ln -fs `find ../src -name \*.v` .
 	cd build; coq_makefile *.v > Makefile.coq
 
+src/categories/src:
+	git submodule update --init src/categories
+	cd compiler/categories; git checkout master
+
 clean:
 	rm -rf build
 
+merged:
+	mkdir -p .temp
+	cd src; for A in *.v; do cat $$A  | grep -v '^Require Import' > ../.temp/`echo $$A | sed s_\\\\.v_._`; done
+	cd src/categories/src; for A in *.v; do cat $$A  | grep -v '^Require Import' > ../../../.temp/`echo $$A | sed s_\\\\.v_._`; done
+	cp src/Banner.v .temp/GArrows.v
+	cd .temp; grep '^Require Import ' ../src/All.v | sed 's_Require Import _echo;echo;echo;echo;echo;cat _' | bash >> GArrows.v
+	cd .temp; time $(coqc) -dont-load-proofs -verbose GArrows.v
+	echo
+	echo COMPILATION OK
+	echo
 
 
 # this is for Adam's use only!