new approach for handling aliases (based on local node allocation)

[unix-history] / usr / src / sys / i386 / stand / Makefile

diff --git a/usr/src/sys/i386/stand/Makefile b/usr/src/sys/i386/stand/Makefile
index ed69843..d2ac8ad 100644 (file)
--- a/usr/src/sys/i386/stand/Makefile
+++ b/usr/src/sys/i386/stand/Makefile
@@ -1,4 +1,4 @@
-#      @(#)Makefile    7.7 (Berkeley) %G%
+#      @(#)Makefile    7.9 (Berkeley) %G%

 
 DESTDIR=/
 STAND= ../../stand
 
 DESTDIR=/
 STAND= ../../stand


@@ -18,8 +18,8 @@ CFLAGS=       -DSTANDALONE -DAT386 -O ${INCPATH}
 DRIVERS=cga.c fd.c kbd.c wd.c
 SRCS=  boot.c bootxx.c conf.c confxx.c copy.c fd.c fdbootblk.c prf.c \
        srt0.c wdbootblk.c ${DRIVERS} ${SASRC}
 DRIVERS=cga.c fd.c kbd.c wd.c
 SRCS=  boot.c bootxx.c conf.c confxx.c copy.c fd.c fdbootblk.c prf.c \
        srt0.c wdbootblk.c ${DRIVERS} ${SASRC}

-LIBS=  ${STAND}/obj/libsa.a libdrive.a ${DESTDIR}/usr/lib/libc.a
-SMLIBS=        ${STAND}/smobj/libsmsa.a libdrive.a ${DESTDIR}/usr/lib/libc.a
+LIBS=  libsa/libsa.a libdrive.a ${DESTDIR}/usr/lib/libc.a
+SMLIBS=        libsmsa/libsmsa.a libdrive.a ${DESTDIR}/usr/lib/libc.a

 
 BOOTBLOCKS= wdboot bootwd fdboot bootfd
 DISKUTILS= boot copy cat ls
 
 BOOTBLOCKS= wdboot bootwd fdboot bootfd
 DISKUTILS= boot copy cat ls


@@ -27,10 +27,10 @@ ALL=        ${BOOTBLOCKS} ${DISKUTILS}
 
 all: ${ALL}
 
 
 all: ${ALL}
 

-${STAND}/obj/libsa.a:
-       cd ${STAND}; make
-${STAND}/smobj/libsmsa.a:
-       cd ${STAND}; env MAKEOBJDIR=smobj make LIB=smsa CFLAGS='-O -DSMALL'
+libsa/libsa.a::
+       cd libsa; make
+libsmsa/libsmsa.a::
+       cd libsmsa; make

 
 libdrive.a: conf.o prf.o ${DRIVERS:.c=.o}
        ar crv $@ $?
 
 libdrive.a: conf.o prf.o ${DRIVERS:.c=.o}
        ar crv $@ $?


@@ -160,6 +160,8 @@ clean:
        rm -f boot[a-wyz]? boot[a-wyz]?? boot[a-wyz]?.c boot[a-wyz]??.c \
                conf[a-wyz]?.c conf[a-wyz]??.c
        rm -f format core sboot bootconf.c
        rm -f boot[a-wyz]? boot[a-wyz]?? boot[a-wyz]?.c boot[a-wyz]??.c \
                conf[a-wyz]?.c conf[a-wyz]??.c
        rm -f format core sboot bootconf.c

+       cd libsa; make cleandir
+       cd libsmsa; make cleandir

 
 cleandir: clean
        rm -f ${MAN} tags .depend
 
 cleandir: clean
        rm -f ${MAN} tags .depend