summaryrefslogtreecommitdiff
path: root/distrib/sparc64
diff options
context:
space:
mode:
authorPhilip Guenther <guenther@cvs.openbsd.org>2013-10-14 00:00:15 +0000
committerPhilip Guenther <guenther@cvs.openbsd.org>2013-10-14 00:00:15 +0000
commit1f909d7fe60e05c022b8077b00330e4e94bc3f29 (patch)
tree30c63679843221d315a468c5e5c420014ae65f68 /distrib/sparc64
parentd7236a4edd675916c9376c42bf59007d41bdc615 (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/sparc64')
-rw-r--r--distrib/sparc64/bsd.rd/Makefile5
-rw-r--r--distrib/sparc64/common/Makefile.inc5
-rw-r--r--distrib/sparc64/ramdisk/Makefile5
-rw-r--r--distrib/sparc64/ramdiskB/Makefile5
4 files changed, 12 insertions, 8 deletions
diff --git a/distrib/sparc64/bsd.rd/Makefile b/distrib/sparc64/bsd.rd/Makefile
index 5277eaecfe8..b4cfb2a59a0 100644
--- a/distrib/sparc64/bsd.rd/Makefile
+++ b/distrib/sparc64/bsd.rd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2013/08/01 16:39:05 stsp Exp $
+# $OpenBSD: Makefile,v 1.25 2013/10/14 00:00:12 guenther Exp $
TOP= ${.CURDIR}/..
@@ -126,7 +126,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf
-c ${CBIN}.c -e ${CBIN} -m ${CBIN}.mk ${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
@@ -137,6 +137,7 @@ do_files:
clean cleandir:
/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}*.cache \
+ lib*.a lib*.olist ${CBIN}.map \
*.o *.lo *.c bsd bsd.rd bsd.gz bsd.strip floppy*.fs rdsetroot
.include <bsd.obj.mk>
diff --git a/distrib/sparc64/common/Makefile.inc b/distrib/sparc64/common/Makefile.inc
index b2ae179d66a..97bda67e3aa 100644
--- a/distrib/sparc64/common/Makefile.inc
+++ b/distrib/sparc64/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.12 2011/04/18 16:52:10 thib Exp $
+# $OpenBSD: Makefile.inc,v 1.13 2013/10/14 00:00:13 guenther Exp $
TOP= ${.CURDIR}/..
@@ -90,7 +90,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
-c ${CBIN}.c -e ${CBIN} -m ${CBIN}.mk ${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
@@ -101,6 +101,7 @@ do_files:
clean cleandir:
/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}*.cache \
+ lib*.a lib*.olist ${CBIN}.map \
*.o *.lo *.c bsd bsd.rd bsd.gz bsd.strip floppy*.fs rdsetroot
.include <bsd.subdir.mk>
diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile
index ecf405fc2a6..ff09a1dd2d7 100644
--- a/distrib/sparc64/ramdisk/Makefile
+++ b/distrib/sparc64/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2011/07/08 21:39:32 drahn Exp $
+# $OpenBSD: Makefile,v 1.27 2013/10/14 00:00:13 guenther Exp $
TOP= ${.CURDIR}/..
@@ -119,7 +119,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf
crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC}
${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
@@ -130,6 +130,7 @@ do_files:
clean cleandir:
/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \
+ lib*.a lib*.olist ${CBIN}.map \
*.o *.lo *.c bsd ${BSD_RD} bsd.gz ${FLOPPY} elfrdsetroot
.ifdef RELEASEDIR
diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile
index fe8acfb8669..3f904d59ac3 100644
--- a/distrib/sparc64/ramdiskB/Makefile
+++ b/distrib/sparc64/ramdiskB/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2011/07/08 21:39:32 drahn Exp $
+# $OpenBSD: Makefile,v 1.20 2013/10/14 00:00:13 guenther Exp $
TOP= ${.CURDIR}/..
@@ -119,7 +119,7 @@ ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf
crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC}
${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
@@ -130,6 +130,7 @@ do_files:
clean cleandir:
/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \
+ lib*.a lib*.olist ${CBIN}.map \
*.o *.lo *.c bsd ${BSD_RD} bsd.gz ${FLOPPY} elfrdsetroot
.ifdef RELEASEDIR