diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2013-10-14 00:00:15 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2013-10-14 00:00:15 +0000 |
| commit | 1f909d7fe60e05c022b8077b00330e4e94bc3f29 (patch) | |
| tree | 30c63679843221d315a468c5e5c420014ae65f68 /distrib/luna88k | |
| parent | d7236a4edd675916c9376c42bf59007d41bdc615 (diff) | |
Turn on the distrib lib bits in crunchgen by setting SRCLIBDIR.
Add the new files to the clean target's rm list.
"why not get it tested?" deraadt@
Diffstat (limited to 'distrib/luna88k')
| -rw-r--r-- | distrib/luna88k/ramdisk/Makefile | 5 | ||||
| -rw-r--r-- | distrib/luna88k/ramdisk/Makefile.inc | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/distrib/luna88k/ramdisk/Makefile b/distrib/luna88k/ramdisk/Makefile index fd8a23af1a6..45944be6d72 100644 --- a/distrib/luna88k/ramdisk/Makefile +++ b/distrib/luna88k/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2013/01/05 11:20:55 miod Exp $ +# $OpenBSD: Makefile,v 1.14 2013/10/14 00:00:10 guenther Exp $ TOP= ${.CURDIR}/.. @@ -78,7 +78,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${CBIN}.conf ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - ${MAKE} -f ${CBIN}.mk all + ${MAKE} -f ${CBIN}.mk SRCLIBDIR=${.CURDIR}/../../../lib all do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u @@ -89,6 +89,7 @@ do_files: clean cleandir: /bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.conf ${CBIN}.mk ${CBIN}.cache \ + lib*.a lib*.olist ${CBIN}.map \ *.o *.lo *.c bsd ${BSD_RD} rdsetroot .include <bsd.obj.mk> diff --git a/distrib/luna88k/ramdisk/Makefile.inc b/distrib/luna88k/ramdisk/Makefile.inc index 3b5037a4888..20a677e3712 100644 --- a/distrib/luna88k/ramdisk/Makefile.inc +++ b/distrib/luna88k/ramdisk/Makefile.inc @@ -1,5 +1,5 @@ # -# $OpenBSD: Makefile.inc,v 1.4 2009/04/17 03:58:54 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.5 2013/10/14 00:00:10 guenther Exp $ # # TOP is assumed to be defined by Makefile including this one. @@ -21,13 +21,13 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf crunchgen -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib ${CBIN}.conf ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - ${MAKE} -f ${CBIN}.mk all + ${MAKE} -f ${CBIN}.mk SRCLIBDIR=${.CURDIR}/../../../lib all #${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} # crunchgen -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib ${CRUNCHCONF} #${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c -# ${MAKE} -f ${CBIN}.mk all +# ${MAKE} -f ${CBIN}.mk SRCLIBDIR=${.CURDIR}/../../../lib all do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u @@ -37,7 +37,9 @@ do_files: rm ${MOUNT_POINT}/${CBIN} clean cleandir: - /bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.lo *.c + /bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \ + *.o *.lo *.c \ + lib*.a lib*.olist ${CBIN}.map .include <bsd.obj.mk> .include <bsd.subdir.mk> |