Module Name: othersrc
Committed By: dholland
Date: Sat Mar 23 22:21:13 UTC 2013
Modified Files:
othersrc/usr.bin/dholland-make2: Makefile Makefile.boot
Log Message:
Switch off the list library.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 othersrc/usr.bin/dholland-make2/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/usr.bin/dholland-make2/Makefile.boot
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/usr.bin/dholland-make2/Makefile
diff -u othersrc/usr.bin/dholland-make2/Makefile:1.3 othersrc/usr.bin/dholland-make2/Makefile:1.4
--- othersrc/usr.bin/dholland-make2/Makefile:1.3 Mon Mar 4 05:47:15 2013
+++ othersrc/usr.bin/dholland-make2/Makefile Sat Mar 23 22:21:13 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/03/04 05:47:15 dholland Exp $
+# $NetBSD: Makefile,v 1.4 2013/03/23 22:21:13 dholland Exp $
# @(#)Makefile 5.2 (Berkeley) 12/28/90
PROG= make
@@ -6,12 +6,6 @@ SRCS= arch.c buf.c compat.c cond.c dir.c
make.c parse.c str.c suff.c targ.c trace.c var.c util.c
SRCS+= array.c strlist.c
SRCS+= portable.c
-SRCS+= lstAppend.c lstAtEnd.c lstAtFront.c lstClose.c lstConcat.c \
- lstDatum.c lstDeQueue.c lstDestroy.c lstDupl.c lstEnQueue.c \
- lstFind.c lstFindFrom.c lstFirst.c lstForEach.c lstForEachFrom.c \
- lstInit.c lstInsert.c lstIsAtEnd.c lstIsEmpty.c lstLast.c \
- lstMember.c lstNext.c lstOpen.c lstRemove.c lstReplace.c lstSucc.c
-SRCS += lstPrev.c
# let people experiment for a bit
USE_META ?= no
@@ -24,7 +18,6 @@ COPTS.meta.c += -DHAVE_FILEMON_H -I${FIL
.endif
.endif
-.PATH: ${.CURDIR}/lst.lib
.if make(install)
SUBDIR= PSD.doc
.endif
Index: othersrc/usr.bin/dholland-make2/Makefile.boot
diff -u othersrc/usr.bin/dholland-make2/Makefile.boot:1.1.1.1 othersrc/usr.bin/dholland-make2/Makefile.boot:1.2
--- othersrc/usr.bin/dholland-make2/Makefile.boot:1.1.1.1 Mon Feb 25 01:32:48 2013
+++ othersrc/usr.bin/dholland-make2/Makefile.boot Sat Mar 23 22:21:13 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.1.1.1 2013/02/25 01:32:48 dholland Exp $
+# $NetBSD: Makefile.boot,v 1.2 2013/03/23 22:21:13 dholland Exp $
#
# a very simple makefile...
#
@@ -24,22 +24,12 @@ LIBS=
OBJ=arch.o buf.o compat.o cond.o dir.o for.o hash.o job.o main.o make.o \
make_malloc.o parse.o str.o strlist.o suff.o targ.o trace.o var.o util.o
-LIBOBJ= lst.lib/lstAppend.o lst.lib/lstAtEnd.o lst.lib/lstAtFront.o \
- lst.lib/lstClose.o lst.lib/lstConcat.o lst.lib/lstDatum.o \
- lst.lib/lstDeQueue.o lst.lib/lstDestroy.o lst.lib/lstDupl.o \
- lst.lib/lstEnQueue.o lst.lib/lstFind.o lst.lib/lstFindFrom.o \
- lst.lib/lstFirst.o lst.lib/lstForEach.o lst.lib/lstForEachFrom.o \
- lst.lib/lstInit.o lst.lib/lstInsert.o lst.lib/lstIsAtEnd.o \
- lst.lib/lstIsEmpty.o lst.lib/lstLast.o lst.lib/lstMember.o \
- lst.lib/lstNext.o lst.lib/lstOpen.o lst.lib/lstRemove.o \
- lst.lib/lstReplace.o lst.lib/lstSucc.o lst.lib/lstPrev.o
-
-bmake: ${OBJ} ${LIBOBJ}
+bmake: ${OBJ}
# @echo 'make of make and make.0 started.'
- ${CC} ${CFLAGS} ${OBJ} ${LIBOBJ} -o bmake ${LIBS}
+ ${CC} ${CFLAGS} ${OBJ} -o bmake ${LIBS}
@ls -l $@
# nroff -h -man make.1 > make.0
# @echo 'make of make and make.0 completed.'
clean:
- rm -f ${OBJ} ${LIBOBJ} ${PORTOBJ} bmake
+ rm -f ${OBJ} ${PORTOBJ} bmake
