From: Nickolai Zeldovich <kolya@mit.edu>
Date: Sun, 20 Jan 2002 08:27:54 +0000 (+0000)
Subject: STABLE12-solaris9-and-makefile-updates-20020120
X-Git-Tag: openafs-stable-1_2_3~49
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=cb2bb6c104e4cfeba2d43a5bb9572703496e5483;p=packages%2Fo%2Fopenafs.git

STABLE12-solaris9-and-makefile-updates-20020120


updates for solaris 9; also don't have ${XLIBS} in target dependancies
if it's going to include things like -lnsl
---

diff --git a/Makefile.in b/Makefile.in
index cdecbdf9f..84c22bc11 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -134,7 +134,7 @@ comerr: util
 
 cmd: comerr
 	@case ${SYS_NAME} in \
-	sgi_6* | sun4x_57 | sun4x_58 | hp_ux11* | sparc64_linux* | alpha_linux* ) \
+	sgi_6* | sun4x_5[789] | hp_ux11* | sparc64_linux* | alpha_linux* ) \
 		${COMPILE_PART1} cmd ${COMPILE_PART2}64 ;; \
 	*) \
 		${COMPILE_PART1} cmd ${COMPILE_PART2} ;; \
diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in
index 04d8ba6a8..60f8aeb23 100644
--- a/src/auth/Makefile.in
+++ b/src/auth/Makefile.in
@@ -39,7 +39,7 @@ CFLAGS=-g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
 LIBS=libauth.a ${TOP_LIBDIR}/libsys.a \
       ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libdes.a \
       ${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/libsys.a \
-      ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/util.a ${XLIBS}
+      ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/util.a
 INCLS=cellconfig.h auth.h keys.h
 KSRCS=auth.h
 UKSRCS=${KSRCS} cellconfig.h acfg_errors.c keys.h cellconfig.c \
@@ -69,11 +69,11 @@ libauth.krb.a: $(KOBJS) AFS_component_version_number.o
 	$(AR) crv $@ $(KOBJS) AFS_component_version_number.o
 	$(RANLIB) $@
 
-copyauth: copyauth.o
-	$(CC) $(CFLAGS) -o copyauth copyauth.o ${LIBS}
+copyauth: copyauth.o 
+	$(CC) $(CFLAGS) -o copyauth copyauth.o ${LIBS} ${XLIBS}
 
-setkey: setkey.o
-	${CC} $(CFLAGS) -o setkey setkey.o ${LIBS}
+setkey: setkey.o 
+	${CC} $(CFLAGS) -o setkey setkey.o ${LIBS} ${XLIBS}
 
 acfg_errors.o: acfg_errors.c
 
diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in
index d30fc494f..59360c1db 100644
--- a/src/kauth/Makefile.in
+++ b/src/kauth/Makefile.in
@@ -200,7 +200,7 @@ user.krb.o: user.c ${INCLS} ${TOP_INCDIR}/afs/vice.h
 user.o: user.c ${INCLS} ${TOP_INCDIR}/afs/vice.h
 	${CC} ${CFLAGS} -c user.c
 
-kdb: kdb.o ${INCLS}
+kdb: kdb.o ${INCLS} ${LIBS} libkauth.a
 	${CC} ${LDFLAGS} -o kdb kdb.o libkauth.a ${LIBS} ${XLIBS}
 kdb.o: kdb.c AFS_component_version_number.o
 
diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in
index bfa2000ea..cdf33b568 100644
--- a/src/venus/Makefile.in
+++ b/src/venus/Makefile.in
@@ -105,7 +105,7 @@ ${DEST}/etc/kdump: kdump
 		for f in kdump.IP??; \
 			do ${INSTALL} -s $$f ${DEST}/etc/$$f || exit $$? ; \
 		done ;; \
-	sun4x_5[78] ) \
+	sun4x_5[789] ) \
 		${INSTALLex} -f kdump.sh.solaris7 $@; \
 		${INSTALL} -s -f $? ${DEST}/etc/kdump32;; \
 	*linux* ) \
@@ -121,7 +121,7 @@ ${DEST}/etc/kdump: kdump
 ${DEST}/etc/kdump64: kdump64
 	-set -x; \
 	case ${SYS_NAME} in \
-	sun4x_5[78] | hp_ux11* ) \
+	sun4x_5[789] | hp_ux11* ) \
 		${INSTALL} -s $? $@ ;;\
 	* ) \
 		echo skipping kdump64 for ${SYS_NAME} ;; \
@@ -219,7 +219,7 @@ kdump.o: kdump.c ${INCLS} AFS_component_version_number.c
 kdump64.o : kdump.c ${INCLS} AFS_component_version_number.c
 	-set -x; \
 	case ${SYS_NAME} in \
-	sun4x_5[78] | hp_ux11* ) \
+	sun4x_5[789] | hp_ux11* ) \
 		${CC} -g -I${TOP_INCDIR} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS64} -o kdump64.o -c kdump.c ;; \
 	esac
 
@@ -262,7 +262,7 @@ kdump:  kdump.o
 kdump64 : kdump64.o
 	-set -x; \
 	case ${SYS_NAME} in \
-	sun4x_5[78] | hp_ux11* )  \
+	sun4x_5[789] | hp_ux11* )  \
 		${CC} -g ${XCFLAGS64} -o kdump64 kdump64.o ${TOP_LIBDIR}/libcmd64.a ${XLIBELFA} ${XLIBKVM} ${XLIBS} ;; \
 	esac
 
@@ -320,7 +320,7 @@ ${DESTDIR}${sbindir}/kdump: kdump
 		for f in kdump.IP??; \
 			do ${INSTALL} -s $$f ${DESTDIR}${sbindir}/$$f || exit $$? ; \
 		done ;; \
-	sun4x_5[78] ) \
+	sun4x_5[789] ) \
 		${INSTALLex} -f kdump.sh.solaris7 $@; \
 		${INSTALL} -s -f $? ${DESTDIR}${sbindir}/kdump32;; \
 	*linux* ) \
@@ -335,7 +335,7 @@ ${DESTDIR}${sbindir}/kdump: kdump
 ${DESTDIR}${sbindir}/kdump64: kdump64
 	-set -x; \
 	case ${SYS_NAME} in \
-	sun4x_5[78] | hp_ux11* ) \
+	sun4x_5[789] | hp_ux11* ) \
 		${INSTALL} -s $? $@ ;;\
 	* ) \
 		echo skipping kdump64 for ${SYS_NAME} ;; \
diff --git a/src/vol/Makefile.in b/src/vol/Makefile.in
index c93d91794..e36f8564d 100644
--- a/src/vol/Makefile.in
+++ b/src/vol/Makefile.in
@@ -33,7 +33,7 @@ LDFLAGS = ${OPTMZ} ${PROF} ${LDIRS} ${XLDFLAGS}
 
 LIBS=${TOP_LIBDIR}/libcmd.a vlib.a ${TOP_LIBDIR}/util.a \
 	${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libdir.a \
-	${TOP_LIBDIR}/liblwp.a  ${TOP_LIBDIR}/libacl.a ${XLIBS}
+	${TOP_LIBDIR}/liblwp.a  ${TOP_LIBDIR}/libacl.a
 
 CFLAGS = -D${SYS_NAME} ${OPTMZ} ${INCDIRS} ${XCFLAGS} ${DBG}
 
@@ -156,7 +156,7 @@ vlib.a:	${VLIBOBJS} AFS_component_version_number.o
 
 # new salvager:  remove references to /vice by linking with novice.o
 salvager: vol-salvage.o physio.o vlib.a
-	${CC} ${LDFLAGS} -o salvager vol-salvage.o physio.o ${LIBS}
+	${CC} ${LDFLAGS} -o salvager vol-salvage.o physio.o ${LIBS} ${XLIBS}
 
 vol-salvage: vol-salvage.o
 vol-info: vol-info.o physio.o ihandle.o
@@ -183,18 +183,18 @@ volinfo: vol-info.o physio.o ihandle.o
 	case ${SYS_NAME} in \
 		*linux* | *fbsd*) \
 			${CC} ${CFLAGS} ${DBG} -o volinfo vol-info.o physio.o \
-				ihandle.o ${LIBS} ;; \
+				ihandle.o ${LIBS} ${XLIBS} ;; \
 		*) \
 			${CC} ${CFLAGS} ${DBG} -o volinfo vol-info.o physio.o \
-				 ihandle.o ${LIBS} ;; \
+				 ihandle.o ${LIBS} ${XLIBS} ;; \
 	esac
 
 
 fs_conv_dux40D: fs_conv_411.o
-	${CC} ${CFLAGS} ${TOP_LIBDIR}/libcmd.a -o fs_conv_dux40D fs_conv_411.o  ${LIBS} 
+	${CC} ${CFLAGS} ${TOP_LIBDIR}/libcmd.a -o fs_conv_dux40D fs_conv_411.o  ${LIBS} ${XLIBS}
 
 fs_conv_sol26: fs_conv_411.o vlib.a 
-	${CC} ${CFLAGS} ${TOP_LIBDIR}/libcmd.a -o fs_conv_sol26 fs_conv_411.o  ${LIBS} 
+	${CC} ${CFLAGS} ${TOP_LIBDIR}/libcmd.a -o fs_conv_sol26 fs_conv_411.o  ${LIBS} ${XLIBS}
 
 fs_conv_411.o: fs_conv_411.c AFS_component_version_number.c
 	${CC} ${CFLAGS} -c fs_conv_411.c