aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbarras2009-03-18 15:21:15 +0000
committerbarras2009-03-18 15:21:15 +0000
commit9e98f053e45b787a50b75f7667a2b251d84660a3 (patch)
treeda904aad87fe84f8fa485f915a4adb53350c0ee7
parent9f6f2eda9b288cd31186a7348eca82ea73dbf39b (diff)
renamed %-mod.ml into %_mod.ml to avoid ocaml warning
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@11994 85f007b7-540e-0410-9357-904b9bb8a0f7
-rw-r--r--Makefile2
-rw-r--r--Makefile.build6
-rw-r--r--Makefile.stage24
3 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 3f14cb161f..1413d0faad 100644
--- a/Makefile
+++ b/Makefile
@@ -195,7 +195,7 @@ indepclean:
rm -f $(COQTOPBYTE) $(COQMKTOPBYTE) $(COQCBYTE) $(CHICKENBYTE)
rm -f bin/coq-interface$(EXE) bin/coq-parser$(EXE)
find . -name '*~' -or -name '*.cm[ioa]' | xargs rm -f
- find . -name '*-mod.ml' | xargs rm -f
+ find . -name '*_mod.ml' | xargs rm -f
find contrib test-suite -name '*.vo' -or -name '*.glob' | xargs rm -f
rm -f */*.pp[iox] contrib/*/*.pp[iox]
rm -rf $(SOURCEDOCDIR)
diff --git a/Makefile.build b/Makefile.build
index 3fce3ec903..a3298230cc 100644
--- a/Makefile.build
+++ b/Makefile.build
@@ -909,7 +909,7 @@ endif
$(SHOW)'OCAMLYACC $<'
$(HIDE)$(OCAMLYACC) $<
-%-mod.ml: %.mllib
+%_mod.ml: %.mllib
sed -e "s/\([^ ]\+\)/let _=Mltop.add_known_module\"\1\" /g" $< > $@
echo "let _=Mltop.add_known_module\"$(notdir $*)\"" >> $@
@@ -974,8 +974,8 @@ checker/%.mli.d: $(D_DEPEND_BEFORE_SRC) checker/%.mli $(D_DEPEND_AFTER_SRC)
$(SHOW)'COQDEP $<'
$(HIDE)$(COQDEPBOOT) -slash -boot -c "$<" > "$@" \
|| ( RV=$$?; rm -f "$@"; exit $${RV} )
- echo "$*".cma: "$*"-mod.cmo >> "$@"
- echo "$*".cmxa "$*".cmxs: "$*"-mod.cmx >> "$@"
+ echo "$*".cma: "$*"_mod.cmo >> "$@"
+ echo "$*".cmxa "$*".cmxs: "$*"_mod.cmx >> "$@"
## Veerry nasty hack to keep ocamldep happy
%.ml: | %.ml4
diff --git a/Makefile.stage2 b/Makefile.stage2
index 56ca007931..9c1e461c48 100644
--- a/Makefile.stage2
+++ b/Makefile.stage2
@@ -11,8 +11,8 @@ include Makefile.doc
-include $(MLLIBFILES:.mllib=.mllib.d)
.SECONDARY: $(MLLIBFILES:.mllib=.mllib.d)
--include $(MLLIBFILES:%.mllib=%-mod.ml.d)
-.SECONDARY: $(MLLIBFILES:%.mllib=%-mod.ml.d)
+-include $(MLLIBFILES:%.mllib=%_mod.ml.d)
+.SECONDARY: $(MLLIBFILES:%.mllib=%_mod.ml.d)
-include $(ML4FILES:.ml4=.ml4.ml.d)
.SECONDARY: $(ML4FILES:.ml4=.ml4.ml.d)
-include $(VFILES:.v=.v.d)