summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@redhat.com>1992-12-29 02:36:27 +0000
committerRoland McGrath <roland@redhat.com>1992-12-29 02:36:27 +0000
commitc2dbc39224bbe4b3dc944e4c3bd9ae01a0f55b71 (patch)
tree377964e45c75cd0536dc7dfabf39a14637aa2a2f
parent2d89aa53df8d041eff9e5089627f5a2cbef00561 (diff)
downloadgunmake-c2dbc39224bbe4b3dc944e4c3bd9ae01a0f55b71.tar.gz
Formerly GNUmakefile.~83~
-rw-r--r--GNUmakefile16
1 files changed, 8 insertions, 8 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 2b14a7d..6c0ce8d 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -25,7 +25,7 @@ override srcdir := .
# Get most of the information from the Unix-compatible makefile.
include compatMakefile
-extras := $(sort $(filter-out @%@,$(extras)) getloadavg.o)
+extras := $(filter-out getloadavg.o @%@,$(extras)) getloadavg.o
LOADLIBES := $(filter-out @%@,$(LOADLIBES))
ALLOCA := $(filter-out @%@,$(ALLOCA))
@@ -60,8 +60,6 @@ GLOB =
else
-globdep = glob/libglob.a
-globlib = $(globdep)
CPPFLAGS := $(CPPFLAGS) -Iglob
endif # works-for-make
@@ -71,6 +69,9 @@ endif # !no_libc
# We know the type of machine, so put the binaries in subdirectories.
$(ARCH)/%.o: %.c
$(COMPILE.c) $< $(OUTPUT_OPTION)
+$(ARCH)/glob/libglob.a:
+ $(MAKE) -C $(@D) $(@F)
+.PHONY: $(ARCH)/glob/libglob.a
objs := $(addprefix $(ARCH)/,$(objs))
prog := $(ARCH)/make
@@ -90,7 +91,7 @@ CPPFLAGS := -I$(ARCH) $(CPPFLAGS) $(filter-out @%@,$(defines))
ifneq "$(wildcard $(ARCH)/makefile)" ""
include $(ARCH)/makefile
endif
-objs := $(sort $(objs) $(addprefix $(ARCH)/,$(ALLOCA) $(extras)))
+objs := $(objs) $(addprefix $(ARCH)/,$(ALLOCA) $(extras))
else # Not ARCH
prog := make
@@ -116,7 +117,7 @@ mkdep-nolib = $(mkdep)
endif
mkdep = $(CC) -M $(CPPFLAGS)
-depfiles = $(objs:.o=.dep)
+depfiles = $(patsubst %.o,%.dep,$(filter %.o,$(objs)))
ifdef yescustoms
@@ -185,7 +186,7 @@ version := \
tarfiles := make make-doc
tarfiles := $(addsuffix -$(version).tar.Z,$(tarfiles))
# Depend on default and doc so we don't ship anything that won't compile.
-dist: default doc tests $(tarfiles)
+dist: default info dvi tests $(tarfiles)
dist: local-inst
.PHONY: local-inst
@@ -223,8 +224,7 @@ make-doc-$(version).tar.Z: README-doc COPYING make.dvi make.info make.info*
make-$(version).tar.Z: README INSTALL COPYING ChangeLog NEWS \
configure Makefile.in configure.in \
$(srcs) remote-*.c $(globfiles) make.texinfo gpl.texinfo \
- make.cp* make.fn* make.ky* make.pg* make.toc make.tp* make.vr* \
- make.aux make.man texinfo.tex TAGS tags
+ make.?? make.??s make.toc make.aux make.man texinfo.tex TAGS tags
$(make-tar)
ifneq (,)