From 9cbe95a1af131158e9f94499cfe4e2ed4f9f6cac Mon Sep 17 00:00:00 2001 From: Nickolai Zeldovich Date: Fri, 2 Nov 2001 08:03:08 +0000 Subject: [PATCH] solaris9-and-makefile-updates-20011102 updates for solaris 9; also don't have ${XLIBS} in target dependancies if it's going to include things like -lnsl --- Makefile.in | 2 +- src/auth/Makefile.in | 6 +++--- src/kauth/Makefile.in | 2 +- src/venus/Makefile.in | 12 ++++++------ src/vol/Makefile.in | 12 ++++++------ 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Makefile.in b/Makefile.in index 1643598ad..4d20f8b05 100644 --- a/Makefile.in +++ b/Makefile.in @@ -110,7 +110,7 @@ comerr: util cmd: comerr @case ${SYS_NAME} in \ - sgi_6* | sun*_57 | sun*_58 | hp_ux11* | sparc64_linux* | alpha_linux* ) \ + sgi_6* | sun*_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 c129b4b78..32cb39384 100644 --- a/src/auth/Makefile.in +++ b/src/auth/Makefile.in @@ -17,7 +17,7 @@ CFLAGS=-g -I. -I${srcdir} -I${TOP_OBJDIR}/src/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 \ @@ -48,10 +48,10 @@ libauth.krb.a: $(KOBJS) AFS_component_version_number.o $(RANLIB) $@ copyauth: copyauth.o ${LIBS} - $(CC) $(CFLAGS) -o copyauth copyauth.o ${LIBS} + $(CC) $(CFLAGS) -o copyauth copyauth.o ${LIBS} ${XLIBS} setkey: setkey.o ${LIBS} - ${CC} $(CFLAGS) -o setkey setkey.o ${LIBS} + ${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 bff1d295e..d2981dde9 100644 --- a/src/kauth/Makefile.in +++ b/src/kauth/Makefile.in @@ -201,7 +201,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 ${srcdir}/user.c -kdb: kdb.o ${INCLS} ${LIBS} ${XLIBS} libkauth.a +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 be12e9b22..3e0c6b120 100644 --- a/src/venus/Makefile.in +++ b/src/venus/Makefile.in @@ -83,7 +83,7 @@ ${DEST}/etc/kdump: kdump for f in kdump.IP??; \ do ${INSTALL} -s $$f ${DEST}/etc/$$f || exit $$? ; \ done ;; \ - sun4x_5[78]|sunx86_5[78] ) \ + sun4x_5[789]|sunx86_5[789] ) \ ${INSTALLex} -f ${srcdir}/kdump.sh.solaris7 $@; \ ${INSTALL} -s -f $? ${DEST}/etc/kdump32;; \ *linux* ) \ @@ -99,7 +99,7 @@ ${DEST}/etc/kdump: kdump ${DEST}/etc/kdump64: kdump64 -set -x; \ case ${SYS_NAME} in \ - sun4x_5[78] | hp_ux11* |sunx86_5[78] ) \ + sun4x_5[789] | hp_ux11* |sunx86_5[789] ) \ ${INSTALL} -s $? $@ ;;\ * ) \ echo skipping kdump64 for ${SYS_NAME} ;; \ @@ -197,7 +197,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* |sunx86_5[78] ) \ + sun4x_5[789] | hp_ux11* |sunx86_5[789] ) \ ${CC} -g -I${TOP_INCDIR}/afs -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS64} -o kdump64.o -c ${srcdir}/kdump.c ;; \ esac @@ -240,7 +240,7 @@ kdump: kdump.o kdump64 : kdump64.o -set -x; \ case ${SYS_NAME} in \ - sun4x_5[78] | hp_ux11* |sunx86_5[78] ) \ + sun4x_5[789] | hp_ux11* |sunx86_5[789] ) \ ${CC} -g ${XCFLAGS64} -o kdump64 kdump64.o ${TOP_LIBDIR}/libcmd64.a ${XLIBELFA} ${XLIBKVM} ${XLIBS} ;; \ esac @@ -298,7 +298,7 @@ ${DESTDIR}${sbindir}/kdump: kdump for f in kdump.IP??; \ do ${INSTALL} -s $$f ${DESTDIR}${sbindir}/$$f || exit $$? ; \ done ;; \ - sun4x_5[78] |sunx86_5[78] ) \ + sun4x_5[789] |sunx86_5[789] ) \ ${INSTALLex} -f kdump.sh.solaris7 $@; \ ${INSTALL} -s -f $? ${DESTDIR}${sbindir}/kdump32;; \ *linux* ) \ @@ -313,7 +313,7 @@ ${DESTDIR}${sbindir}/kdump: kdump ${DESTDIR}${sbindir}/kdump64: kdump64 -set -x; \ case ${SYS_NAME} in \ - sun4x_5[78] | hp_ux11* |sunx86_5[78] ) \ + sun4x_5[789] | hp_ux11* |sunx86_5[789] ) \ ${INSTALL} -s $? $@ ;;\ * ) \ echo skipping kdump64 for ${SYS_NAME} ;; \ diff --git a/src/vol/Makefile.in b/src/vol/Makefile.in index ef295094f..35d7030d9 100644 --- a/src/vol/Makefile.in +++ b/src/vol/Makefile.in @@ -14,7 +14,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} @@ -137,7 +137,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 @@ -164,18 +164,18 @@ volinfo: vol-info.o physio.o ihandle.o ${LIBS} 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 ${srcdir}/fs_conv_411.c -- 2.39.5