BSD 4_3_Net_2 release

[unix-history] / usr / src / sys / i386 / conf / Makefile.i386

diff --git a/usr/src/sys/i386/conf/Makefile.i386 b/usr/src/sys/i386/conf/Makefile.i386
index b94b199..42d4108 100644 (file)
--- a/usr/src/sys/i386/conf/Makefile.i386
+++ b/usr/src/sys/i386/conf/Makefile.i386
@@ -1,5 +1,5 @@
 # Copyright 1990 W. Jolitz
 # Copyright 1990 W. Jolitz

-# @(#)Makefile.i386    1.1 %G%
+# @(#)Makefile.i386    7.1 5/10/91

 # Makefile for 4.3 BSD-Reno
 #
 # This makefile is constructed from a machine description:
 # Makefile for 4.3 BSD-Reno
 #
 # This makefile is constructed from a machine description:


@@ -9,7 +9,7 @@
 # after which you should do
 #       config machineid
 # Generic makefile changes should be made in
 # after which you should do
 #       config machineid
 # Generic makefile changes should be made in

-#      /sys/conf/Makefile.i386
+#      /sys/i386/conf/Makefile.i386

 # after which config should be rerun for all machines.
 #
 # N.B.: NO DEPENDENCIES ON FOLLOWING FLAGS ARE INVISIBLE TO MAKEFILE
 # after which config should be rerun for all machines.
 #
 # N.B.: NO DEPENDENCIES ON FOLLOWING FLAGS ARE INVISIBLE TO MAKEFILE


@@ -20,15 +20,15 @@
 #
 TOUCH= touch -f -c
 LD=    /usr/bin/ld
 #
 TOUCH= touch -f -c
 LD=    /usr/bin/ld

-CC=    cc -Dconst=__const__ -Dvolatile=__volatile__ \
-               -Dsigned=__signed__ -Dinline=__inline__ \
-               -Uunix -fpcc-struct-return
+CC=    cc 
+CPP=   cpp

 
 S=     ../..
 I386=  ../../i386
 
 INCLUDES= -I. -I$S -I$S/sys
 
 S=     ../..
 I386=  ../../i386
 
 INCLUDES= -I. -I$S -I$S/sys

-COPTS= ${INCLUDES} ${IDENT} -DKERNEL -Di386 -DNPX -DREFBIT
+COPTS= ${INCLUDES} ${IDENT} -DKERNEL -Di386 -DNPX
+ASFLAGS=

 CFLAGS=        -O ${COPTS}
 
 %OBJS
 CFLAGS=        -O ${COPTS}
 
 %OBJS


@@ -51,13 +51,11 @@ symbols.sort: ${I386}/i386/symbols.raw
        grep -v '^#' ${I386}/i386/symbols.raw \
            | sed 's/^  //' | sort -u > symbols.sort
 
        grep -v '^#' ${I386}/i386/symbols.raw \
            | sed 's/^  //' | sort -u > symbols.sort
 

-locore.o: assym.s ${I386}/i386/locore.s machine/trap.h machine/psl.h machine/pte.h \
-       vector.s ${I386}/isa/icu.s ${I386}/isa/isa.h ${I386}/isa/icu.h
-       cat assym.s ${I386}/i386/locore.s vector.s ${I386}/isa/icu.s > locore.c
-       ${CC} -E -I. -DLOCORE ${COPTS} locore.c > locore.i
-       @echo 'as -o locore.o locore.i'
-       @${AS} -o locore.o locore.i
-       @rm locore.i locore.c
+locore.o: assym.s ${I386}/i386/locore.s machine/trap.h machine/psl.h \
+       machine/pte.h vector.s ${I386}/isa/icu.s ${I386}/isa/isa.h \
+       ${I386}/isa/icu.h
+       ${CPP} -I. -DLOCORE ${COPTS} ${I386}/i386/locore.s | \
+               ${AS} ${ASFLAGS} -o locore.o

 
 # the following is necessary because autoconf.o depends on #if GENERIC
 autoconf.o: Makefile
 
 # the following is necessary because autoconf.o depends on #if GENERIC
 autoconf.o: Makefile


@@ -71,8 +69,8 @@ assym.s machdep.o: Makefile
 # depends on KDB (cons.o also depends on GENERIC)
 trap.o cons.o: Makefile
 
 # depends on KDB (cons.o also depends on GENERIC)
 trap.o cons.o: Makefile
 

-assym.s: $S/sys/param.h machine/pte.h $S/sys/buf.h $S/sys/vmparam.h \
-    $S/sys/vmmeter.h $S/sys/cmap.h $S/sys/map.h \
+assym.s: $S/sys/param.h machine/pte.h $S/sys/buf.h \
+    $S/sys/vmmeter.h $S/sys/map.h \

     $S/sys/proc.h $S/sys/msgbuf.h machine/vmparam.h
 
 assym.s: genassym
     $S/sys/proc.h $S/sys/msgbuf.h machine/vmparam.h
 
 assym.s: genassym


@@ -98,7 +96,8 @@ tags:
        @echo "see $S/kern/Makefile for tags"
 
 ioconf.o: ioconf.c $S/sys/param.h machine/pte.h $S/sys/buf.h $S/sys/map.h \
        @echo "see $S/kern/Makefile for tags"
 
 ioconf.o: ioconf.c $S/sys/param.h machine/pte.h $S/sys/buf.h $S/sys/map.h \

-    $S/sys/vm.h ${I386}/isa/isa_device.h ${I386}/isa/isa.h ${I386}/isa/icu.h
+    ${I386}/isa/isa_device.h ${I386}/isa/isa.h ${I386}/isa/icu.h
+       ${CC} -traditional -c ${CFLAGS} ioconf.c

 
 param.c: $S/conf/param.c
        -rm -f param.c
 
 param.c: $S/conf/param.c
        -rm -f param.c