Skip to content

Commit 2258650

Browse files
alainfrischalainfrisch
committed
Fix EOL convention.
1 parent be66fcc commit 2258650

File tree

4 files changed

+330
-330
lines changed

4 files changed

+330
-330
lines changed

‎Makefile.shared

+135-135
Original file line numberDiff line numberDiff line change
@@ -1,135 +1,135 @@
1-
#########################################################################
2-
# #
3-
# OCaml #
4-
# #
5-
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
6-
# #
7-
# Copyright 1999 Institut National de Recherche en Informatique et #
8-
# en Automatique. All rights reserved. This file is distributed #
9-
# under the terms of the Q Public License version 1.0. #
10-
# #
11-
#########################################################################
12-
13-
# The main Makefile, fragments shared between Makefile and Makefile.nt
14-
15-
include config/Makefile
16-
CAMLRUN ?= boot/ocamlrun
17-
CAMLYACC ?= boot/ocamlyacc
18-
include stdlib/StdlibModules
19-
20-
CAMLC=$(CAMLRUN) boot/ocamlc -g -nostdlib -I boot
21-
CAMLOPT=$(CAMLRUN) ./ocamlopt -g -nostdlib -I stdlib -I otherlibs/dynlink
22-
COMPFLAGS=-strict-sequence -w +33..39+48+50 -warn-error A -bin-annot \
23-
-safe-string $(INCLUDES)
24-
LINKFLAGS=
25-
26-
YACCFLAGS=-v
27-
CAMLLEX=$(CAMLRUN) boot/ocamllex
28-
CAMLDEP=$(CAMLRUN) tools/ocamldep
29-
DEPFLAGS=$(INCLUDES)
30-
31-
OCAMLBUILDBYTE=$(WITH_OCAMLBUILD:=.byte)
32-
OCAMLBUILDNATIVE=$(WITH_OCAMLBUILD:=.native)
33-
34-
OCAMLDOC_OPT=$(WITH_OCAMLDOC:=.opt)
35-
36-
INCLUDES=-I utils -I parsing -I typing -I bytecomp -I asmcomp -I driver \
37-
-I toplevel
38-
39-
UTILS=utils/config.cmo utils/clflags.cmo \
40-
utils/misc.cmo utils/tbl.cmo \
41-
utils/terminfo.cmo utils/ccomp.cmo utils/warnings.cmo \
42-
utils/consistbl.cmo
43-
44-
PARSING=parsing/location.cmo parsing/longident.cmo \
45-
parsing/docstrings.cmo parsing/ast_helper.cmo \
46-
parsing/syntaxerr.cmo parsing/parser.cmo \
47-
parsing/lexer.cmo parsing/parse.cmo parsing/printast.cmo \
48-
parsing/pprintast.cmo \
49-
parsing/ast_mapper.cmo parsing/attr_helper.cmo \
50-
parsing/builtin_attributes.cmo
51-
52-
TYPING=typing/ident.cmo typing/path.cmo \
53-
typing/primitive.cmo typing/types.cmo \
54-
typing/btype.cmo typing/oprint.cmo \
55-
typing/subst.cmo typing/predef.cmo \
56-
typing/datarepr.cmo typing/cmi_format.cmo typing/env.cmo \
57-
typing/typedtree.cmo typing/printtyped.cmo typing/ctype.cmo \
58-
typing/printtyp.cmo typing/includeclass.cmo \
59-
typing/mtype.cmo typing/envaux.cmo typing/includecore.cmo \
60-
typing/typedtreeIter.cmo typing/typedtreeMap.cmo \
61-
typing/tast_mapper.cmo \
62-
typing/cmt_format.cmo \
63-
typing/includemod.cmo typing/typetexp.cmo typing/parmatch.cmo \
64-
typing/stypes.cmo typing/typecore.cmo \
65-
typing/typedecl.cmo typing/typeclass.cmo \
66-
typing/typemod.cmo typing/untypeast.cmo
67-
68-
COMP=bytecomp/lambda.cmo bytecomp/printlambda.cmo \
69-
bytecomp/typeopt.cmo bytecomp/switch.cmo bytecomp/matching.cmo \
70-
bytecomp/translobj.cmo bytecomp/translattribute.cmo \
71-
bytecomp/translcore.cmo \
72-
bytecomp/translclass.cmo bytecomp/translmod.cmo \
73-
bytecomp/simplif.cmo bytecomp/runtimedef.cmo \
74-
driver/pparse.cmo driver/main_args.cmo \
75-
driver/compenv.cmo driver/compmisc.cmo
76-
77-
COMMON=$(UTILS) $(PARSING) $(TYPING) $(COMP)
78-
79-
BYTECOMP=bytecomp/meta.cmo bytecomp/instruct.cmo bytecomp/bytegen.cmo \
80-
bytecomp/printinstr.cmo bytecomp/opcodes.cmo bytecomp/emitcode.cmo \
81-
bytecomp/bytesections.cmo bytecomp/dll.cmo bytecomp/symtable.cmo \
82-
bytecomp/bytelink.cmo bytecomp/bytelibrarian.cmo bytecomp/bytepackager.cmo \
83-
driver/errors.cmo driver/compile.cmo
84-
85-
INTEL_ASM=\
86-
asmcomp/x86_proc.cmo \
87-
asmcomp/x86_dsl.cmo \
88-
asmcomp/x86_gas.cmo \
89-
asmcomp/x86_masm.cmo
90-
91-
ARCH_SPECIFIC_ASMCOMP=
92-
ifeq ($(ARCH),i386)
93-
ARCH_SPECIFIC_ASMCOMP=$(INTEL_ASM)
94-
endif
95-
ifeq ($(ARCH),amd64)
96-
ARCH_SPECIFIC_ASMCOMP=$(INTEL_ASM)
97-
endif
98-
99-
ASMCOMP=\
100-
$(ARCH_SPECIFIC_ASMCOMP) \
101-
asmcomp/arch.cmo asmcomp/debuginfo.cmo \
102-
asmcomp/cmm.cmo asmcomp/printcmm.cmo \
103-
asmcomp/reg.cmo asmcomp/mach.cmo asmcomp/proc.cmo \
104-
asmcomp/clambda.cmo asmcomp/printclambda.cmo asmcomp/compilenv.cmo \
105-
asmcomp/closure.cmo asmcomp/strmatch.cmo asmcomp/cmmgen.cmo \
106-
asmcomp/printmach.cmo asmcomp/selectgen.cmo asmcomp/selection.cmo \
107-
asmcomp/comballoc.cmo \
108-
asmcomp/CSEgen.cmo asmcomp/CSE.cmo \
109-
asmcomp/liveness.cmo \
110-
asmcomp/spill.cmo asmcomp/split.cmo \
111-
asmcomp/interf.cmo asmcomp/coloring.cmo \
112-
asmcomp/reloadgen.cmo asmcomp/reload.cmo \
113-
asmcomp/deadcode.cmo \
114-
asmcomp/printlinear.cmo asmcomp/linearize.cmo \
115-
asmcomp/schedgen.cmo asmcomp/scheduling.cmo \
116-
asmcomp/branch_relaxation_intf.cmo \
117-
asmcomp/branch_relaxation.cmo \
118-
asmcomp/emitaux.cmo asmcomp/emit.cmo asmcomp/asmgen.cmo \
119-
asmcomp/asmlink.cmo asmcomp/asmlibrarian.cmo asmcomp/asmpackager.cmo \
120-
driver/opterrors.cmo driver/optcompile.cmo
121-
122-
TOPLEVEL=toplevel/genprintval.cmo toplevel/toploop.cmo \
123-
toplevel/trace.cmo toplevel/topdirs.cmo toplevel/topmain.cmo
124-
125-
BYTESTART=driver/main.cmo
126-
127-
OPTSTART=driver/optmain.cmo
128-
129-
TOPLEVELSTART=toplevel/topstart.cmo
130-
131-
NATTOPOBJS=$(UTILS) $(PARSING) $(TYPING) $(COMP) $(ASMCOMP) \
132-
toplevel/genprintval.cmo toplevel/opttoploop.cmo toplevel/opttopdirs.cmo \
133-
toplevel/opttopmain.cmo toplevel/opttopstart.cmo
134-
135-
PERVASIVES=$(STDLIB_MODULES) outcometree topdirs toploop
1+
#########################################################################
2+
# #
3+
# OCaml #
4+
# #
5+
# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
6+
# #
7+
# Copyright 1999 Institut National de Recherche en Informatique et #
8+
# en Automatique. All rights reserved. This file is distributed #
9+
# under the terms of the Q Public License version 1.0. #
10+
# #
11+
#########################################################################
12+
13+
# The main Makefile, fragments shared between Makefile and Makefile.nt
14+
15+
include config/Makefile
16+
CAMLRUN ?= boot/ocamlrun
17+
CAMLYACC ?= boot/ocamlyacc
18+
include stdlib/StdlibModules
19+
20+
CAMLC=$(CAMLRUN) boot/ocamlc -g -nostdlib -I boot
21+
CAMLOPT=$(CAMLRUN) ./ocamlopt -g -nostdlib -I stdlib -I otherlibs/dynlink
22+
COMPFLAGS=-strict-sequence -w +33..39+48+50 -warn-error A -bin-annot \
23+
-safe-string $(INCLUDES)
24+
LINKFLAGS=
25+
26+
YACCFLAGS=-v
27+
CAMLLEX=$(CAMLRUN) boot/ocamllex
28+
CAMLDEP=$(CAMLRUN) tools/ocamldep
29+
DEPFLAGS=$(INCLUDES)
30+
31+
OCAMLBUILDBYTE=$(WITH_OCAMLBUILD:=.byte)
32+
OCAMLBUILDNATIVE=$(WITH_OCAMLBUILD:=.native)
33+
34+
OCAMLDOC_OPT=$(WITH_OCAMLDOC:=.opt)
35+
36+
INCLUDES=-I utils -I parsing -I typing -I bytecomp -I asmcomp -I driver \
37+
-I toplevel
38+
39+
UTILS=utils/config.cmo utils/clflags.cmo \
40+
utils/misc.cmo utils/tbl.cmo \
41+
utils/terminfo.cmo utils/ccomp.cmo utils/warnings.cmo \
42+
utils/consistbl.cmo
43+
44+
PARSING=parsing/location.cmo parsing/longident.cmo \
45+
parsing/docstrings.cmo parsing/ast_helper.cmo \
46+
parsing/syntaxerr.cmo parsing/parser.cmo \
47+
parsing/lexer.cmo parsing/parse.cmo parsing/printast.cmo \
48+
parsing/pprintast.cmo \
49+
parsing/ast_mapper.cmo parsing/attr_helper.cmo \
50+
parsing/builtin_attributes.cmo
51+
52+
TYPING=typing/ident.cmo typing/path.cmo \
53+
typing/primitive.cmo typing/types.cmo \
54+
typing/btype.cmo typing/oprint.cmo \
55+
typing/subst.cmo typing/predef.cmo \
56+
typing/datarepr.cmo typing/cmi_format.cmo typing/env.cmo \
57+
typing/typedtree.cmo typing/printtyped.cmo typing/ctype.cmo \
58+
typing/printtyp.cmo typing/includeclass.cmo \
59+
typing/mtype.cmo typing/envaux.cmo typing/includecore.cmo \
60+
typing/typedtreeIter.cmo typing/typedtreeMap.cmo \
61+
typing/tast_mapper.cmo \
62+
typing/cmt_format.cmo \
63+
typing/includemod.cmo typing/typetexp.cmo typing/parmatch.cmo \
64+
typing/stypes.cmo typing/typecore.cmo \
65+
typing/typedecl.cmo typing/typeclass.cmo \
66+
typing/typemod.cmo typing/untypeast.cmo
67+
68+
COMP=bytecomp/lambda.cmo bytecomp/printlambda.cmo \
69+
bytecomp/typeopt.cmo bytecomp/switch.cmo bytecomp/matching.cmo \
70+
bytecomp/translobj.cmo bytecomp/translattribute.cmo \
71+
bytecomp/translcore.cmo \
72+
bytecomp/translclass.cmo bytecomp/translmod.cmo \
73+
bytecomp/simplif.cmo bytecomp/runtimedef.cmo \
74+
driver/pparse.cmo driver/main_args.cmo \
75+
driver/compenv.cmo driver/compmisc.cmo
76+
77+
COMMON=$(UTILS) $(PARSING) $(TYPING) $(COMP)
78+
79+
BYTECOMP=bytecomp/meta.cmo bytecomp/instruct.cmo bytecomp/bytegen.cmo \
80+
bytecomp/printinstr.cmo bytecomp/opcodes.cmo bytecomp/emitcode.cmo \
81+
bytecomp/bytesections.cmo bytecomp/dll.cmo bytecomp/symtable.cmo \
82+
bytecomp/bytelink.cmo bytecomp/bytelibrarian.cmo bytecomp/bytepackager.cmo \
83+
driver/errors.cmo driver/compile.cmo
84+
85+
INTEL_ASM=\
86+
asmcomp/x86_proc.cmo \
87+
asmcomp/x86_dsl.cmo \
88+
asmcomp/x86_gas.cmo \
89+
asmcomp/x86_masm.cmo
90+
91+
ARCH_SPECIFIC_ASMCOMP=
92+
ifeq ($(ARCH),i386)
93+
ARCH_SPECIFIC_ASMCOMP=$(INTEL_ASM)
94+
endif
95+
ifeq ($(ARCH),amd64)
96+
ARCH_SPECIFIC_ASMCOMP=$(INTEL_ASM)
97+
endif
98+
99+
ASMCOMP=\
100+
$(ARCH_SPECIFIC_ASMCOMP) \
101+
asmcomp/arch.cmo asmcomp/debuginfo.cmo \
102+
asmcomp/cmm.cmo asmcomp/printcmm.cmo \
103+
asmcomp/reg.cmo asmcomp/mach.cmo asmcomp/proc.cmo \
104+
asmcomp/clambda.cmo asmcomp/printclambda.cmo asmcomp/compilenv.cmo \
105+
asmcomp/closure.cmo asmcomp/strmatch.cmo asmcomp/cmmgen.cmo \
106+
asmcomp/printmach.cmo asmcomp/selectgen.cmo asmcomp/selection.cmo \
107+
asmcomp/comballoc.cmo \
108+
asmcomp/CSEgen.cmo asmcomp/CSE.cmo \
109+
asmcomp/liveness.cmo \
110+
asmcomp/spill.cmo asmcomp/split.cmo \
111+
asmcomp/interf.cmo asmcomp/coloring.cmo \
112+
asmcomp/reloadgen.cmo asmcomp/reload.cmo \
113+
asmcomp/deadcode.cmo \
114+
asmcomp/printlinear.cmo asmcomp/linearize.cmo \
115+
asmcomp/schedgen.cmo asmcomp/scheduling.cmo \
116+
asmcomp/branch_relaxation_intf.cmo \
117+
asmcomp/branch_relaxation.cmo \
118+
asmcomp/emitaux.cmo asmcomp/emit.cmo asmcomp/asmgen.cmo \
119+
asmcomp/asmlink.cmo asmcomp/asmlibrarian.cmo asmcomp/asmpackager.cmo \
120+
driver/opterrors.cmo driver/optcompile.cmo
121+
122+
TOPLEVEL=toplevel/genprintval.cmo toplevel/toploop.cmo \
123+
toplevel/trace.cmo toplevel/topdirs.cmo toplevel/topmain.cmo
124+
125+
BYTESTART=driver/main.cmo
126+
127+
OPTSTART=driver/optmain.cmo
128+
129+
TOPLEVELSTART=toplevel/topstart.cmo
130+
131+
NATTOPOBJS=$(UTILS) $(PARSING) $(TYPING) $(COMP) $(ASMCOMP) \
132+
toplevel/genprintval.cmo toplevel/opttoploop.cmo toplevel/opttopdirs.cmo \
133+
toplevel/opttopmain.cmo toplevel/opttopstart.cmo
134+
135+
PERVASIVES=$(STDLIB_MODULES) outcometree topdirs toploop

‎ocamldoc/Makefile.nt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ CAMLYACC ?= ../boot/ocamlyacc
1818
##########################
1919
ROOTDIR = ..
2020
OCAMLC = $(CAMLRUN) $(ROOTDIR)/ocamlc -nostdlib -I $(ROOTDIR)/stdlib
21-
OCAMLOPT = $(CAMLRUN) $(ROOTDIR)/ocamlopt -nostdlib -I $(ROOTDIR)/stdlib -inline 0
21+
OCAMLOPT = $(CAMLRUN) $(ROOTDIR)/ocamlopt -nostdlib -I $(ROOTDIR)/stdlib
2222
OCAMLDEP = $(CAMLRUN) $(ROOTDIR)/tools/ocamldep
2323
OCAMLLEX = $(CAMLRUN) $(ROOTDIR)/boot/ocamllex
2424
OCAMLLIB = $(LIBDIR)

0 commit comments

Comments
 (0)