summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlain Frisch <alain@frisch.fr>2008-04-22 12:26:48 +0000
committerAlain Frisch <alain@frisch.fr>2008-04-22 12:26:48 +0000
commitefe8d094625f8beac976a1567799ad70cfdc1330 (patch)
tree9d0094b2b0cffc4d8366a67472dac2b6b9117ec9
parent291a4207ad7a34f2e59f2ecfd6e0fb14afd31c62 (diff)
Revert last commit.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8874 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--Makefile.nt26
1 files changed, 9 insertions, 17 deletions
diff --git a/Makefile.nt b/Makefile.nt
index ce1ec743e..99d4b6cdc 100644
--- a/Makefile.nt
+++ b/Makefile.nt
@@ -233,7 +233,7 @@ installbyt:
mkdir -p $(STUBLIBDIR)
for i in $(OTHERLIBRARIES); do $(MAKEREC) -C otherlibs/$$i install; done
cd win32caml ; $(MAKE) install
-# ./build/partial-install.sh
+ ./build/partial-install.sh
cp config/Makefile $(LIBDIR)/Makefile.config
cp README $(DISTRIB)/Readme.general.txt
cp README.win32 $(DISTRIB)/Readme.windows.txt
@@ -583,25 +583,17 @@ alldepend::
# Camlp4
-#camlp4out: ocamlc otherlibraries ocamlbuild-partial-boot ocamlbuild.byte
-# ./build/camlp4-byte-only.sh
-#camlp4opt: ocamlopt otherlibrariesopt ocamlbuild-partial-boot ocamlbuild.native
-# ./build/camlp4-native-only.sh
-
-camlp4out:
-
-camlp4opt:
+camlp4out: ocamlc otherlibraries ocamlbuild-partial-boot ocamlbuild.byte
+ ./build/camlp4-byte-only.sh
+camlp4opt: ocamlopt otherlibrariesopt ocamlbuild-partial-boot ocamlbuild.native
+ ./build/camlp4-native-only.sh
# Ocamlbuild
-ocamlbuild.byte:
-
-ocamlbuild.native:
-
-#ocamlbuild.byte: ocamlc otherlibraries ocamlbuild-partial-boot
-# ./build/ocamlbuild-byte-only.sh
-#ocamlbuild.native: ocamlopt otherlibrariesopt ocamlbuild-partial-boot
-# ./build/ocamlbuild-native-only.sh
+ocamlbuild.byte: ocamlc otherlibraries ocamlbuild-partial-boot
+ ./build/ocamlbuild-byte-only.sh
+ocamlbuild.native: ocamlopt otherlibrariesopt ocamlbuild-partial-boot
+ ./build/ocamlbuild-native-only.sh
ocamlbuildlib.native: ocamlopt otherlibrariesopt ocamlbuild-partial-boot
./build/ocamlbuildlib-native-only.sh