summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--GNUmakefile11
1 files changed, 5 insertions, 6 deletions
diff --git a/GNUmakefile b/GNUmakefile
index ed6b064..0dfdfe8 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -23,6 +23,9 @@ default:
# Get most of the information from the Unix-compatible makefile.
include compatMakefile
+extras := $(filter-out @%@,$(extras))
+LOADLIBES := $(filter-out @%@,$(LOADLIBES)) cygnus-is-scum.o
+
# Set `ARCH' to a string for the type of machine.
ifndef ARCH
ifdef machine
@@ -53,10 +56,6 @@ ifneq "$(defines)" "@DEFS@"
CPPFLAGS = $(defines)
endif
-ifeq "$(extras)" "@LIBOBJS@"
-extras := # nada
-endif
-
ifneq "$(wildcard $(ARCH)/makefile)" ""
include $(ARCH)/makefile
objs := $(sort $(objs) $(addprefix $(ARCH)/,$(ALLOCA) $(extras)))
@@ -174,8 +173,8 @@ ETAGS = etags -T # for v19 etags
# Run the tests.
.PHONY: tests
testdir := $(shell ls -d1 make-test-?.? | sort -n +0.10 -0.11 +0.12 | tail -1l)
-tests: $(testdir)/run_make_tests.pl $(prog)
- cd $(<D); perl $(<F)
+tests:# $(testdir)/run_make_tests.pl $(prog)
+# cd $(<D); perl $(<F)
configure: /home/gd/gnu/autoconf/make.conf
cp $< $@