Skip to content
Success

Changes

Summary

  1. makefiles: move the inclusion of Makefile.build_config in Makefile.common (commit: fab58a9) (details)
  2. [minor] rename CAN_BE_UNCONFIGURED into REQUIRES_CONFIGURATION (commit: 472a20d) (details)
  3. build system: skip Makefile.build_config when REQUIRES_CONFIGURATION is empty (commit: 21f5ad3) (details)
  4. Makefile: no need for REQUIRES_CONFIGURATION check on config.status (commit: 8d716a1) (details)
  5. move the REQUIRES_CONFIGURATION logic in Makefile.config_if_required (commit: e34e622) (details)
  6. refactor Makefile.config_if_required for easier reuse of variables (commit: 3489e00) (details)
  7. ocamltest/Makefile: do not depend on UNIX_OR_WIN32 for 'clean' (commit: 11c9d92) (details)
  8. [minor] Makefile: move ARCH_SPECIFIC back to the main Makefile (commit: 67f6128) (details)
  9. [minor] stdlib/Makefile: remove redundant clean action (commit: fd789b5) (details)
  10. Changes entry (commit: ffbea08) (details)
Commit fab58a938a61c62bb66ed70ce2563e1657d9f53b by gabriel.scherer
makefiles: move the inclusion of Makefile.build_config in Makefile.common
(commit: fab58a9)
The file was modifiedruntime/Makefile (diff)
The file was modifiedMakefile.common (diff)
The file was modifiedotherlibs/dynlink/Makefile (diff)
The file was modifiedotherlibs/Makefile.otherlibs.common (diff)
The file was modifiedyacc/Makefile (diff)
The file was modifieddebugger/Makefile (diff)
The file was modifiedotherlibs/systhreads/Makefile (diff)
The file was modifiedstdlib/Makefile (diff)
The file was modifiedlex/Makefile (diff)
The file was modifiedtools/Makefile (diff)
The file was modifiedMakefile (diff)
The file was modifiedocamltest/Makefile (diff)
The file was modifiedotherlibs/Makefile (diff)
The file was modifiedocamldoc/Makefile (diff)
Commit 472a20d735f841e3ab3191376f597b6d14fcfb57 by gabriel.scherer
[minor] rename CAN_BE_UNCONFIGURED into REQUIRES_CONFIGURATION
(commit: 472a20d)
The file was modifiedMakefile (diff)
The file was modifiedMakefile.common (diff)
Commit 21f5ad3b4a873a73703fab881ace5cbddd8f85e2 by gabriel.scherer
build system: skip Makefile.build_config when REQUIRES_CONFIGURATION is empty

Before we would include it if present, but support building without
it. Unless I misunderstand something, this is unnecessarily complex:

- If we want to support building without it, we may as well
  do without it all the time (in particular it makes it easier
  to spot bugs which occurs when it is missing).

- Certain makefile rules (see config.status) work by being added
  as dependencies to Makefile.build_config, and requiring this file
  only when actually needed makes it possible to simplify those.
  (simplifications not included in this commit)

I reviewed all 'clean' rules to check that they do not depend on
variables defined in the configure. On the other hand, the main
makefiles do a lot of conditional tests on those variables,
so --warn-undefined-variables warns quite a bit. (This could be solved
by a Makefile.no_config rule that mirrors Makefile.config with dummy
definitions.)
(commit: 21f5ad3)
The file was modifiedMakefile.common (diff)
Commit 8d716a1712013308bd249a885075af584ea5fecf by gabriel.scherer
Makefile: no need for REQUIRES_CONFIGURATION check on config.status

Now that Makefile.build_config is only included when configuration is
required, we can remove the REQUIRES_CONFIGURATION logic here.
(commit: 8d716a1)
The file was modifiedMakefile (diff)
Commit e34e62253f82cfe07b3c8c040896b5e1bd2d77d8 by gabriel.scherer
move the REQUIRES_CONFIGURATION logic in Makefile.config_if_required

This lets us share the logic between Makefile.common and Makefile.tools.
(commit: e34e622)
The file was addedMakefile.config_if_required
The file was modifiedMakefile.tools (diff)
The file was modifiedMakefile.common (diff)
Commit 3489e002c66325de1c32798d9d4f954532c2473b by gabriel.scherer
refactor Makefile.config_if_required for easier reuse of variables
(commit: 3489e00)
The file was modifiedMakefile.config_if_required (diff)
Commit 11c9d92732bfa731852fcbb42ec46d52887595ed by gabriel.scherer
ocamltest/Makefile: do not depend on UNIX_OR_WIN32 for 'clean'

Change suggested by David Allsopp.
(commit: 11c9d92)
The file was modifiedocamltest/Makefile (diff)
Commit 67f6128ebde6d5401fe87a6c4607242ca8e2b207 by gabriel.scherer
[minor] Makefile: move ARCH_SPECIFIC back to the main Makefile

(This is a small, independent readability fix.)

ARCH_SPECIFIC was moved into Makefile.compilerlibs by mistake; it is
not used in Makefile.compilerlibs (in particular the
ARCH_SPECIFIC_ASMCOMP_* variables do not depend on it), and it is used
in the main Makefile.
(commit: 67f6128)
The file was modifiedMakefile (diff)
The file was modifiedcompilerlibs/Makefile.compilerlibs (diff)
Commit fd789b5ceca42bece4b92049c7a4238d301bba09 by gabriel.scherer
[minor] stdlib/Makefile: remove redundant clean action

There is already a more precise

    clean::
            rm -f $(CAMLHEADERS)

rule above.

(Change suggested by David Allsopp.)
(commit: fd789b5)
The file was modifiedstdlib/Makefile (diff)
The file was modifiedChanges (diff)