mirror of
https://git.savannah.gnu.org/git/make.git
synced 2025-02-12 00:16:30 +00:00
Formerly GNUmakefile.~83~
This commit is contained in:
parent
2d89aa53df
commit
c2dbc39224
1 changed files with 8 additions and 8 deletions
16
GNUmakefile
16
GNUmakefile
|
@ -25,7 +25,7 @@ override srcdir := .
|
||||||
# Get most of the information from the Unix-compatible makefile.
|
# Get most of the information from the Unix-compatible makefile.
|
||||||
include compatMakefile
|
include compatMakefile
|
||||||
|
|
||||||
extras := $(sort $(filter-out @%@,$(extras)) getloadavg.o)
|
extras := $(filter-out getloadavg.o @%@,$(extras)) getloadavg.o
|
||||||
LOADLIBES := $(filter-out @%@,$(LOADLIBES))
|
LOADLIBES := $(filter-out @%@,$(LOADLIBES))
|
||||||
ALLOCA := $(filter-out @%@,$(ALLOCA))
|
ALLOCA := $(filter-out @%@,$(ALLOCA))
|
||||||
|
|
||||||
|
@ -60,8 +60,6 @@ GLOB =
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
globdep = glob/libglob.a
|
|
||||||
globlib = $(globdep)
|
|
||||||
CPPFLAGS := $(CPPFLAGS) -Iglob
|
CPPFLAGS := $(CPPFLAGS) -Iglob
|
||||||
|
|
||||||
endif # works-for-make
|
endif # works-for-make
|
||||||
|
@ -71,6 +69,9 @@ endif # !no_libc
|
||||||
# We know the type of machine, so put the binaries in subdirectories.
|
# We know the type of machine, so put the binaries in subdirectories.
|
||||||
$(ARCH)/%.o: %.c
|
$(ARCH)/%.o: %.c
|
||||||
$(COMPILE.c) $< $(OUTPUT_OPTION)
|
$(COMPILE.c) $< $(OUTPUT_OPTION)
|
||||||
|
$(ARCH)/glob/libglob.a:
|
||||||
|
$(MAKE) -C $(@D) $(@F)
|
||||||
|
.PHONY: $(ARCH)/glob/libglob.a
|
||||||
objs := $(addprefix $(ARCH)/,$(objs))
|
objs := $(addprefix $(ARCH)/,$(objs))
|
||||||
prog := $(ARCH)/make
|
prog := $(ARCH)/make
|
||||||
|
|
||||||
|
@ -90,7 +91,7 @@ CPPFLAGS := -I$(ARCH) $(CPPFLAGS) $(filter-out @%@,$(defines))
|
||||||
ifneq "$(wildcard $(ARCH)/makefile)" ""
|
ifneq "$(wildcard $(ARCH)/makefile)" ""
|
||||||
include $(ARCH)/makefile
|
include $(ARCH)/makefile
|
||||||
endif
|
endif
|
||||||
objs := $(sort $(objs) $(addprefix $(ARCH)/,$(ALLOCA) $(extras)))
|
objs := $(objs) $(addprefix $(ARCH)/,$(ALLOCA) $(extras))
|
||||||
|
|
||||||
else # Not ARCH
|
else # Not ARCH
|
||||||
prog := make
|
prog := make
|
||||||
|
@ -116,7 +117,7 @@ mkdep-nolib = $(mkdep)
|
||||||
endif
|
endif
|
||||||
mkdep = $(CC) -M $(CPPFLAGS)
|
mkdep = $(CC) -M $(CPPFLAGS)
|
||||||
|
|
||||||
depfiles = $(objs:.o=.dep)
|
depfiles = $(patsubst %.o,%.dep,$(filter %.o,$(objs)))
|
||||||
|
|
||||||
|
|
||||||
ifdef yescustoms
|
ifdef yescustoms
|
||||||
|
@ -185,7 +186,7 @@ version := \
|
||||||
tarfiles := make make-doc
|
tarfiles := make make-doc
|
||||||
tarfiles := $(addsuffix -$(version).tar.Z,$(tarfiles))
|
tarfiles := $(addsuffix -$(version).tar.Z,$(tarfiles))
|
||||||
# Depend on default and doc so we don't ship anything that won't compile.
|
# 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
|
dist: local-inst
|
||||||
.PHONY: 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 \
|
make-$(version).tar.Z: README INSTALL COPYING ChangeLog NEWS \
|
||||||
configure Makefile.in configure.in \
|
configure Makefile.in configure.in \
|
||||||
$(srcs) remote-*.c $(globfiles) make.texinfo gpl.texinfo \
|
$(srcs) remote-*.c $(globfiles) make.texinfo gpl.texinfo \
|
||||||
make.cp* make.fn* make.ky* make.pg* make.toc make.tp* make.vr* \
|
make.?? make.??s make.toc make.aux make.man texinfo.tex TAGS tags
|
||||||
make.aux make.man texinfo.tex TAGS tags
|
|
||||||
$(make-tar)
|
$(make-tar)
|
||||||
|
|
||||||
ifneq (,)
|
ifneq (,)
|
||||||
|
|
Loading…
Reference in a new issue