From 5cccfb7b21444e0e73a738d924f82daf27b4854d Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Tue, 14 Jul 2009 14:01:34 +0200 Subject: [PATCH] Remove the distribute, redistribute and distributeworld targets. We don't split things into different distributions and none of this was ever used. Pointed-out-by: pavalos --- Makefile | 4 +--- Makefile.inc1 | 12 +----------- bin/ed/Makefile | 1 - etc/Makefile | 11 +++++------ sbin/mount_nfs/Makefile | 1 - secure/Makefile | 4 ---- secure/Makefile.inc | 2 -- secure/usr.bin/ssh/Makefile | 1 - secure/usr.sbin/sshd/Makefile | 1 - share/mk/bsd.doc.mk | 2 -- share/mk/bsd.subdir.mk | 20 ++------------------ usr.sbin/ppp/Makefile | 1 - usr.sbin/pppd/Makefile | 1 - usr.sbin/sendmail/Makefile | 1 - usr.sbin/tcpdump/Makefile | 1 - 15 files changed, 9 insertions(+), 54 deletions(-) diff --git a/Makefile b/Makefile index c24ff20cc9..2b63fe1b8d 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,7 @@ # TGTS= all all-man buildkernel quickkernel nativekernel \ buildworld crossworld quickworld realquickworld checkdpadd clean \ - cleandepend cleandir depend distribute distributeworld everything \ + cleandepend cleandir depend everything \ hierarchy install installcheck installkernel \ reinstallkernel installmost installworld libraries lint maninstall \ manlint mk most obj objlink regress rerelease tags update \ @@ -84,14 +84,12 @@ BITGTS= files includes BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/} .ORDER: buildworld installworld -.ORDER: buildworld distributeworld .ORDER: buildworld buildkernel .ORDER: buildworld nativekernel .ORDER: buildworld quickkernel .ORDER: buildkernel installkernel .ORDER: buildkernel reinstallkernel .ORDER: quickworld installworld -.ORDER: quickworld distributeworld .ORDER: quickworld buildkernel .ORDER: quickworld nativekernel .ORDER: quickworld quickkernel diff --git a/Makefile.inc1 b/Makefile.inc1 index 7c19162008..6f95ca416e 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -79,7 +79,6 @@ SUBDIR+= usr.bin SUBDIR+= usr.sbin .endif -# etc must be last for "distribute" to work .if exists(${.CURDIR}/etc) SUBDIR+= etc .endif @@ -427,15 +426,12 @@ installcheck: .if !defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/" @case `uname -r` in 1.2*|1.3-*|1.3.*|1.4.*|1.5.0-*|1.5.1-*|1.5.2-*|1.5.3-*) echo "You must upgrade your kernel to at least 1.5.4 and reboot before you can safely installworld, due to libc/system call ABI changes" ; exit 1;; esac .endif -# distributeworld -# -# Distributes everything compiled by a `buildworld'. # # installworld # # Installs everything compiled by a 'buildworld'. # -distributeworld installworld: installcheck +installworld: installcheck cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//} ${INSTALL} -o root -g wheel -m 644 ${.CURDIR}/Makefile_upgrade.inc ${DESTDIR}/etc/upgrade/ @@ -464,12 +460,6 @@ reinstall: cd ${.CURDIR}/share/man; ${MAKE} makedb .endif -redistribute: - @echo "--------------------------------------------------------------" - @echo ">>> Distributing everything.." - @echo "--------------------------------------------------------------" - cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute - # # buildkernel, nativekernel, quickkernel, and installkernel # diff --git a/bin/ed/Makefile b/bin/ed/Makefile index bb997aa084..923f41d4e3 100644 --- a/bin/ed/Makefile +++ b/bin/ed/Makefile @@ -9,7 +9,6 @@ MLINKS= ed.1 red.1 WARNS?= 2 .if exists(${.CURDIR}/../../secure) && !defined(NO_CRYPT) -DISTRIBUTION=crypto CFLAGS+=-DDES DPADD= ${LIBCRYPTO} LDADD= -lcrypto diff --git a/etc/Makefile b/etc/Makefile index bfc08ea4f3..feefaa6fbf 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -80,18 +80,17 @@ COMPAT_LIBS != cd ${DESTDIR}/usr/lib/compat && find . -name '*.so.*' # Use this directory as the source for new configuration files when upgrading UPGRADE_SRCDIR?=${.CURDIR} -distribute: - cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION} - # Include file which contains obsolete files .if exists(${DESTDIR}/etc/upgrade/Makefile_upgrade.inc) .include "${DESTDIR}/etc/upgrade/Makefile_upgrade.inc" -.else - @echo "Please do a make installworld first. See build(7) for further" - @echo "information." .endif remove-obsolete-files: + @if [ -z "${TO_REMOVE}" ]; then \ + echo "Please do a 'make installworld' first."; \ + echo "See build(7) for further information."; \ + exit 1; \ + fi; @echo "===> Remove now obsolete files" @for item in ${TO_REMOVE:M*.info.gz}; do \ if [ -e ${DESTDIR}$${item} ]; then \ diff --git a/sbin/mount_nfs/Makefile b/sbin/mount_nfs/Makefile index fac2cc3063..3f05d8bf94 100644 --- a/sbin/mount_nfs/Makefile +++ b/sbin/mount_nfs/Makefile @@ -16,7 +16,6 @@ CFLAGS+= -DNFS -I${MOUNT} -I${UMNTALL} CFLAGS+=-DKERBEROS DPADD= ${LIBKRB} ${LIBCRYPTO} LDADD= -lkrb -lcrypto -DISTRIBUTION= krb .endif .include diff --git a/secure/Makefile b/secure/Makefile index 4e2e48bd08..1b01075489 100644 --- a/secure/Makefile +++ b/secure/Makefile @@ -13,10 +13,6 @@ CODAI= ${MAKE} ${MFLAGS} cleandir; \ ${MAKE} ${MFLAGS} obj; \ ${MAKE} ${MFLAGS} depend all install -CODAD= ${MAKE} ${MFLAGS} cleandir; \ - ${MAKE} ${MFLAGS} obj; \ - ${MAKE} ${MFLAGS} depend all distribute - # These are the programs which depend on secure libs sprog: cd ${SDIR}/bin/ed; ${CODAI} diff --git a/secure/Makefile.inc b/secure/Makefile.inc index d6fc8f9ce2..354e7a4e4e 100644 --- a/secure/Makefile.inc +++ b/secure/Makefile.inc @@ -1,8 +1,6 @@ # $FreeBSD: src/secure/Makefile.inc,v 1.13.2.5 2002/07/03 22:13:19 des Exp $ # $DragonFly: src/secure/Makefile.inc,v 1.4 2005/09/06 18:55:25 dillon Exp $ -DISTRIBUTION?=crypto - .if exists(${.CURDIR}/../../lib/libcrypt/obj) CRYPTOBJDIR= ${.CURDIR}/../../lib/libcrypt/obj .else diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index 2cf6f66458..63445df5b0 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -12,7 +12,6 @@ SRCS= channels.c clientloop.c kex.c misc.c monitor_fdpass.c mux.c packet.c \ uidswap.c .if defined(WANT_KERBEROS) -DISTRIBUTION=krb5 CFLAGS+= -DKRB5 -DHEIMDAL LDADD+= -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken -lcrypt DPADD+= ${LIBKRB5} ${LIBCOM_ERR} ${LIBASN1} ${LIBMD} ${LIBCRYPT} diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index e896f6903c..3376691acb 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -25,7 +25,6 @@ CFLAGS+=-DUSE_PAM -DHAVE_SECURITY_PAM_APPL_H \ -DHAVE_PAM_GETENVLIST -DHAVE_PAM_PUTENV .if defined(WANT_KERBEROS) -DISTRIBUTION=krb5 CFLAGS+= -DKRB5 -DHEIMDAL SRCS+= auth-krb5.c LDADD+= -lkrb5 -lasn1 -lcom_err -lmd -L${.OBJDIR}/../../../kerberos5/lib/libroken -lroken diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk index 655a5804c4..29298fa01f 100644 --- a/share/mk/bsd.doc.mk +++ b/share/mk/bsd.doc.mk @@ -137,6 +137,4 @@ ${DFILE}: ${SRCS} _stamp.extraobjs .endif .endif -DISTRIBUTION?= doc - .include diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk index 8309a4d1bd..f17142bd37 100644 --- a/share/mk/bsd.subdir.mk +++ b/share/mk/bsd.subdir.mk @@ -13,18 +13,12 @@ # # +++ variables +++ # -# DISTRIBUTION Name of distribution. [bin] -# # SUBDIR A list of subdirectories that should be built as well. # Each of the targets will execute the same target in the # subdirectories. # # +++ targets +++ # -# distribute: -# This is a variant of install, which will -# put the stuff into the right "distribution". -# # afterinstall, all, all-man, beforeinstall, checkdpadd, # clean, cleandepend, cleandir, depend, install, lint, maninstall, # manlint, obj, objlink, realinstall, regress, tags @@ -32,15 +26,6 @@ .include -DISTRIBUTION?= bin -.if !target(distribute) -distribute: -.for dist in ${DISTRIBUTION} - cd ${.CURDIR}; \ - ${MAKE} install -DNO_SUBDIR DESTDIR=${DISTDIR}/${dist} SHARED=copies -.endfor -.endif - _SUBDIR: .USE .if defined(SUBDIR) && !empty(SUBDIR) && !defined(NO_SUBDIR) @for entry in ${SUBDIR}; do \ @@ -68,7 +53,7 @@ ${SUBDIR}:: .for __target in all all-man checkdpadd clean cleandepend cleandir \ - depend distribute lint maninstall manlint \ + depend lint maninstall manlint \ obj objlink realinstall regress tags ${__target}: _SUBDIR .endfor @@ -97,5 +82,4 @@ install: beforeinstall realinstall afterinstall .ORDER: clean cleandepend cleandir cleanobj \ obj objlink tags depend all all-man \ - install maninstall realinstall distribute - + install maninstall realinstall diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile index f6ed5d9c50..c46a29e641 100644 --- a/usr.sbin/ppp/Makefile +++ b/usr.sbin/ppp/Makefile @@ -66,7 +66,6 @@ SRCS+= id.c .if !exists(${.CURDIR}/../../secure) || defined(NO_CRYPT) || defined(NO_OPENSSL) || defined(NODES) CFLAGS+=-DNODES .else -DISTRIBUTION=crypto SRCS+= chap_ms.c mppe.c LDADD+= -lcrypto DPADD+= ${LIBCRYPTO} diff --git a/usr.sbin/pppd/Makefile b/usr.sbin/pppd/Makefile index 7ad64c6054..b383785f42 100644 --- a/usr.sbin/pppd/Makefile +++ b/usr.sbin/pppd/Makefile @@ -30,7 +30,6 @@ DPADD+= ${LIBPCAP} # MS-CHAP support. Requires the DES library. .if exists(${.CURDIR}/../../secure) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) -DISTRIBUTION=crypto CFLAGS+=-DCHAPMS SRCS+= chap_ms.c LDADD+= -lcrypto diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile index 8c291c1707..1a686ac90a 100644 --- a/usr.sbin/sendmail/Makefile +++ b/usr.sbin/sendmail/Makefile @@ -66,7 +66,6 @@ CLEANFILES+=sm_os.h .if exists(${.CURDIR}/../../secure) && !defined(NO_CRYPT) && \ !defined(NO_OPENSSL) # STARTTLS support -DISTRIBUTION= crypto CFLAGS+= -DSTARTTLS -D_FFR_TLS_1 LDADD+= -lssl -lcrypto DPADD+= ${LIBSSL} ${LIBCRYPTO} diff --git a/usr.sbin/tcpdump/Makefile b/usr.sbin/tcpdump/Makefile index 321ed3c2cd..44f2ad77ad 100644 --- a/usr.sbin/tcpdump/Makefile +++ b/usr.sbin/tcpdump/Makefile @@ -57,7 +57,6 @@ CFLAGS+= -DLBL_ALIGN DPADD= ${LIBL} ${LIBPCAP} LDADD= -ll -lpcap .if exists(../../secure) && !defined(NO_CRYPT) && !defined(NO_OPENSSL) -DISTRIBUTION=crypto DPADD+= ${LIBCRYPTO} LDADD+= -lcrypto CFLAGS+= -I${DESTDIR}/usr/include/openssl -DHAVE_LIBCRYPTO -DHAVE_OPENSSL_EVP_H -- 2.41.0