git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
locks: allow lockd to process blocked locks during grace period
[safe/jmp/linux-2.6]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
baee3d4
..
cab896a
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,7
+1,7
@@
VERSION = 2
PATCHLEVEL = 6
VERSION = 2
PATCHLEVEL = 6
-SUBLEVEL = 2
6
-EXTRAVERSION =
+SUBLEVEL = 2
7
+EXTRAVERSION =
-rc7
NAME = Rotary Wombat
# *DOCUMENTATION*
NAME = Rotary Wombat
# *DOCUMENTATION*
@@
-822,6
+822,9
@@
endif
ifdef CONFIG_SAMPLES
$(Q)$(MAKE) $(build)=samples
endif
ifdef CONFIG_SAMPLES
$(Q)$(MAKE) $(build)=samples
endif
+ifdef CONFIG_BUILD_DOCSRC
+ $(Q)$(MAKE) $(build)=Documentation
+endif
$(call vmlinux-modpost)
$(call if_changed_rule,vmlinux__)
$(Q)rm -f .old_version
$(call vmlinux-modpost)
$(call if_changed_rule,vmlinux__)
$(Q)rm -f .old_version
@@
-929,10
+932,10
@@
ifneq ($(KBUILD_SRC),)
echo " in the '$(srctree)' directory.";\
/bin/false; \
fi;
echo " in the '$(srctree)' directory.";\
/bin/false; \
fi;
- $(Q)if [ ! -d include2 ]; then
mkdir -p include2; fi;
-
$(Q)if [ -e $(srctree)/include/asm-$(SRCARCH)/system.h ]; then
\
+ $(Q)if [ ! -d include2 ]; then
\
+
mkdir -p include2;
\
ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm; \
ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm; \
-
fi
+ fi
endif
# prepare2 creates a makefile if using a separate output directory
endif
# prepare2 creates a makefile if using a separate output directory
@@
-1166,7
+1169,7
@@
MRPROPER_FILES += .config .config.old include/asm .version .old_version \
#
clean: rm-dirs := $(CLEAN_DIRS)
clean: rm-files := $(CLEAN_FILES)
#
clean: rm-dirs := $(CLEAN_DIRS)
clean: rm-files := $(CLEAN_FILES)
-clean-dirs := $(addprefix _clean_,$(srctree) $(vmlinux-alldirs))
+clean-dirs := $(addprefix _clean_,$(srctree) $(vmlinux-alldirs)
Documentation
)
PHONY += $(clean-dirs) clean archclean
$(clean-dirs):
PHONY += $(clean-dirs) clean archclean
$(clean-dirs):
@@
-1492,7
+1495,7
@@
quiet_cmd_cscope-file = FILELST cscope.files
cmd_cscope-file = (echo \-k; echo \-q; $(all-sources)) > cscope.files
quiet_cmd_cscope = MAKE cscope.out
cmd_cscope-file = (echo \-k; echo \-q; $(all-sources)) > cscope.files
quiet_cmd_cscope = MAKE cscope.out
- cmd_cscope = cscope -b
+ cmd_cscope = cscope -b
-f cscope.out
cscope: FORCE
$(call cmd,cscope-file)
cscope: FORCE
$(call cmd,cscope-file)