makefiles: move the inclusion of Makefile.build_config in Makefile.common
parent
f2587c1fb1
commit
fab58a938a
16
Makefile
16
Makefile
|
@ -16,20 +16,6 @@
|
||||||
# The main Makefile
|
# The main Makefile
|
||||||
|
|
||||||
ROOTDIR = .
|
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
|
include Makefile.common
|
||||||
|
|
||||||
.PHONY: defaultentry
|
.PHONY: defaultentry
|
||||||
|
@ -1083,7 +1069,7 @@ distclean: clean
|
||||||
include .depend
|
include .depend
|
||||||
|
|
||||||
|
|
||||||
ifneq "$(strip $(CAN_BE_UNCONFIGURED))" ""
|
ifneq "$(CAN_BE_UNCONFIGURED)" ""
|
||||||
Makefile.config Makefile.build_config: config.status
|
Makefile.config Makefile.build_config: config.status
|
||||||
|
|
||||||
config.status:
|
config.status:
|
||||||
|
|
|
@ -15,7 +15,22 @@
|
||||||
|
|
||||||
# This makefile contains common definitions and rules shared by
|
# This makefile contains common definitions and rules shared by
|
||||||
# other Makefiles
|
# 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) must be kept in sync with entries in .gitignore
|
||||||
DEPDIR=.dep
|
DEPDIR=.dep
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
|
|
||||||
ROOTDIR = ..
|
ROOTDIR = ..
|
||||||
|
|
||||||
-include $(ROOTDIR)/Makefile.build_config
|
|
||||||
include $(ROOTDIR)/Makefile.common
|
include $(ROOTDIR)/Makefile.common
|
||||||
include $(ROOTDIR)/Makefile.best_binaries
|
include $(ROOTDIR)/Makefile.best_binaries
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,6 @@
|
||||||
|
|
||||||
ROOTDIR = ..
|
ROOTDIR = ..
|
||||||
|
|
||||||
-include $(ROOTDIR)/Makefile.build_config
|
|
||||||
include $(ROOTDIR)/Makefile.common
|
include $(ROOTDIR)/Makefile.common
|
||||||
|
|
||||||
CAMLYACC ?= $(ROOTDIR)/yacc/ocamlyacc
|
CAMLYACC ?= $(ROOTDIR)/yacc/ocamlyacc
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
|
|
||||||
ROOTDIR = ..
|
ROOTDIR = ..
|
||||||
|
|
||||||
-include $(ROOTDIR)/Makefile.build_config
|
|
||||||
include $(ROOTDIR)/Makefile.common
|
include $(ROOTDIR)/Makefile.common
|
||||||
include $(ROOTDIR)/Makefile.best_binaries
|
include $(ROOTDIR)/Makefile.best_binaries
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,6 @@
|
||||||
|
|
||||||
ROOTDIR = ..
|
ROOTDIR = ..
|
||||||
|
|
||||||
-include $(ROOTDIR)/Makefile.build_config
|
|
||||||
include $(ROOTDIR)/Makefile.common
|
include $(ROOTDIR)/Makefile.common
|
||||||
include $(ROOTDIR)/Makefile.best_binaries
|
include $(ROOTDIR)/Makefile.best_binaries
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
#**************************************************************************
|
#**************************************************************************
|
||||||
|
|
||||||
ROOTDIR=..
|
ROOTDIR=..
|
||||||
-include $(ROOTDIR)/Makefile.build_config
|
|
||||||
include $(ROOTDIR)/Makefile.common
|
include $(ROOTDIR)/Makefile.common
|
||||||
|
|
||||||
OTHERLIBRARIES ?= bigarray dynlink raw_spacetime_lib str systhreads \
|
OTHERLIBRARIES ?= bigarray dynlink raw_spacetime_lib str systhreads \
|
||||||
|
|
|
@ -16,7 +16,6 @@
|
||||||
# Common Makefile for otherlibs
|
# Common Makefile for otherlibs
|
||||||
|
|
||||||
ROOTDIR=../..
|
ROOTDIR=../..
|
||||||
-include $(ROOTDIR)/Makefile.build_config
|
|
||||||
include $(ROOTDIR)/Makefile.common
|
include $(ROOTDIR)/Makefile.common
|
||||||
include $(ROOTDIR)/Makefile.best_binaries
|
include $(ROOTDIR)/Makefile.best_binaries
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,6 @@
|
||||||
|
|
||||||
ROOTDIR = ../..
|
ROOTDIR = ../..
|
||||||
|
|
||||||
-include $(ROOTDIR)/Makefile.build_config
|
|
||||||
include $(ROOTDIR)/Makefile.common
|
include $(ROOTDIR)/Makefile.common
|
||||||
include $(ROOTDIR)/Makefile.best_binaries
|
include $(ROOTDIR)/Makefile.best_binaries
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
|
|
||||||
ROOTDIR=../..
|
ROOTDIR=../..
|
||||||
|
|
||||||
-include $(ROOTDIR)/Makefile.build_config
|
|
||||||
include $(ROOTDIR)/Makefile.common
|
include $(ROOTDIR)/Makefile.common
|
||||||
include $(ROOTDIR)/Makefile.best_binaries
|
include $(ROOTDIR)/Makefile.best_binaries
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
|
|
||||||
ROOTDIR = ..
|
ROOTDIR = ..
|
||||||
|
|
||||||
-include $(ROOTDIR)/Makefile.build_config
|
|
||||||
include $(ROOTDIR)/Makefile.common
|
include $(ROOTDIR)/Makefile.common
|
||||||
|
|
||||||
# Lists of source files
|
# Lists of source files
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
|
|
||||||
ROOTDIR = ..
|
ROOTDIR = ..
|
||||||
|
|
||||||
-include $(ROOTDIR)/Makefile.build_config
|
|
||||||
include $(ROOTDIR)/Makefile.common
|
include $(ROOTDIR)/Makefile.common
|
||||||
|
|
||||||
TARGET_BINDIR ?= $(BINDIR)
|
TARGET_BINDIR ?= $(BINDIR)
|
||||||
|
|
|
@ -16,7 +16,6 @@
|
||||||
MAKEFLAGS := -r -R
|
MAKEFLAGS := -r -R
|
||||||
ROOTDIR = ..
|
ROOTDIR = ..
|
||||||
|
|
||||||
-include $(ROOTDIR)/Makefile.build_config
|
|
||||||
include $(ROOTDIR)/Makefile.common
|
include $(ROOTDIR)/Makefile.common
|
||||||
|
|
||||||
ifeq ($(SYSTEM),unix)
|
ifeq ($(SYSTEM),unix)
|
||||||
|
|
|
@ -17,7 +17,6 @@
|
||||||
|
|
||||||
ROOTDIR = ..
|
ROOTDIR = ..
|
||||||
|
|
||||||
-include $(ROOTDIR)/Makefile.build_config
|
|
||||||
include $(ROOTDIR)/Makefile.common
|
include $(ROOTDIR)/Makefile.common
|
||||||
|
|
||||||
OC_CPPFLAGS += -I$(ROOTDIR)/runtime
|
OC_CPPFLAGS += -I$(ROOTDIR)/runtime
|
||||||
|
|
Loading…
Reference in New Issue