Update of /cvsroot/linux-vax/kernel-2.5
In directory sc8-pr-cvs1:/tmp/cvs-serv13677
Modified Files:
Makefile Rules.make
Log Message:
Merge with 2.5.40
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Makefile 12 Mar 2003 22:58:26 -0000 1.46
+++ Makefile 14 Mar 2003 00:38:44 -0000 1.47
@@ -1,6 +1,6 @@
VERSION = 2
PATCHLEVEL = 5
-SUBLEVEL = 39
+SUBLEVEL = 40
EXTRAVERSION =
# *DOCUMENTATION*
@@ -706,7 +706,7 @@
include/asm \
.hdepend $(TOPDIR)/include/linux/modversions.h \
tags TAGS kernel.spec \
- .tmpversion
+ .tmp*
# directories removed with 'make mrproper'
MRPROPER_DIRS += \
@@ -732,8 +732,8 @@
@find . $(RCS_FIND_IGNORE) \
\( -name .depend -o -name .\*.cmd \) \
-type f -print | xargs rm -f
- @rm -f $(MRPROPER_FILES)
@rm -rf $(MRPROPER_DIRS)
+ @rm -f $(MRPROPER_FILES)
@$(MAKE) -C scripts mrproper
@$(MAKE) -f Documentation/DocBook/Makefile mrproper
@@ -756,7 +756,7 @@
find arch/$(ARCH) $(RCS_FIND_IGNORE) \
-name '*.[chS]' -print; \
find include $(RCS_FIND_IGNORE) \
- \( -name config -o -name 'asm-*' \) -prune -o \
+ \( -name config -o -name 'asm-*' \) -prune \
-o -name '*.[chS]' -print; \
find include/asm-$(ARCH) $(RCS_FIND_IGNORE) \
-name '*.[chS]' -print; \
Index: Rules.make
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Rules.make,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Rules.make 16 Feb 2003 02:07:42 -0000 1.20
+++ Rules.make 14 Mar 2003 00:38:44 -0000 1.21
@@ -520,6 +520,13 @@
include $(cmd_files)
endif
+# Emacs compile mode works best with relative paths to find files (OK
+# if verbose, as it tracks the make[1] entries and exits, etc.)
+
+ifneq ($(KBUILD_VERBOSE),1)
+ filter-output = 2>&1 | sed 's \(^[^/][A-Za-z0-9_./-]*:[ 0-9]\) $(RELDIR)/\1 '
+endif
+
# function to only execute the passed command if necessary
if_changed = $(if $(strip $? \
@@ -539,7 +546,7 @@
$(filter-out $(cmd_$@),$(cmd_$(1)))),\
@set -e; \
$(if $($(quiet)cmd_$(1)),echo ' $($(quiet)cmd_$(1))';) \
- $(cmd_$(1)); \
+ $(cmd_$(1)) $(filter-output); \
$(TOPDIR)/scripts/fixdep $(depfile) $@ $(TOPDIR) '$(cmd_$(1))' > $(@D)/.$(@F).tmp; \
rm -f $(depfile); \
mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd)
|
