Update of /cvsroot/linuxconsole/ruby/ruby-2.6
In directory sc8-pr-cvs1:/tmp/cvs-serv18787/ruby-2.6
Modified Files:
Makefile
Log Message:
sync to 2.6.0-test9
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 2 Oct 2003 09:32:18 -0000 1.2
+++ Makefile 28 Oct 2003 07:17:35 -0000 1.3
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 0
-EXTRAVERSION = -test6-ruby
+EXTRAVERSION = -test9-ruby
# *DOCUMENTATION*
# To see a list of typical targets execute "make help"
@@ -37,7 +37,7 @@
endif
endif
ifndef KBUILD_VERBOSE
- KBUILD_VERBOSE = 0
+ KBUILD_VERBOSE = 0
endif
# Call sparse as part of compilation of C files
@@ -79,16 +79,24 @@
endif
endif
+# That's our default target when none is given on the command line
+.PHONY: all
+all:
+
ifneq ($(KBUILD_OUTPUT),)
# Invoke a second make in the output directory, passing relevant variables
- KBUILD_OUTPUT := $(shell cd $(KBUILD_OUTPUT); /bin/pwd)
+# check that the output directory actually exists
+saved-output := $(KBUILD_OUTPUT)
+KBUILD_OUTPUT := $(shell cd $(KBUILD_OUTPUT) && /bin/pwd)
+$(if $(wildcard $(KBUILD_OUTPUT)),, \
+ $(error output directory "$(saved-output)" does not exist))
-.PHONY: $(MAKECMDGOALS) all
+.PHONY: $(MAKECMDGOALS)
-$(MAKECMDGOALS) all:
+$(filter-out all,$(MAKECMDGOALS)) all:
$(if $(KBUILD_VERBOSE:1=),@)$(MAKE) -C $(KBUILD_OUTPUT) \
KBUILD_SRC=$(CURDIR) KBUILD_VERBOSE=$(KBUILD_VERBOSE) \
- KBUILD_CHECK=$(KBUILD_CHECK) -f $(CURDIR)/Makefile $(MAKECMDGOALS)
+ KBUILD_CHECK=$(KBUILD_CHECK) -f $(CURDIR)/Makefile $@
# Leave processing to above invocation of make
skip-makefile := 1
@@ -156,13 +164,6 @@
HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
HOSTCXXFLAGS = -O2
-
-# That's our default target when none is given on the command line
-# Note that 'modules' will be added as a prerequisite as well,
-# in the CONFIG_MODULES part below
-
-all: vmlinux
-
# Decide whether to build built-in, modular, or both.
# Normally, just do built-in.
@@ -366,6 +367,12 @@
# Build targets only - this includes vmlinux, arch specific targets, clean
# targets and others. In general all targets except *config targets.
+# That's our default target when none is given on the command line
+# Note that 'modules' will be added as a prerequisite as well,
+# in the CONFIG_MODULES part below
+
+all: vmlinux
+
# Objects we will link into vmlinux / subdirs we need to visit
init-y := init/
drivers-y := drivers/ sound/
@@ -753,7 +760,7 @@
.menuconfig.log \
include/asm \
.hdepend include/linux/modversions.h \
- tags TAGS cscope.out kernel.spec \
+ tags TAGS cscope* kernel.spec \
.tmp*
# Directories removed with 'make mrproper'
@@ -877,7 +884,7 @@
@echo ' mrproper - remove all generated files + config + various backup files'
@echo ''
@echo 'Configuration targets:'
- @$(MAKE) -f scripts/kconfig/Makefile help
+ @$(MAKE) -f $(srctree)/scripts/kconfig/Makefile help
@echo ''
@echo 'Other generic targets:'
@echo ' all - Build all targets marked with [*]'
@@ -890,7 +897,7 @@
@echo ' tags/TAGS - Generate tags file for editors'
@echo ''
@echo 'Documentation targets:'
- @$(MAKE) -f Documentation/DocBook/Makefile dochelp
+ @$(MAKE) -f $(srctree)/Documentation/DocBook/Makefile dochelp
@echo ''
@echo 'Architecture specific targets ($(ARCH)):'
@$(if $(archhelp),$(archhelp),\
|
