Remove the necessity of -ldes and -lalias etc from release/Makefile.

When building a release, RELEASE_CRUNCH is defined for a `make' of
the objects required by the crunch of each program.  The object list
is still obtained in the same way, so you must make sure that all
objects are built (empty if necessary) by this make.  ppp/Makefile
provides an example.

Reviewed by: jkh

6 files changed, 18 insertions, 18 deletions

diff --git a/release/Makefile b/release/Makefile
index 1c802ac..85e1e92 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.331 1997/10/05 22:31:40 jkh Exp $
+#	$Id: Makefile,v 1.332 1997/10/20 21:57:14 joerg Exp $
 #
 # make release CHROOTDIR=/some/dir BUILDNAME=somename [ RELEASETAG=tag ]
 #
@@ -294,8 +294,8 @@ release.4:
 		mkdir $${j}_crunch && \
 		( cd $${j}_crunch && \
 		crunchgen ${.CURDIR}/$${j}_crunch.conf && \
-		${MAKE} -f $${j}_crunch.mk all NOCRYPT=yes \
-		    "CFLAGS=${CFLAGS} -DCRUNCHED_BINARY") && \
+		${MAKE} -DRELEASE_CRUNCH -f $${j}_crunch.mk subclean all
+		    NOCRYPT=yes "CFLAGS=${CFLAGS} -DCRUNCHED_BINARY") && \
 		mv $${j}_crunch/$${j}_crunch ${RD}/crunch/$${j} && \
 		true || { rm -rf $${j}_crunch ; false ; } ; \
 	done
diff --git a/release/alpha/boot_crunch.conf b/release/alpha/boot_crunch.conf
index 4d3cbbf..b98ceeb 100644
--- a/release/alpha/boot_crunch.conf
+++ b/release/alpha/boot_crunch.conf
@@ -1,4 +1,4 @@
-#	$Id: boot_crunch.conf,v 1.31 1997/09/30 23:58:24 jkh Exp $
+#	$Id: boot_crunch.conf,v 1.32 1997/12/04 14:22:01 jkh Exp $
 
 srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin
 srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin /usr/src/sbin/i386
@@ -11,5 +11,5 @@ ln gzip gunzip
 ln gzip zcat
 ln sh -sh
 
-libs -ll -ledit -lutil -lkvm -lmd -lcrypt -lftpio -lalias -lz
-libs -ldialog -lncurses -lmytinfo -L/usr/src/release/libdisk/obj -ldisk -lipx -ldes
+libs -ll -ledit -lutil -lkvm -lmd -lcrypt -lftpio -lz
+libs -ldialog -lncurses -lmytinfo -L/usr/src/release/libdisk/obj -ldisk -lipx
diff --git a/release/amd64/boot_crunch.conf b/release/amd64/boot_crunch.conf
index 4d3cbbf..b98ceeb 100644
--- a/release/amd64/boot_crunch.conf
+++ b/release/amd64/boot_crunch.conf
@@ -1,4 +1,4 @@
-#	$Id: boot_crunch.conf,v 1.31 1997/09/30 23:58:24 jkh Exp $
+#	$Id: boot_crunch.conf,v 1.32 1997/12/04 14:22:01 jkh Exp $
 
 srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin
 srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin /usr/src/sbin/i386
@@ -11,5 +11,5 @@ ln gzip gunzip
 ln gzip zcat
 ln sh -sh
 
-libs -ll -ledit -lutil -lkvm -lmd -lcrypt -lftpio -lalias -lz
-libs -ldialog -lncurses -lmytinfo -L/usr/src/release/libdisk/obj -ldisk -lipx -ldes
+libs -ll -ledit -lutil -lkvm -lmd -lcrypt -lftpio -lz
+libs -ldialog -lncurses -lmytinfo -L/usr/src/release/libdisk/obj -ldisk -lipx
diff --git a/release/boot_crunch.conf b/release/boot_crunch.conf
index 4d3cbbf..b98ceeb 100644
--- a/release/boot_crunch.conf
+++ b/release/boot_crunch.conf
@@ -1,4 +1,4 @@
-#	$Id: boot_crunch.conf,v 1.31 1997/09/30 23:58:24 jkh Exp $
+#	$Id: boot_crunch.conf,v 1.32 1997/12/04 14:22:01 jkh Exp $
 
 srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin
 srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin /usr/src/sbin/i386
@@ -11,5 +11,5 @@ ln gzip gunzip
 ln gzip zcat
 ln sh -sh
 
-libs -ll -ledit -lutil -lkvm -lmd -lcrypt -lftpio -lalias -lz
-libs -ldialog -lncurses -lmytinfo -L/usr/src/release/libdisk/obj -ldisk -lipx -ldes
+libs -ll -ledit -lutil -lkvm -lmd -lcrypt -lftpio -lz
+libs -ldialog -lncurses -lmytinfo -L/usr/src/release/libdisk/obj -ldisk -lipx
diff --git a/release/i386/boot_crunch.conf b/release/i386/boot_crunch.conf
index 4d3cbbf..b98ceeb 100644
--- a/release/i386/boot_crunch.conf
+++ b/release/i386/boot_crunch.conf
@@ -1,4 +1,4 @@
-#	$Id: boot_crunch.conf,v 1.31 1997/09/30 23:58:24 jkh Exp $
+#	$Id: boot_crunch.conf,v 1.32 1997/12/04 14:22:01 jkh Exp $
 
 srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin
 srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin /usr/src/sbin/i386
@@ -11,5 +11,5 @@ ln gzip gunzip
 ln gzip zcat
 ln sh -sh
 
-libs -ll -ledit -lutil -lkvm -lmd -lcrypt -lftpio -lalias -lz
-libs -ldialog -lncurses -lmytinfo -L/usr/src/release/libdisk/obj -ldisk -lipx -ldes
+libs -ll -ledit -lutil -lkvm -lmd -lcrypt -lftpio -lz
+libs -ldialog -lncurses -lmytinfo -L/usr/src/release/libdisk/obj -ldisk -lipx
diff --git a/release/pc98/boot_crunch.conf b/release/pc98/boot_crunch.conf
index 4d3cbbf..b98ceeb 100644
--- a/release/pc98/boot_crunch.conf
+++ b/release/pc98/boot_crunch.conf
@@ -1,4 +1,4 @@
-#	$Id: boot_crunch.conf,v 1.31 1997/09/30 23:58:24 jkh Exp $
+#	$Id: boot_crunch.conf,v 1.32 1997/12/04 14:22:01 jkh Exp $
 
 srcdirs /usr/src/bin /usr/src/sbin /usr/src/release /usr/src/usr.bin
 srcdirs /usr/src/gnu/usr.bin /usr/src/usr.sbin /usr/src/sbin/i386
@@ -11,5 +11,5 @@ ln gzip gunzip
 ln gzip zcat
 ln sh -sh
 
-libs -ll -ledit -lutil -lkvm -lmd -lcrypt -lftpio -lalias -lz
-libs -ldialog -lncurses -lmytinfo -L/usr/src/release/libdisk/obj -ldisk -lipx -ldes
+libs -ll -ledit -lutil -lkvm -lmd -lcrypt -lftpio -lz
+libs -ldialog -lncurses -lmytinfo -L/usr/src/release/libdisk/obj -ldisk -lipx