configure: Remove HDEPENDS option.

Setting HDEPENDS=NO no longer works and would be hard to
fix, so this commit deletes the option completely.
This commit is contained in:
Andrew Johnson
2012-06-21 17:21:40 -05:00
parent 84a8bacc58
commit c79532e4ce
7 changed files with 11 additions and 21 deletions

View File

@@ -321,29 +321,25 @@ PREPROCESS.cpp = $(CPP) $(CPPFLAGS) $(INCLUDES) $< > $@
#--------------------------------------------------
# Header dependency file generation
HDEPENDS = YES
HDEPENDS_METHOD = CMD
HDEPENDS_METHOD = MKMF
HDEPENDS_INCLUDES = $(subst -I,,$(INCLUDES))
HDEPENDSFLAGS = -m $*$(DEP) $(HDEPENDS_INCLUDES) $@ $<
HDEPENDS_CMD_NO = $(ECHO) ""
HDEPENDS_CMD_YES = $(MKMF) $(HDEPENDS_FLAGS) $(HDEPENDSFLAGS)
HDEPENDS_MKMF = $(MKMF) $(HDEPENDS_FLAGS) $(HDEPENDSFLAGS)
HDEPENDSCFLAGS = -MM > $*$(DEP)
HDEPSUFFIX = $(if $(filter .c,$(suffix $<)),.c,.cpp)
HDEPENDS_CFLAGS_NO = $(ECHO) ""
HDEPENDS_CFLAGS_YES = $(COMPILE$(HDEPSUFFIX)) $(HDEPENDSCFLAGS) $<
HDEPENDS_CFLAGS = $(COMPILE$(HDEPSUFFIX)) $(HDEPENDSCFLAGS) $<
HDEPENDS_CMD = $(HDEPENDS_$(HDEPENDS_METHOD)_$(HDEPENDS))
HDEPENDS_CMD = $(HDEPENDS_$(HDEPENDS_METHOD))
#--------------------------------------------------
# depends definition
TARGET_SRCS = $(foreach name, $(TESTPROD) $(PROD) $(TESTLIBRARY) $(LIBRARY) $(LOADABLE_LIBRARY), $($(name)_SRCS))
SRC_FILES = $(LIB_SRCS) $(LIBSRCS) $(SRCS) $(USR_SRCS) $(PROD_SRCS) $(TARGET_SRCS)
HDEPENDS_FILES_YES = $(addsuffix $(DEP),$(notdir $(basename $(SRC_FILES))))
HDEPENDS_FILES = $(HDEPENDS_FILES_$(HDEPENDS))
HDEPENDS_FILES = $(addsuffix $(DEP),$(notdir $(basename $(SRC_FILES))))
#---------------------------------------------------------------
# Names of installed items

View File

@@ -126,10 +126,6 @@ SHARED_LIBRARIES=YES
# Must be either YES or NO.
STATIC_BUILD=NO
# Generate header dependancy files for each C/C++ object file.
# Must be either YES or NO.
HDEPENDS=YES
# Host build optimization.
# Must be either YES or NO.
HOST_OPT=YES

View File

@@ -100,8 +100,7 @@ vpath %.m $(USR_VPATH) $(ALL_SRC_DIRS)
# Use compiler when ARCH_CLASS is a single arch value
# otherwise use perl script command
SINGLE_ARCH=$(filter 1,$(words $(ARCH_CLASS)))
HDEPENDS_CFLAGS = $(if $(SINGLE_ARCH),$(HDEPENDS_CFLAGS_$(HDEPENDS)))
HDEPENDS_METHOD = $(if $(SINGLE_ARCH),CFLAGS,CMD)
HDEPENDS_METHOD = $(if $(SINGLE_ARCH),CFLAGS,MKMF)
#--------------------------------------------------
# Allow site overrides

View File

@@ -91,11 +91,10 @@ vpath %.m $(USR_VPATH) $(ALL_SRC_DIRS)
#
# Header dependency file generation
#
# Use GNU compiler flags when ARCH_CLASS is a single arch value
# Use compiler when ARCH_CLASS is a single arch value
# otherwise use perl script command
SINGLE_ARCH=$(filter 1,$(words $(ARCH_CLASS)))
HDEPENDS_CFLAGS = $(if $(SINGLE_ARCH),$(HDEPENDS_CFLAGS_$(HDEPENDS)))
HDEPENDS_METHOD = $(if $(SINGLE_ARCH),CFLAGS,CMD)
HDEPENDS_METHOD = $(if $(SINGLE_ARCH),CFLAGS,MKMF)
#--------------------------------------------------
# Allow site overrides

View File

@@ -268,7 +268,7 @@ LINK.cpp += , $@ ,,$(LINKLIBS) $(subst /,\\,$(PROD_LDLIBS))
#--------------------------------------------------
# override of CONFIG_COMMON
HDEPENDS_INCLUDES_MKMF = $(filter-out $(BORLAND_INC),$(subst -I,,$(INCLUDES)))
HDEPENDS_INCLUDES = $(filter-out $(BORLAND_INC),$(subst -I,,$(INCLUDES)))
TDS = $(addsuffix .tds,$(basename $(PROD) $(TESTPROD) $(BUILD_LIBRARY) $(TESTBUILD_LIBRARY)))

View File

@@ -35,7 +35,7 @@ CC = cl
# Override CONFIG.gnuCommon for cross builds.
GNU = NO
HDEPENDS_METHOD = CMD
HDEPENDS_METHOD = MKMF
#
# /W<N> use warning level N

View File

@@ -14,7 +14,7 @@
GNU = NO
HDEPENDS_METHOD = CMD
HDEPENDS_METHOD = MKMF
BUILD_CLASS = HOST
HOST_OPT = NO