Commit f07179bc authored by Filip Sieczkowski's avatar Filip Sieczkowski

Fixed a bug introduced by 8.4pl4 coq_makefile ("all" target arguments reversed).

parent 293d75e9
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# #
# This Makefile was generated by the command line : # This Makefile was generated by the command line :
# coq_makefile lib/ModuRes/ core_lang.v iris.v lang.v masks.v world_prop.v -R lib/ModuRes/ ModuRes -o Makefile # coq_makefile lib/ModuRes -R lib/ModuRes ModuRes core_lang.v iris.v lang.v masks.v world_prop.v -o Makefile
# #
.DEFAULT_GOAL := all .DEFAULT_GOAL := all
...@@ -39,8 +39,8 @@ $(call includecmdwithout@,$(COQBIN)coqtop -config) ...@@ -39,8 +39,8 @@ $(call includecmdwithout@,$(COQBIN)coqtop -config)
# # # #
########################## ##########################
COQLIBS?=-I . -R lib/ModuRes/ ModuRes COQLIBS?=-I . -R lib/ModuRes ModuRes
COQDOCLIBS?=-R lib/ModuRes/ ModuRes COQDOCLIBS?=-R lib/ModuRes ModuRes
########################## ##########################
# # # #
...@@ -108,7 +108,7 @@ endif ...@@ -108,7 +108,7 @@ endif
# # # #
####################################### #######################################
all: $(VOFILES) ./lib/ModuRes/ all: ./lib/ModuRes $(VOFILES)
spec: $(VIFILES) spec: $(VIFILES)
...@@ -142,7 +142,7 @@ beautify: $(VFILES:=.beautified) ...@@ -142,7 +142,7 @@ beautify: $(VFILES:=.beautified)
@echo 'Do not do "make clean" until you are sure that everything went well!' @echo 'Do not do "make clean" until you are sure that everything went well!'
@echo 'If there were a problem, execute "for file in $$(find . -name \*.v.old -print); do mv $${file} $${file%.old}; done" in your shell/' @echo 'If there were a problem, execute "for file in $$(find . -name \*.v.old -print); do mv $${file} $${file%.old}; done" in your shell/'
.PHONY: all opt byte archclean clean install userinstall depend html validate ./lib/ModuRes/ .PHONY: all opt byte archclean clean install userinstall depend html validate ./lib/ModuRes
################### ###################
# # # #
...@@ -150,8 +150,8 @@ beautify: $(VFILES:=.beautified) ...@@ -150,8 +150,8 @@ beautify: $(VFILES:=.beautified)
# # # #
################### ###################
./lib/ModuRes/: ./lib/ModuRes:
cd ./lib/ModuRes/ ; $(MAKE) all cd ./lib/ModuRes ; $(MAKE) all
#################### ####################
# # # #
...@@ -173,7 +173,7 @@ install: ...@@ -173,7 +173,7 @@ install:
for i in $(VOFILESINC); do \ for i in $(VOFILESINC); do \
install -m 0644 $$i $(DSTROOT)$(COQLIBINSTALL)/ModuRes/`basename $$i`; \ install -m 0644 $$i $(DSTROOT)$(COQLIBINSTALL)/ModuRes/`basename $$i`; \
done done
(cd ./lib/ModuRes/; $(MAKE) DSTROOT=$(DSTROOT) INSTALLDEFAULTROOT=$(INSTALLDEFAULTROOT)/./lib/ModuRes/ install) (cd ./lib/ModuRes; $(MAKE) DSTROOT=$(DSTROOT) INSTALLDEFAULTROOT=$(INSTALLDEFAULTROOT)/./lib/ModuRes install)
install-doc: install-doc:
install -d $(DSTROOT)$(COQDOCINSTALL)/ModuRes/html install -d $(DSTROOT)$(COQDOCINSTALL)/ModuRes/html
...@@ -185,11 +185,11 @@ clean: ...@@ -185,11 +185,11 @@ clean:
rm -f $(VOFILES) $(VIFILES) $(GFILES) $(VFILES:.v=.v.d) $(VFILES:=.beautified) $(VFILES:=.old) rm -f $(VOFILES) $(VIFILES) $(GFILES) $(VFILES:.v=.v.d) $(VFILES:=.beautified) $(VFILES:=.old)
rm -f all.ps all-gal.ps all.pdf all-gal.pdf all.glob $(VFILES:.v=.glob) $(VFILES:.v=.tex) $(VFILES:.v=.g.tex) all-mli.tex rm -f all.ps all-gal.ps all.pdf all-gal.pdf all.glob $(VFILES:.v=.glob) $(VFILES:.v=.tex) $(VFILES:.v=.g.tex) all-mli.tex
- rm -rf html mlihtml - rm -rf html mlihtml
(cd ./lib/ModuRes/ ; $(MAKE) clean) (cd ./lib/ModuRes ; $(MAKE) clean)
archclean: archclean:
rm -f *.cmx *.o rm -f *.cmx *.o
(cd ./lib/ModuRes/ ; $(MAKE) archclean) (cd ./lib/ModuRes ; $(MAKE) archclean)
printenv: printenv:
@$(COQBIN)coqtop -config @$(COQBIN)coqtop -config
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment