Cygwin: Testsuite Makefile cleanup
Drop unused variables CC_FOR_TARGET, GCC_INCLUDE, ALL_CFLAGS Stop exporting CC, CFLAGS Drop unused, empty targets force, dll_ofiles, all_target
This commit is contained in:
parent
cbf8fe6dca
commit
9ea6f38dea
|
@ -46,8 +46,6 @@ TESTSUP_INCLUDES:=-I$(libltp_srcdir)/include
|
||||||
#
|
#
|
||||||
|
|
||||||
CC:=@CC@
|
CC:=@CC@
|
||||||
# FIXME: Which is it, CC or CC_FOR_TARGET?
|
|
||||||
CC_FOR_TARGET:=$(CC)
|
|
||||||
ifneq (,$(CFLAGS))
|
ifneq (,$(CFLAGS))
|
||||||
override CFLAGS+= -MD $(TESTSUP_INCLUDES)
|
override CFLAGS+= -MD $(TESTSUP_INCLUDES)
|
||||||
else
|
else
|
||||||
|
@ -66,9 +64,6 @@ include $(srcdir)/../Makefile.common
|
||||||
|
|
||||||
VPATH+=$(libltp_srcdir)/lib
|
VPATH+=$(libltp_srcdir)/lib
|
||||||
|
|
||||||
override CC:=$(CC) $(GCC_INCLUDE)
|
|
||||||
export CC
|
|
||||||
|
|
||||||
RUNTESTFLAGS =
|
RUNTESTFLAGS =
|
||||||
|
|
||||||
ifdef VERBOSE
|
ifdef VERBOSE
|
||||||
|
@ -80,20 +75,16 @@ RUNTIME=$(cygwin_build)/cygwin0.dll $(cygwin_build)/libcygwin0.a
|
||||||
TESTSUP_LIB_NAME:=libltp.a
|
TESTSUP_LIB_NAME:=libltp.a
|
||||||
TESTSUP_OFILES:=${sort ${addsuffix .o,${basename ${notdir ${wildcard $(libltp_srcdir)/lib/*.c}}}}}
|
TESTSUP_OFILES:=${sort ${addsuffix .o,${basename ${notdir ${wildcard $(libltp_srcdir)/lib/*.c}}}}}
|
||||||
|
|
||||||
override ALL_CFLAGS:=${filter-out -O%,$(ALL_CFLAGS)}
|
|
||||||
override COMPILE_CC:=${filter-out -O%,$(COMPILE_CC)}
|
override COMPILE_CC:=${filter-out -O%,$(COMPILE_CC)}
|
||||||
override CFLAGS:=${filter-out -O%,$(CFLAGS)}
|
override CFLAGS:=${filter-out -O%,$(CFLAGS)}
|
||||||
export CFLAGS
|
|
||||||
|
|
||||||
.PHONY: all force dll_ofiles install all_target
|
.PHONY: all install
|
||||||
|
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
.SUFFIXES: .c .cc .def .a .o .d
|
.SUFFIXES: .c .cc .def .a .o .d
|
||||||
|
|
||||||
all: $(TESTSUP_LIB_NAME)
|
all: $(TESTSUP_LIB_NAME)
|
||||||
|
|
||||||
force:
|
|
||||||
|
|
||||||
install:
|
install:
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
|
@ -114,8 +105,6 @@ $(TESTSUP_LIB_NAME): $(TESTSUP_OFILES)
|
||||||
$(RUNTIME) : $(cygwin_build)/Makefile
|
$(RUNTIME) : $(cygwin_build)/Makefile
|
||||||
@$(MAKE) --no-print-dir -C $(@D) $(@F)
|
@$(MAKE) --no-print-dir -C $(@D) $(@F)
|
||||||
|
|
||||||
# Rule to make stub library used by "make check"
|
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
||||||
# These targets are for the dejagnu testsuites. The file site.exp
|
# These targets are for the dejagnu testsuites. The file site.exp
|
||||||
|
@ -147,7 +136,7 @@ site.exp: ./config.status Makefile
|
||||||
@echo "set target_alias $(target_alias)" >> ./tmp0
|
@echo "set target_alias $(target_alias)" >> ./tmp0
|
||||||
@echo "set CC \"$(CC)\"" >> ./tmp0
|
@echo "set CC \"$(CC)\"" >> ./tmp0
|
||||||
# CFLAGS is set even though it's empty to show we reserve the right to set it.
|
# CFLAGS is set even though it's empty to show we reserve the right to set it.
|
||||||
@echo "set CFLAGS \"$(ALL_CFLAGS)\"" >> ./tmp0
|
@echo "set CFLAGS \"\"" >> ./tmp0
|
||||||
@echo "set MINGW_CXX \"$(MINGW_CXX)\"" >> ./tmp0
|
@echo "set MINGW_CXX \"$(MINGW_CXX)\"" >> ./tmp0
|
||||||
@echo "set tmpdir $(tmpdir)" >> ./tmp0
|
@echo "set tmpdir $(tmpdir)" >> ./tmp0
|
||||||
@echo "set testdll_tmpdir $(testdll_tmpdir)" >> ./tmp0
|
@echo "set testdll_tmpdir $(testdll_tmpdir)" >> ./tmp0
|
||||||
|
|
Loading…
Reference in New Issue