patch-1.3.42 linux/Makefile

• Lines: 66
• Date: Tue Nov 14 16:03:52 1995
• Orig file: v1.3.41/linux/Makefile
• Orig date: Mon Nov 13 12:36:42 1995

diff -u --recursive --new-file v1.3.41/linux/Makefile linux/Makefile
@@ -1,6 +1,6 @@
 VERSION = 1
 PATCHLEVEL = 3
-SUBLEVEL = 41
+SUBLEVEL = 42
 
 ARCH = i386
 
@@ -9,8 +9,7 @@
 # because it makes re-config very ugly and too many fundamental files depend
 # on "CONFIG_SMP"
 #
-# NOTE! SMP is experimental, and gcc-2.5.8 is recommended. See the file
-# Documentation/SMP.
+# NOTE! SMP is experimental. See the file Documentation/SMP.txt
 #
 # SMP = 1
 
@@ -62,6 +61,15 @@
 ROOT_DEV = CURRENT
 
 #
+# NFS_ROOT_NAME specifies the default name of the directory to mount
+# as root via NFS, if the kernel does not get the "root=" option from
+# the boot loader. The "%s" will be replaced by the IP-number of the
+# local system.
+#
+
+NFS_ROOT = -DNFS_ROOT="\"/tftpboot/%s\""
+
+#
 # INSTALL_PATH specifies where to place the updated kernel and system map
 # images.  Uncomment if you want to place them anywhere other than root.
 
@@ -126,11 +134,22 @@
 
 include arch/$(ARCH)/Makefile
 
+ifdef SMP
+
+.S.s:
+	$(CC) -D__ASSEMBLY__ -D__SMP__ -traditional -E -o $*.s $<
+.S.o:
+	$(CC) -D__ASSEMBLY__ -D__SMP__ -traditional -c -o $*.o $<
+
+else
+
 .S.s:
 	$(CC) -D__ASSEMBLY__ -traditional -E -o $*.s $<
 .S.o:
 	$(CC) -D__ASSEMBLY__ -traditional -c -o $*.o $<
 
+endif
+
 Version: dummy
 	@rm -f include/linux/compile.h
 
@@ -200,7 +219,7 @@
 	$(CC) $(CFLAGS) -DUTS_MACHINE='"$(ARCH)"' -c -o init/version.o init/version.c
 
 init/main.o: init/main.c
-	$(CC) $(CFLAGS) $(PROFILING) -c -o $*.o $<
+	$(CC) $(CFLAGS) $(PROFILING) $(NFS_ROOT) -c -o $*.o $<
 
 fs: dummy
 	$(MAKE) linuxsubdirs SUBDIRS=fs