From 15614defd894a38d682d5e2f7159f8649c7144de Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 16 Jun 1992 01:25:32 +0000 Subject: Formerly GNUmakefile.~66~ --- GNUmakefile | 11 +++++------ 1 file 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 $(