Commit bb1ee97c authored by Kai Germaschewski's avatar Kai Germaschewski

Merge tp1.ruhr-uni-bochum.de:/home/kai/src/kernel/v2.5/linux-2.5

into tp1.ruhr-uni-bochum.de:/home/kai/src/kernel/v2.5/linux-2.5.make
parents 39322528 2cec3daa
...@@ -160,7 +160,8 @@ clean-files := $(DOCBOOKS) \ ...@@ -160,7 +160,8 @@ clean-files := $(DOCBOOKS) \
$(patsubst %.fig,%.png, $(IMG-parportbook)) \ $(patsubst %.fig,%.png, $(IMG-parportbook)) \
$(C-procfs-example) $(C-procfs-example)
clean-rule := rm -rf $(patsubst %.html,%,$(HTML)) ifneq ($(wildcard $(BOOKS)),)
clean-rule := rm -rf $(wildcard $(BOOKS))
endif
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -698,7 +698,7 @@ MRPROPER_DIRS += \ ...@@ -698,7 +698,7 @@ MRPROPER_DIRS += \
clean-dirs += $(ALL_SUBDIRS) Documentation/DocBook scripts clean-dirs += $(ALL_SUBDIRS) Documentation/DocBook scripts
$(addprefix _clean_,$(clean-dirs)): $(addprefix _clean_,$(clean-dirs)):
+@$(call descend,$(patsubst _clean_%,%,$@), subdirclean) $(MAKE) MAKEFILES= -rR -f scripts/Makefile.clean obj=$(patsubst _clean_%,%,$@)
quiet_cmd_rmclean = RM $$(CLEAN_FILES) quiet_cmd_rmclean = RM $$(CLEAN_FILES)
cmd_rmclean = rm -f $(CLEAN_FILES) cmd_rmclean = rm -f $(CLEAN_FILES)
......
ifndef no-rules.make
# #
# This file contains rules which are shared between multiple Makefiles. # This file contains rules which are shared between multiple Makefiles.
# #
...@@ -163,7 +166,7 @@ ifneq ($(strip $(__clean-files) $(clean-rule)),) ...@@ -163,7 +166,7 @@ ifneq ($(strip $(__clean-files) $(clean-rule)),)
rm -f $(__clean-files) rm -f $(__clean-files)
$(clean-rule) $(clean-rule)
else else
@/bin/true @:
endif endif
else else
...@@ -179,7 +182,7 @@ ifeq ($(strip $(export-objs)),) ...@@ -179,7 +182,7 @@ ifeq ($(strip $(export-objs)),)
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
fastdep: $(subdir-ym) fastdep: $(subdir-ym)
@/bin/true @:
else else
...@@ -271,7 +274,7 @@ modules_install: $(subdir-ym) ...@@ -271,7 +274,7 @@ modules_install: $(subdir-ym)
ifneq ($(obj-m),) ifneq ($(obj-m),)
$(call cmd,modules_install) $(call cmd,modules_install)
else else
@/bin/true @:
endif endif
else # ! modules_install else # ! modules_install
...@@ -280,23 +283,18 @@ else # ! modules_install ...@@ -280,23 +283,18 @@ else # ! modules_install
# Building # Building
# ========================================================================== # ==========================================================================
# If a Makefile does define neither O_TARGET nor L_TARGET, # If a Makefile does not define a L_TARGET, link an object called "built-in.o"
# use a standard O_TARGET named "built-in.o"
ifndef O_TARGET
ifndef L_TARGET
O_TARGET := $(obj)/built-in.o
endif
endif
ifdef L_TARGET ifdef L_TARGET
L_TARGET := $(obj)/$(L_TARGET) L_TARGET := $(obj)/$(L_TARGET)
else
O_TARGET := $(obj)/built-in.o
endif endif
first_rule: $(if $(KBUILD_BUILTIN),$(O_TARGET) $(L_TARGET) $(EXTRA_TARGETS)) \ first_rule: $(if $(KBUILD_BUILTIN),$(O_TARGET) $(L_TARGET) $(EXTRA_TARGETS)) \
$(if $(KBUILD_MODULES),$(obj-m)) \ $(if $(KBUILD_MODULES),$(obj-m)) \
$(subdir-ym) $(subdir-ym)
@/bin/true @:
# Compile C sources (.c) # Compile C sources (.c)
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
...@@ -623,3 +621,5 @@ ifeq ($(KBUILD_VERBOSE),1) ...@@ -623,3 +621,5 @@ ifeq ($(KBUILD_VERBOSE),1)
descend = echo '$(MAKE) -f $(1)/Makefile $(2)'; descend = echo '$(MAKE) -f $(1)/Makefile $(2)';
endif endif
descend += $(MAKE) -f $(1)/Makefile obj=$(1) $(2) descend += $(MAKE) -f $(1)/Makefile obj=$(1) $(2)
endif
...@@ -88,6 +88,6 @@ install: vmlinux ...@@ -88,6 +88,6 @@ install: vmlinux
+@$(call makeboot,BOOTIMAGE=$(BOOTIMAGE) install) +@$(call makeboot,BOOTIMAGE=$(BOOTIMAGE) install)
archclean: archclean:
+@$(call makeboot,subdirclean) $(MAKE) -rR -f scripts/Makefile.clean obj=arch/i386/boot
archmrproper: archmrproper:
src := $(obj)
no-rules.make := 1
.PHONY: __clean
__clean:
include $(obj)/Makefile
__subdir-y := $(patsubst %/,%,$(filter %/, $(obj-y)))
subdir-y += $(__subdir-y)
__subdir-m := $(patsubst %/,%,$(filter %/, $(obj-m)))
subdir-m += $(__subdir-m)
__subdir-n := $(patsubst %/,%,$(filter %/, $(obj-n)))
subdir-n += $(__subdir-n)
__subdir- := $(patsubst %/,%,$(filter %/, $(obj-)))
subdir- += $(__subdir-)
subdir-ym := $(sort $(subdir-y) $(subdir-m))
subdir-ymn := $(sort $(subdir-ym) $(subdir-n) $(subdir-))
EXTRA_TARGETS := $(addprefix $(obj)/,$(EXTRA_TARGETS))
clean-files := $(addprefix $(obj)/,$(clean-files))
host-progs := $(addprefix $(obj)/,$(host-progs))
subdir-ymn := $(addprefix $(obj)/,$(subdir-ymn))
__clean-files := $(wildcard $(EXTRA_TARGETS) $(host-progs) $(clean-files))
__clean: $(subdir-ymn)
ifneq ($(strip $(__clean-files) $(clean-rule)),)
rm -f $(__clean-files)
$(clean-rule)
else
@:
endif
.PHONY: $(subdir-ymn)
$(subdir-ymn):
$(MAKE) -rR -f scripts/Makefile.clean obj=$@
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment