diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | Makefile.dev | 4 | ||||
| -rw-r--r-- | api_docgen/Makefile.docfiles | 14 | ||||
| -rw-r--r-- | api_docgen/ocamldoc/Makefile | 4 | ||||
| -rw-r--r-- | api_docgen/odoc/Makefile | 22 | ||||
| -rw-r--r-- | compilerlibs/Makefile.compilerlibs | 16 | ||||
| -rw-r--r-- | otherlibs/dynlink/Makefile | 2 | ||||
| -rw-r--r-- | tools/Makefile | 6 |
8 files changed, 36 insertions, 36 deletions
@@ -48,7 +48,7 @@ INCLUDES=-I utils -I parsing -I typing -I bytecomp -I file_formats \ COMPFLAGS=-strict-sequence -principal -absname \ -w +a-4-9-40-41-42-44-45-48-66-70 \ - -warn-error +a \ + -warn-error +a \ -bin-annot -safe-string -strict-formats $(INCLUDES) LINKFLAGS= @@ -852,7 +852,7 @@ parsing/parser.mli: boot/menhir/parser.mli beforedepend:: parsing/camlinternalMenhirLib.ml \ parsing/camlinternalMenhirLib.mli \ - parsing/parser.ml parsing/parser.mli + parsing/parser.ml parsing/parser.mli partialclean:: partialclean-menhir diff --git a/Makefile.dev b/Makefile.dev index 9ad90a572e..1e1eab9ae8 100644 --- a/Makefile.dev +++ b/Makefile.dev @@ -27,8 +27,8 @@ build-all-asts: @$(MAKE) --no-print-directory $(AST_FILES) CAMLC_DPARSETREE := \ - $(OCAMLRUN) ./ocamlc -nostdlib -nopervasives \ - -stop-after parsing -dparsetree + $(OCAMLRUN) ./ocamlc -nostdlib -nopervasives \ + -stop-after parsing -dparsetree %.ml.ast: %.ml ocamlc $(CAMLC_DPARSETREE) $< 2> $@ || exit 0 diff --git a/api_docgen/Makefile.docfiles b/api_docgen/Makefile.docfiles index c027781536..6f0f565f51 100644 --- a/api_docgen/Makefile.docfiles +++ b/api_docgen/Makefile.docfiles @@ -35,24 +35,24 @@ str_MLIS := str.mli unix_MLIS := unix.mli unixLabels.mli dynlink_MLIS := dynlink.mli thread_MLIS := \ - thread.mli condition.mli mutex.mli event.mli \ - threadUnix.mli semaphore.mli + thread.mli condition.mli mutex.mli event.mli \ + threadUnix.mli semaphore.mli STDLIB=$(filter-out stdlib__Pervasives, $(STDLIB_MODULES)) stdlib_UNPREFIXED=$(filter-out pervasives, $(STDLIB_MODULE_BASENAMES)) otherlibref= \ - $(str_MLIS:%.mli=%) \ - $(unix_MLIS:%.mli=%) \ - $(dynlink_MLIS:%.mli=%) \ - $(thread_MLIS:%.mli=%) + $(str_MLIS:%.mli=%) \ + $(unix_MLIS:%.mli=%) \ + $(dynlink_MLIS:%.mli=%) \ + $(thread_MLIS:%.mli=%) libref_EXTRA=stdlib__pervasives libref_TEXT=Ocaml_operators Format_tutorial libref_C=$(call capitalize,$(libref) $(libref_EXTRA)) PARSING_MLIS := $(call sort, \ - $(notdir $(wildcard $(ROOTDIR)/parsing/*.mli))\ + $(notdir $(wildcard $(ROOTDIR)/parsing/*.mli))\ ) UTILS_MLIS := $(call sort,$(notdir $(wildcard $(ROOTDIR)/utils/*.mli))) DRIVER_MLIS := pparse.mli diff --git a/api_docgen/ocamldoc/Makefile b/api_docgen/ocamldoc/Makefile index 0ad2b08038..87cd9cdb85 100644 --- a/api_docgen/ocamldoc/Makefile +++ b/api_docgen/ocamldoc/Makefile @@ -27,8 +27,8 @@ texi: build/texi/stdlib.texi DOC_STDLIB_INCLUDES= $(addprefix -I , $(DOC_STDLIB_DIRS)) DOC_ALL_INCLUDES = \ - $(DOC_STDLIB_INCLUDES) \ - $(addprefix -I ,$(DOC_COMPILERLIBS_DIRS)) + $(DOC_STDLIB_INCLUDES) \ + $(addprefix -I ,$(DOC_COMPILERLIBS_DIRS)) libref=$(stdlib_UNPREFIXED) $(otherlibref) diff --git a/api_docgen/odoc/Makefile b/api_docgen/odoc/Makefile index 4693eb2102..5c22a15b46 100644 --- a/api_docgen/odoc/Makefile +++ b/api_docgen/odoc/Makefile @@ -27,13 +27,13 @@ libref = $(STDLIB) $(otherlibref) # odoc needs a "page-" prefix for a mld documentation file define page_name - $(dir $1)page-$(notdir $1) + $(dir $1)page-$(notdir $1) endef define stdlib_prefix - $(if $(filter-out stdlib camlinternal%,$1),\ - Stdlib.$(call capitalize,$1),\ - $(call capitalize, $1)) + $(if $(filter-out stdlib camlinternal%,$1),\ + Stdlib.$(call capitalize,$1),\ + $(call capitalize, $1)) endef # define the right conditional for the manual @@ -86,9 +86,9 @@ build/compilerlibref/%.odoc: %.cmti $(libref:%=build/libref/%.odoc) \ ALL_TEXT = $(libref_TEXT:%=libref/%) $(compilerlibref_TEXT:%=compilerlibref/%) ALL_PAGE_TEXT=$(foreach mld,$(ALL_TEXT),$(call page_name,$(mld))) TARGET_UNITS= \ - $(compilerlibref:%=compilerlibref/%) \ - libref/stdlib $(otherlibref:%=libref/%) \ - $(addprefix libref/,$(filter camlinternal%,$(STDLIB))) + $(compilerlibref:%=compilerlibref/%) \ + libref/stdlib $(otherlibref:%=libref/%) \ + $(addprefix libref/,$(filter camlinternal%,$(STDLIB))) ALL_UNITS = $(compilerlibref:%=compilerlibref/%) $(libref:%=libref/%) ALL_PAGED_DOC = $(TARGET_UNITS) $(ALL_PAGE_TEXT) @@ -96,11 +96,11 @@ ALL_PAGED_DOC = $(TARGET_UNITS) $(ALL_PAGE_TEXT) # Note that we are using a dependency on the whole phase 1 rather than tracking # the individual file dependencies $(ALL_UNITS:%=build/%.odocl):%.odocl:%.odoc \ - | $(ALL_PAGED_DOC:%=build/%.odoc) + | $(ALL_PAGED_DOC:%=build/%.odoc) $(odoc) link -I build/libref -I build/compilerlibref $< $(ALL_PAGE_TEXT:%=build/%.odocl):%.odocl:%.odoc \ - | $(ALL_PAGED_DOC:%=build/%.odoc) + | $(ALL_PAGED_DOC:%=build/%.odoc) $(odoc) link -I build/libref -I build/compilerlibref $< # Rules for all three backends: @@ -134,8 +134,8 @@ $(build/libref.html.stamp build/compilerlibref.html.stamp): # The stdlib index is generated from the list of stdlib modules. stdlib_INDEX=\ - $(foreach m,$(stdlib_UNPREFIXED),$(call stdlib_prefix,$m))\ - $(call capitalize, $(otherlibref)) + $(foreach m,$(stdlib_UNPREFIXED),$(call stdlib_prefix,$m))\ + $(call capitalize, $(otherlibref)) build/libref.mld: echo {0 OCaml standard library} {!modules:$(stdlib_INDEX)} > $@ diff --git a/compilerlibs/Makefile.compilerlibs b/compilerlibs/Makefile.compilerlibs index dad26e9cc3..fe26b5a407 100644 --- a/compilerlibs/Makefile.compilerlibs +++ b/compilerlibs/Makefile.compilerlibs @@ -25,14 +25,14 @@ # that they are consistent with the interface digests in the archives. UTILS=utils/config.cmo utils/build_path_prefix_map.cmo utils/misc.cmo \ - utils/identifiable.cmo utils/numbers.cmo utils/arg_helper.cmo \ - utils/clflags.cmo utils/profile.cmo utils/local_store.cmo \ - utils/load_path.cmo \ - utils/terminfo.cmo utils/ccomp.cmo utils/warnings.cmo \ - utils/consistbl.cmo utils/strongly_connected_components.cmo \ - utils/targetint.cmo utils/int_replace_polymorphic_compare.cmo \ - utils/domainstate.cmo utils/binutils.cmo utils/lazy_backtrack.cmo \ - utils/diffing.cmo + utils/identifiable.cmo utils/numbers.cmo utils/arg_helper.cmo \ + utils/clflags.cmo utils/profile.cmo utils/local_store.cmo \ + utils/load_path.cmo \ + utils/terminfo.cmo utils/ccomp.cmo utils/warnings.cmo \ + utils/consistbl.cmo utils/strongly_connected_components.cmo \ + utils/targetint.cmo utils/int_replace_polymorphic_compare.cmo \ + utils/domainstate.cmo utils/binutils.cmo utils/lazy_backtrack.cmo \ + utils/diffing.cmo UTILS_CMI= PARSING=parsing/location.cmo parsing/longident.cmo \ diff --git a/otherlibs/dynlink/Makefile b/otherlibs/dynlink/Makefile index 41e33d5449..644ab12199 100644 --- a/otherlibs/dynlink/Makefile +++ b/otherlibs/dynlink/Makefile @@ -30,7 +30,7 @@ OCAMLOPT=$(BEST_OCAMLOPT) -g -nostdlib -I $(ROOTDIR)/stdlib # COMPFLAGS should be in sync with the toplevel Makefile's COMPFLAGS. COMPFLAGS=-strict-sequence -principal -absname \ -w +a-4-9-40-41-42-44-45-48-66-70 \ - -warn-error +A \ + -warn-error +A \ -bin-annot -safe-string -strict-formats ifeq "$(FLAMBDA)" "true" OPTCOMPFLAGS += -O3 diff --git a/tools/Makefile b/tools/Makefile index 800aab48f9..c7c62be91e 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -143,7 +143,7 @@ installopt:: # To help building mixed-mode libraries (OCaml + C) $(call byte_and_opt,ocamlmklib,config.cmo \ - build_path_prefix_map.cmo misc.cmo ocamlmklib.cmo,) + build_path_prefix_map.cmo misc.cmo ocamlmklib.cmo,) # To make custom toplevels @@ -273,8 +273,8 @@ $(call byte_and_opt,primreq,$(primreq),) LINTAPIDIFF=$(ROOTDIR)/compilerlibs/ocamlcommon.cmxa \ $(ROOTDIR)/compilerlibs/ocamlbytecomp.cmxa \ $(ROOTDIR)/compilerlibs/ocamlmiddleend.cmxa \ - $(ROOTDIR)/otherlibs/str/str.cmxa \ - lintapidiff.cmx + $(ROOTDIR)/otherlibs/str/str.cmxa \ + lintapidiff.cmx lintapidiff.opt$(EXE): INCLUDES+= -I $(ROOTDIR)/otherlibs/str lintapidiff.opt$(EXE): $(LINTAPIDIFF) |