Update of /cvsroot/linux-vax/kernel-2.5
In directory sc8-pr-cvs1:/tmp/cvs-serv23374
Modified Files:
Makefile
Log Message:
Merge with 2.5.29
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/Makefile,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Makefile 9 Feb 2003 01:37:10 -0000 1.34
+++ Makefile 9 Feb 2003 02:57:38 -0000 1.35
@@ -1,6 +1,6 @@
VERSION = 2
PATCHLEVEL = 5
-SUBLEVEL = 28
+SUBLEVEL = 29
EXTRAVERSION =
# *DOCUMENTATION*
@@ -166,6 +166,15 @@
help tags TAGS sgmldocs psdocs pdfdocs htmldocs \
checkconfig checkhelp checkincludes
+# Helpers built in scripts/
+# ---------------------------------------------------------------------------
+
+scripts/docproc scripts/fixdep scripts/split-include : scripts ;
+
+.PHONY: scripts
+scripts:
+ @$(MAKE) -C scripts
+
ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
# Here goes the main Makefile
@@ -212,7 +221,7 @@
CPPFLAGS := -D__KERNEL__ -I$(HPATH)
-CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -g \
+CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \
-fomit-frame-pointer -fno-strict-aliasing -fno-common
AFLAGS := -D__ASSEMBLY__ $(CPPFLAGS)
@@ -357,15 +366,6 @@
) > $@.tmp
@$(update-if-changed)
-# Helpers built in scripts/
-# ---------------------------------------------------------------------------
-
-scripts/fixdep scripts/split-include : scripts ;
-
-.PHONY: scripts
-scripts:
- @$(MAKE) -C scripts
-
# Generate module versions
# ---------------------------------------------------------------------------
@@ -650,7 +650,7 @@
-name .\*.tmp -o -name .\*.d \) -type f -print \
| grep -v lxdialog/ | xargs rm -f
@rm -f $(CLEAN_FILES)
- @$(MAKE) -C Documentation/DocBook clean
+ @$(MAKE) -f Documentation/DocBook/Makefile clean
mrproper: clean archmrproper
@echo 'Making mrproper'
@@ -659,7 +659,7 @@
-type f -print | xargs rm -f
@rm -f $(MRPROPER_FILES)
@rm -rf $(MRPROPER_DIRS)
- @$(MAKE) -C Documentation/DocBook mrproper
+ @$(MAKE) -f Documentation/DocBook/Makefile mrproper
distclean: mrproper
@echo 'Making distclean'
@@ -732,10 +732,8 @@
# Documentation targets
# ---------------------------------------------------------------------------
-
-sgmldocs psdocs pdfdocs htmldocs:
- @$(MAKE) -C Documentation/DocBook $@
-
+sgmldocs psdocs pdfdocs htmldocs: scripts
+ @$(MAKE) -f Documentation/DocBook/Makefile $@
# Scripts to check various things for consistency
# ---------------------------------------------------------------------------
|
