[OpenAFS-devel] makefile chagnes

[Nathan Neulinger]

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

Split WITH_DEPRECATED into WITH_OBSOLETE and WITH_INSECURE to correspond 
to the options in the configure.in script. (Btw, I do think that those 
configure options should be --enable-insecure and --enable-obsolete, not 
the other way around.)

Also, removes target for sgiefs, since all the corresponding 
code and such was removed elsewhere in openafs.

-- Nathan

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

--FL5UXtIhxfXey3p5
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="split-obsolete-and-insecure.diff"

Index: Makefile
===================================================================
RCS file: /cvs/openafs/src/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile	2001/05/30 19:45:01	1.21
+++ Makefile	2001/06/01 19:44:01
@@ -22,7 +22,8 @@
 
 # Enable build+install of obsolete and insecure packages
 # Set to anything other than YES, or comment out to disable the build
-WITH_DEPRECATED=YES
+WITH_OBSOLETE=YES
+WITH_INSECURE=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
@@ -179,17 +180,7 @@
 dir: project
 	${COMPILE_PART1} dir ${COMPILE_PART2}
 
-# Removed from sgi_* case below:
-# ${COMPILE_PART1} sgiefs ${COMPILE_PART2};;
-sgiefs:
-	case ${SYS_NAME} in \
-	sgi_*) \
-                echo "SGI efs not supported" ;; \
-	*) \
-		echo No efs stuff for ${SYS_NAME};; \
-	esac
-
-vol: project dir afs sgiefs
+vol: project dir afs 
 	${COMPILE_PART1} vol ${COMPILE_PART2}
 
 vlserver: project vol audit
@@ -289,7 +280,6 @@
   kernutil \
   kernacl \
   kvlserver \
-  sgiefs  \
   krxstat
 
 
@@ -552,25 +542,25 @@
 #
 
 mpp: project
-	@case ${WITH_DEPRECATED} in \
+	@case ${WITH_OBSOLETE} in \
 	YES) 	${COMPILE_PART1} mpp ${COMPILE_PART2} ;; \
 	*)	echo skipping deprecated target: mpp ;; \
 	esac
 
 package: project mpp
-	@case ${WITH_DEPRECATED} in \
+	@case ${WITH_OBSOLETE} in \
 	YES) 	${COMPILE_PART1} package ${COMPILE_PART2} ;; \
 	*)	echo skipping deprecated target: package ;; \
 	esac
 
 package.files: package
-	@case ${WITH_DEPRECATED} in \
+	@case ${WITH_OBSOLETE} in \
 	YES) 	${DESTDIR}/bin/makepkgfiles afs.dev ;; \
 	*)	echo skipping deprecated target: package.files ;; \
 	esac
 
 ntp: project volser
-	@case ${WITH_DEPRECATED} in \
+	@case ${WITH_OBSOLETE} in \
 	YES) 	case ${SYS_NAME} in \
 		sun4x_58 | *linux* | *fbsd* | ppc_darwin* ) echo skipping ntp for ${SYS_NAME} ;; \
 		* ) ${COMPILE_PART1} ntp ${COMPILE_PART2} ;; \
@@ -579,7 +569,7 @@
 	esac
 
 sgistuff: project rlogind
-	@case ${WITH_DEPRECATED} in \
+	@case ${WITH_OBSOLETE} in \
 	YES) 	case ${SYS_NAME} in \
 		sgi_* )	${COMPILE_PART1} sgistuff ${COMPILE_PART2} ;; \
 		* ) echo skipping sgistuff for ${SYS_NAME} ;; \
@@ -588,7 +578,7 @@
 	esac
 
 ftpd43+: project kauth rxkad
-	@case ${WITH_DEPRECATED} in \
+	@case ${WITH_INSECURE} in \
 	YES) 	case ${SYS_NAME} in \
 		rs_aix* | sun4x_55 | *linux*) \
 			${COMPILE_PART1} ftpd43+ ${COMPILE_PART2} ;; \
@@ -598,19 +588,19 @@
 	esac
 
 inetd: project kauth rxkad
-	@case ${WITH_DEPRECATED} in \
+	@case ${WITH_INSECURE} in \
 	YES) 	${COMPILE_PART1} inetd ${COMPILE_PART2} ;; \
 	*)	echo skipping deprecated target: inetd ;; \
 	esac
 
 rsh: project inetd
-	@case ${WITH_DEPRECATED} in \
+	@case ${WITH_INSECURE} in \
 	YES) 	${COMPILE_PART1} rsh ${COMPILE_PART2} ;; \
 	*)	echo skipping deprecated target: rsh ;; \
 	esac
 
 rlogind: project rsh ftpd43+ login
-	@case ${WITH_DEPRECATED} in \
+	@case ${WITH_INSECURE} in \
 	YES) 	case ${SYS_NAME} in \
 		rs_aix*) ${COMPILE_PART1} rlogind ${COMPILE_PART2} ;; \
 		*) echo skipping rlogind for ${SYS_NAME} ;; \
@@ -619,7 +609,7 @@
 	esac
 
 rcp: project rsh inetd
-	@case ${WITH_DEPRECATED} in \
+	@case ${WITH_INSECURE} in \
 	YES) 	case ${SYS_NAME} in \
 		sgi_* )	echo skip rcp for ${SYS_NAME} ;; \
 		*)	${COMPILE_PART1} rcp ${COMPILE_PART2} ;; \

--FL5UXtIhxfXey3p5--