[OpenAFS-devel] Add a WITH_DEPRECATED flag to toplevel makefile

[Nathan Neulinger]

--pWyiEgJYm5f9v55/
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

WITH_DEPRECATED=YES - the default, says to go ahead and build all the 
deprecated/obsolete/insecure apps such as ntpd, mpp, package, r*, ftpd.

If you comment it out, or change to anything other than YES, all those 
progs will be skipped during the build process. 

Also rearranges the items in the makefile slightly to move all this stuff 
together at the end.

This should lend itself well to translating to an autoconf replacement in 
the Makefile similar to the way maintainer-rules is handled. 

-- Nathan

------------------------------------------------------------
Nathan Neulinger                       EMail:  nneul@umr.edu
University of Missouri - Rolla         Phone: (573) 341-4841
Computing Services                       Fax: (573) 341-4216

--pWyiEgJYm5f9v55/
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="with-deprecated.diff"

Index: Makefile
===================================================================
RCS file: /cvs/openafs/src/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile	2001/04/04 17:08:52	1.15
+++ Makefile	2001/04/04 17:54:49
@@ -20,6 +20,10 @@
 
 MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1
 
+# Enable build+install of obsolete and insecure packages
+# Set to anything other than YES, or comment out to disable the build
+WITH_DEPRECATED=YES
+
 # To compile AFS from scratch in the src tree run "make SYS_NAME=<type>".
 #   This recursively calls "make install ..." and does not depend on the
 #   existence of any non-standard programs.
@@ -218,26 +222,9 @@
 scout: project gtx fsprobe
 	${COMPILE_PART1} scout ${COMPILE_PART2}
 
-mpp: project
-	${COMPILE_PART1} mpp ${COMPILE_PART2}
-
-package: project mpp
-	${COMPILE_PART1} package ${COMPILE_PART2}
-
-package.files: package
-	${DESTDIR}/bin/makepkgfiles afs.dev
-
 uss: des kauth project rx vlserver vol
 	${COMPILE_PART1} uss ${COMPILE_PART2}
 
-ntp: project volser
-	case ${SYS_NAME} in \
-	  sun4x_58 ) echo skipping ntp for ${SYS_NAME} ;; \
-	  *linux* ) echo skipping ntp for ${SYS_NAME} ;; \
-	  ppc_darwin* ) echo skipping ntp for ${SYS_NAME} ;; \
-	  * ) ${COMPILE_PART1} ntp ${COMPILE_PART2} ;; \
-	esac
-
 #convert: project ntp
 #	${COMPILE_PART1} convert ${COMPILE_PART2}
 
@@ -279,40 +266,6 @@
 		${COMPILE_PART1} login ${COMPILE_PART2} ;; \
 	esac
 
-ftpd43+: project kauth rxkad
-	case ${SYS_NAME} in \
-	rs_aix* | sun4x_55 | *linux*) \
-		${COMPILE_PART1} ftpd43+ ${COMPILE_PART2} ;; \
-	* )	echo skip ftpd43+ for ${SYS_NAME} ;; \
-	esac
-
-inetd: project kauth rxkad
-	${COMPILE_PART1} inetd ${COMPILE_PART2} 
-
-rsh: project inetd
-	${COMPILE_PART1} rsh ${COMPILE_PART2} 
-
-rlogind: project rsh ftpd43+ login
-	case ${SYS_NAME} in \
-	rs_aix*) \
-		${COMPILE_PART1} rlogind ${COMPILE_PART2} ;; \
-	* )	echo skipping rlogind for ${SYS_NAME} ;; \
-	esac
-
-sgistuff: project rlogind
-	case ${SYS_NAME} in \
-	sgi_* )	${COMPILE_PART1} sgistuff ${COMPILE_PART2} ;; \
-	* )	echo skipping sgistuff for ${SYS_NAME} ;; \
-	esac
-
-rcp: project rsh inetd
-	case ${SYS_NAME} in \
-	sgi_* )	echo skip rcp for ${SYS_NAME} ;; \
-	*)	${COMPILE_PART1} rcp ${COMPILE_PART2} ;; \
-	esac
-
-allrcmds: project rcp rlogind
-
 KERNELDIR= \
   afs \
   dir \
@@ -398,6 +351,9 @@
 afsmonitor: project gtx xstat
 	${COMPILE_PART1} afsmonitor ${COMPILE_PART2}
 
+#
+# Washtool internal targets
+#
 ircs: project
 	case ${SYS_NAME} in \
 	sgi_* ) \
@@ -567,3 +523,75 @@
 	for file in `find [!NW]* -type f -print` ; do \
 		/bin/ln -s `pwd`/$${file} $${here}/obj/$${file} ; \
 	done;
+
+#
+# Below targets are all deprecated, insecure, or obsolte, 
+# see README.OBSOLETE and README.INSECURE for more info
+#
+
+mpp: project
+	${COMPILE_PART1} mpp ${COMPILE_PART2}
+
+package: project mpp
+	${COMPILE_PART1} package ${COMPILE_PART2}
+
+package.files: package
+	${DESTDIR}/bin/makepkgfiles afs.dev
+
+ntp: project volser
+	if test "x${WITH_DEPRECATED}" = "xYES"; then \
+	case ${SYS_NAME} in \
+	  sun4x_58 ) echo skipping ntp for ${SYS_NAME} ;; \
+	  *linux* ) echo skipping ntp for ${SYS_NAME} ;; \
+	  ppc_darwin* ) echo skipping ntp for ${SYS_NAME} ;; \
+	  * ) ${COMPILE_PART1} ntp ${COMPILE_PART2} ;; \
+	esac; \
+	fi
+
+sgistuff: project rlogind
+	if test "x${WITH_DEPRECATED}" = "xYES"; then \
+	case ${SYS_NAME} in \
+	sgi_* )	${COMPILE_PART1} sgistuff ${COMPILE_PART2} ;; \
+	* )	echo skipping sgistuff for ${SYS_NAME} ;; \
+	esac ; \
+	fi
+
+ftpd43+: project kauth rxkad
+	if test "x${WITH_DEPRECATED}" = "xYES"; then \
+	case ${SYS_NAME} in \
+	rs_aix* | sun4x_55 | *linux*) \
+		${COMPILE_PART1} ftpd43+ ${COMPILE_PART2} ;; \
+	* )	echo skip ftpd43+ for ${SYS_NAME} ;; \
+	esac; \
+	fi
+
+inetd: project kauth rxkad
+	if test "x${WITH_DEPRECATED}" = "xYES"; then \
+	${COMPILE_PART1} inetd ${COMPILE_PART2} ; \
+	fi
+
+rsh: project inetd
+	if test "x${WITH_DEPRECATED}" = "xYES"; then \
+	${COMPILE_PART1} rsh ${COMPILE_PART2} ; \
+	fi
+
+rlogind: project rsh ftpd43+ login
+	if test "x${WITH_DEPRECATED}" = "xYES"; then \
+	case ${SYS_NAME} in \
+	rs_aix*) \
+		${COMPILE_PART1} rlogind ${COMPILE_PART2} ;; \
+	* )	echo skipping rlogind for ${SYS_NAME} ;; \
+	esac ; \
+	fi
+
+rcp: project rsh inetd
+	if test "x${WITH_DEPRECATED}" = "xYES"; then \
+	case ${SYS_NAME} in \
+	sgi_* )	echo skip rcp for ${SYS_NAME} ;; \
+	*)	${COMPILE_PART1} rcp ${COMPILE_PART2} ;; \
+	esac ; \
+	fi
+
+allrcmds: project rcp rlogind
+
+

--pWyiEgJYm5f9v55/--