patch-2.1.23 linux/Makefile

Next file: linux/Rules.make
Previous file: linux/Documentation/cdrom/cdrom-standard.tex
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.22/linux/Makefile linux/Makefile
@@ -1,6 +1,6 @@
 VERSION = 2
 PATCHLEVEL = 1
-SUBLEVEL = 22
+SUBLEVEL = 23
 
 ARCH = i386
 
@@ -176,12 +176,19 @@
 		$(ARCHIVES) \
 		$(FILESYSTEMS) \
 		$(DRIVERS) \
-		$(LIBS) -o vmlinux
+		$(LIBS) \
+		-o vmlinux
 	$(NM) vmlinux | grep -v '\(compiled\)\|\(\.o$$\)\|\( a \)\|\(\.\.ng$$\)' | sort > System.map
 
 symlinks:
 	rm -f include/asm
 	( cd include ; ln -sf asm-$(ARCH) asm)
+	@if [ ! -d modules ]; then \
+		mkdir modules; \
+	fi
+	@if [ ! -d include/linux/modules ]; then \
+		mkdir include/linux/modules; \
+	fi
 
 oldconfig: symlinks
 	$(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in
@@ -315,7 +322,7 @@
 	rm -f core `find . -type f -name 'core' -print`
 	rm -f vmlinux System.map
 	rm -f .tmp* drivers/sound/configure
-	rm -f modules/*
+	rm -f `find modules/ -type f -print`
 	rm -f submenu*
 
 mrproper: clean
@@ -331,7 +338,8 @@
 	rm -f .depend `find . -name .depend -print`
 	rm -f .hdepend scripts/mkdep
 	rm -f $(TOPDIR)/include/linux/modversions.h
-	rm -f $(TOPDIR)/include/linux/modules/*
+	rm -rf $(TOPDIR)/include/linux/modules
+	rm -rf modules
 
 
 distclean: mrproper

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov