Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

makefiles: move the inclusion of Makefile.build_config in Makefile.common

master
Gabriel Scherer 2020-05-03 10:42:13 +02:00
parent f2587c1fb1
commit fab58a938a
14 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -16,20 +16,6 @@
# The main Makefile
ROOTDIR = .
# The configure and *clean targets can all be run without running ./configure
# first.
# If no goals were specified (i.e. `make`), add defaultentry (since it requires
# ./configure to be run)
CAN_BE_UNCONFIGURED := $(strip \
$(filter-out partialclean clean distclean configure, \
$(if $(MAKECMDGOALS),$(MAKECMDGOALS),defaultentry)))
ifeq "$(CAN_BE_UNCONFIGURED)" ""
-include Makefile.build_config
else
include Makefile.build_config
endif
include Makefile.common
.PHONY: defaultentry
@ -1083,7 +1069,7 @@ distclean: clean
include .depend
ifneq "$(strip $(CAN_BE_UNCONFIGURED))" ""
ifneq "$(CAN_BE_UNCONFIGURED)" ""
Makefile.config Makefile.build_config: config.status
config.status:

17
Makefile.common
View File

@ -15,7 +15,22 @@
# This makefile contains common definitions and rules shared by
# other Makefiles
# We assume that Makefile.config has already been included
# Some special targets ('*clean' and 'configure') do not require configuration.
# CAN_BE_UNCONFIGURED is empty if only those targets are requested,
# and non-empty if configuration is required.
CAN_BE_UNCONFIGURED := $(strip \
$(filter-out partialclean clean distclean configure, \
$(if $(MAKECMDGOALS),$(MAKECMDGOALS),defaultentry)))
# If no goals were specified (i.e. `make`), we add defaultentry
# (since it requires ./configure to be run) so that
# CAN_BE_UNCONFIGURED is non-empty.
ifeq "$(CAN_BE_UNCONFIGURED)" ""
-include $(ROOTDIR)/Makefile.build_config
else
include $(ROOTDIR)/Makefile.build_config
endif
# %(DEPDIR) must be kept in sync with entries in .gitignore
DEPDIR=.dep

1
debugger/Makefile
View File

@ -15,7 +15,6 @@
ROOTDIR = ..
-include $(ROOTDIR)/Makefile.build_config
include $(ROOTDIR)/Makefile.common
include $(ROOTDIR)/Makefile.best_binaries

1
lex/Makefile
View File

@ -17,7 +17,6 @@
ROOTDIR = ..
-include $(ROOTDIR)/Makefile.build_config
include $(ROOTDIR)/Makefile.common
CAMLYACC ?= $(ROOTDIR)/yacc/ocamlyacc

1
ocamldoc/Makefile
View File

@ -15,7 +15,6 @@
ROOTDIR = ..
-include $(ROOTDIR)/Makefile.build_config
include $(ROOTDIR)/Makefile.common
include $(ROOTDIR)/Makefile.best_binaries

1
ocamltest/Makefile
View File

@ -17,7 +17,6 @@
ROOTDIR = ..
-include $(ROOTDIR)/Makefile.build_config
include $(ROOTDIR)/Makefile.common
include $(ROOTDIR)/Makefile.best_binaries

1
otherlibs/Makefile
View File

@ -14,7 +14,6 @@
#**************************************************************************
ROOTDIR=..
-include $(ROOTDIR)/Makefile.build_config
include $(ROOTDIR)/Makefile.common
OTHERLIBRARIES ?= bigarray dynlink raw_spacetime_lib str systhreads \

1
otherlibs/Makefile.otherlibs.common
View File

@ -16,7 +16,6 @@
# Common Makefile for otherlibs
ROOTDIR=../..
-include $(ROOTDIR)/Makefile.build_config
include $(ROOTDIR)/Makefile.common
include $(ROOTDIR)/Makefile.best_binaries

1
otherlibs/dynlink/Makefile
View File

@ -21,7 +21,6 @@
ROOTDIR = ../..
-include $(ROOTDIR)/Makefile.build_config
include $(ROOTDIR)/Makefile.common
include $(ROOTDIR)/Makefile.best_binaries

1
otherlibs/systhreads/Makefile
View File

@ -15,7 +15,6 @@
ROOTDIR=../..
-include $(ROOTDIR)/Makefile.build_config
include $(ROOTDIR)/Makefile.common
include $(ROOTDIR)/Makefile.best_binaries

1
runtime/Makefile
View File

@ -15,7 +15,6 @@
ROOTDIR = ..
-include $(ROOTDIR)/Makefile.build_config
include $(ROOTDIR)/Makefile.common
# Lists of source files

1
stdlib/Makefile
View File

@ -15,7 +15,6 @@
ROOTDIR = ..
-include $(ROOTDIR)/Makefile.build_config
include $(ROOTDIR)/Makefile.common
TARGET_BINDIR ?= $(BINDIR)

1
tools/Makefile
View File

@ -16,7 +16,6 @@
MAKEFLAGS := -r -R
ROOTDIR = ..
-include $(ROOTDIR)/Makefile.build_config
include $(ROOTDIR)/Makefile.common
ifeq ($(SYSTEM),unix)

1
yacc/Makefile
View File

@ -17,7 +17,6 @@
ROOTDIR = ..
-include $(ROOTDIR)/Makefile.build_config
include $(ROOTDIR)/Makefile.common
OC_CPPFLAGS += -I$(ROOTDIR)/runtime