From: Sam Hartman <hartmans@debian.org>
Date: Sun, 13 Apr 2003 20:41:59 +0000 (+0000)
Subject: Back out pam patch to fix for alpha
X-Git-Tag: debian/1.2.9-1~10
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=7f0a783a77f491c073872fe25a14de490cddd078;p=packages%2Fo%2Fopenafs.git

Back out pam patch to fix for alpha
---

diff --git a/src/audit/Makefile.in b/src/audit/Makefile.in
index aebbbdbe5..aeebffc29 100644
--- a/src/audit/Makefile.in
+++ b/src/audit/Makefile.in
@@ -65,11 +65,9 @@ libaudit.a: audit.o AFS_component_version_number.o
 
 audit.o: audit.c audit.h 
 	${CC} ${CFLAGS} -c audit.c
-	-mkdir -p ../pic/audit
-	${CC} ${CFLAGS} -c audit.c -fPIC -o ../pic/audit/audit.o
 
 clean:
-	$(RM) -f *.a *.o core AFS_component_version_number.c $(PICTARGET)/*.o ../pic/audit/audit.o
+	$(RM) -f *.a *.o core AFS_component_version_number.c
 
 include ../config/Makefile.version
 ${DESTDIR}${libdir}/afs/libaudit.a: libaudit.a
diff --git a/src/auth/Makefile.in b/src/auth/Makefile.in
index a48c04a5d..60f8aeb23 100644
--- a/src/auth/Makefile.in
+++ b/src/auth/Makefile.in
@@ -45,15 +45,7 @@ KSRCS=auth.h
 UKSRCS=${KSRCS} cellconfig.h acfg_errors.c keys.h cellconfig.c \
        ktc.c authcon.c ktc_errors.c
 
-PICTARGET =../pic/auth
-PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(OBJS))
-$(PICTARGET)/%.o: %.c $(PICTARGET)
-	$(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
-
-$(PICTARGET):
-	mkdir -p $(PICTARGET)
-
-all: kinstall ukinstall ${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/libauth.krb.a ${TOP_INCDIR}/afs/keys.h ${TOP_INCDIR}/afs/cellconfig.h ${TOP_INCDIR}/afs/auth.h copyauth setkey $(PICOBJS)
+all: kinstall ukinstall ${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/libauth.krb.a ${TOP_INCDIR}/afs/keys.h ${TOP_INCDIR}/afs/cellconfig.h ${TOP_INCDIR}/afs/auth.h copyauth setkey
 
 cellconfig.o: cellconfig.c ${INCLS}
 ktc.o: ktc.c ${INCLS} ${TOP_INCDIR}/afs/vice.h
@@ -163,7 +155,7 @@ test:
 
 clean:
 	$(RM) -f *.o *.a copyauth setkey auth.h cellconfig.h acfg_errors.c ktc_errors.c core\
-	AFS_component_version_number.c $(PICTARGET)/*.o
+	AFS_component_version_number.c
 
 include ../config/Makefile.version
 ${DESTDIR}${libdir}/afs/libauth.a: libauth.a
diff --git a/src/cmd/Makefile.in b/src/cmd/Makefile.in
index 6e25f0958..f564e1ec9 100644
--- a/src/cmd/Makefile.in
+++ b/src/cmd/Makefile.in
@@ -34,15 +34,6 @@ LIB64OBJS=cmd_errors64.o cmd64.o
 
 CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
 
-PICTARGET =../pic/cmd
-PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(LIBOBJS))
-PIC64OBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(LIB64OBJS))
-$(PICTARGET)/%.o: %.c $(PICTARGET)
-	$(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
-
-$(PICTARGET):
-	mkdir -p $(PICTARGET)
-
 all: ${TOP_LIBDIR}/libcmd.a ${TOP_INCDIR}/afs/cmd.h
 
 all64: all ${TOP_LIBDIR}/libcmd64.a
@@ -51,6 +42,10 @@ cmd.h cmd_errors.c: cmd_errors.et cmd.p.h
 	$(RM) -f cmd.h cmd_errors.c
 	${COMPILE_ET} cmd_errors -h cmd
 
+cmd_errors.o: cmd_errors.c
+
+cmd.o: cmd.c cmd.h
+
 cmd_errors64.o: cmd_errors.c
 	${CC} ${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS64} -c -o cmd_errors64.o cmd_errors.c
 
@@ -58,12 +53,12 @@ cmd64.o: cmd.c cmd.h
 	${CC} ${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS64} -c -o cmd64.o cmd.c
 
 
-libcmd64.a: ${LIB64OBJS} AFS_component_version_number64.o $(PIC64OBJS)
+libcmd64.a: ${LIB64OBJS} AFS_component_version_number64.o
 	-$(RM) -f $@
 	$(AR) crv $@ ${LIB64OBJS} AFS_component_version_number64.o
 	$(RANLIB) $@
 
-libcmd.a: ${LIBOBJS} AFS_component_version_number.o $(PICOBJS)
+libcmd.a: ${LIBOBJS} AFS_component_version_number.o
 	-$(RM) -f $@
 	$(AR) crv $@ ${LIBOBJS} AFS_component_version_number.o
 	$(RANLIB) $@
@@ -94,7 +89,7 @@ test tests:
 	(cd test; $(MAKE) )
 
 clean:
-	$(RM) -f  *.a *.o ctest dtest cmd.h cmd_errors.c core AFS_component_version_number.c $(PICTARGET)/*.o
+	$(RM) -f  *.a *.o ctest dtest cmd.h cmd_errors.c core AFS_component_version_number.c
 
 include ../config/Makefile.version
 ${DESTDIR}${libdir}/afs/libcmd.a: libcmd.a
diff --git a/src/comerr/Makefile.in b/src/comerr/Makefile.in
index ab21fba4f..a7974b0bb 100644
--- a/src/comerr/Makefile.in
+++ b/src/comerr/Makefile.in
@@ -45,18 +45,7 @@ compile_et:	compile_et.o error_table.o
 	${CC} ${CFLAGS} -o compile_et compile_et.o error_table.o -L${TOP_LIBDIR} -lafsutil -ll;; \
 	esac
 
-OBJS = error_msg.o et_name.o com_err.o
-
-PICTARGET =../pic/comerr
-PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(OBJS))
-$(PICTARGET)/%.o: %.c $(PICTARGET)
-	$(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
-
-$(PICTARGET):
-	mkdir -p $(PICTARGET)
-
-
-libcom_err.a: error_msg.o et_name.o com_err.o AFS_component_version_number.o $(PICOBJS)
+libcom_err.a: error_msg.o et_name.o com_err.o AFS_component_version_number.o
 	$(RM) -f $@
 	$(AR) crv $@ error_msg.o et_name.o com_err.o AFS_component_version_number.o
 	$(RANLIB) $@
@@ -119,7 +108,7 @@ clean:
 		*.cp *.fn *.ky *.log *.pg *.tp *.vr *.o libcom_err.a \
 		com_err.o compile_et et.ar TAGS y.tab.c lex.yy.c error_table.c \
 		et_lex.lex.c test1.h test1.c test2.h test2.c \
-		eddep makedep core AFS_component_version_number.c $(PICTARGET)/*.o
+		eddep makedep core AFS_component_version_number.c
 
 test:
 	cd test; $(MAKE)
diff --git a/src/des/Makefile.in b/src/des/Makefile.in
index b72c3620d..388780150 100644
--- a/src/des/Makefile.in
+++ b/src/des/Makefile.in
@@ -73,16 +73,7 @@ all: ukinstall ${TOP_LIBDIR}/libdes.a ${TOP_INCDIR}/des.h ${TOP_INCDIR}/des_conf
 .c.o:
 	${CC} -c -I. -I${TOP_INCDIR} -I${TOP_SRCDIR}/config ${XCFLAGS} $<
 
-
-PICTARGET =../pic/des
-PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(OBJS))
-$(PICTARGET)/%.o: %.c $(PICTARGET)
-	$(CC) -I. -I${TOP_INCDIR} -I${TOP_SRCDIR}/config ${XCFLAGS}  -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
-
-$(PICTARGET):
-	mkdir -p $(PICTARGET)
-
-libdes.a: ${OBJS} AFS_component_version_number.o $(PICOBJS)
+libdes.a: ${OBJS} AFS_component_version_number.o
 	$(RM) -f libdes.a
 	$(AR) crv libdes.a ${OBJS} AFS_component_version_number.o
 	$(RANLIB) libdes.a
@@ -221,7 +212,7 @@ clean:
 	$(RM) -f *.a *.s *.o *.b core *~ *.com *.ld
 	$(RM) -f make_fp make_ip make_keyperm make_odd make_p \
 		make_p_table make_s_table key_perm.h p_table.h \
-		s_table.h odd.h p.c s.c fp.c ip.c AFS_component_version_number.c $(PICTARGET)/*.o
+		s_table.h odd.h p.c s.c fp.c ip.c AFS_component_version_number.c
 	cd test; $(MAKE) clean
 
 include ../config/Makefile.version
diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in
index 4d8db9165..59360c1db 100644
--- a/src/kauth/Makefile.in
+++ b/src/kauth/Makefile.in
@@ -79,22 +79,13 @@ include ../config/Makefile.version
 
 noversion: install
 
-
-PICTARGET =../pic/kauth
-PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(OBJS))
-$(PICTARGET)/%.o: %.c $(PICTARGET)
-	$(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
-
-$(PICTARGET):
-	mkdir -p $(PICTARGET)
-
-all: ukinstall kaserver kas kpwvalid klog klog.krb knfs kpasswd ${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libkauth.krb.a rebuild kdb ${TOP_INCDIR}/afs/kautils.h ${TOP_INCDIR}/afs/kauth.h ${TOP_INCDIR}/afs/kaport.h $(PICOBJS)
+all: ukinstall kaserver kas kpwvalid klog klog.krb knfs kpasswd ${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libkauth.krb.a rebuild kdb ${TOP_INCDIR}/afs/kautils.h ${TOP_INCDIR}/afs/kauth.h ${TOP_INCDIR}/afs/kaport.h
 
 test tests: all
 	cd test; $(MAKE)
 
 clean:
-	$(RM) -f *.o kaserver kas klog multiklog kpasswd klogin rebuild kauth.cs.c kauth.ss.c kauth.xdr.c kauth.h kautils.h kaerrors.c *.a core kpwvalid AFS_component_version_number.c klog.krb knfs klogin.krb kdb Kkauth.xdr.c Kkauth.h Kkauth.cs.c $(PICTARGET)/*.o
+	$(RM) -f *.o kaserver kas klog multiklog kpasswd klogin rebuild kauth.cs.c kauth.ss.c kauth.xdr.c kauth.h kautils.h kaerrors.c *.a core kpwvalid AFS_component_version_number.c klog.krb knfs klogin.krb kdb Kkauth.xdr.c Kkauth.h Kkauth.cs.c
 
 kaserver: kautils.o kalocalcell.o kadatabase.o kaprocs.o kalog.o kauth.ss.o kauth.xdr.o kaserver.o kaaux.o krb_udp.o kaauxdb.o $(LIBS) 
 	${CC} ${LDFLAGS} -o kaserver kaserver.o kautils.o kalocalcell.o kadatabase.o krb_udp.o kaprocs.o kalog.o kauth.ss.o kauth.xdr.o kaaux.o kaauxdb.o $(LIBS) ${XLIBS} ${TOP_LIBDIR}/libaudit.a
diff --git a/src/lwp/Makefile.in b/src/lwp/Makefile.in
index 75864ba14..f1779c577 100644
--- a/src/lwp/Makefile.in
+++ b/src/lwp/Makefile.in
@@ -37,15 +37,7 @@ CFLAGS=${OPTIMIZE} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS}
 LIBOBJS=lwp.o process.o lock.o iomgr.o timer.o fasttime.o preempt.o \
 	waitkey.o threadname.o AFS_component_version_number.o
 
-PICTARGET =../pic/lwp
-PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(LIBOBJS))
-$(PICTARGET)/%.o: %.c $(PICTARGET)
-	$(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
-
-$(PICTARGET):
-	mkdir -p $(PICTARGET)
-
-all: ${TOP_LIBDIR}/liblwp.a ${TOP_INCDIR}/lock.h ${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/preempt.h ${TOP_INCDIR}/timer.h $(PICOBJS)
+all: ${TOP_LIBDIR}/liblwp.a ${TOP_INCDIR}/lock.h ${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/preempt.h ${TOP_INCDIR}/timer.h
 
 #
 # Build rules
@@ -151,7 +143,7 @@ ${DEST}/include/timer.h: timer.h
 # Misc. targets
 #
 clean:
-	$(RM) -f *.o *.a core AFS_component_version_number.c $(PICTARGET)/*.o
+	$(RM) -f *.o *.a core AFS_component_version_number.c
 
 include ../config/Makefile.version
 ${DESTDIR}${libdir}/liblwp.a: liblwp.a
diff --git a/src/pam/Makefile.in b/src/pam/Makefile.in
index 70d1d3b7f..6f932735c 100644
--- a/src/pam/Makefile.in
+++ b/src/pam/Makefile.in
@@ -49,22 +49,22 @@ CFLAGS =  ${DEBUG} ${INCLUDES} ${PAM_CFLAGS}
 all: test_pam ${TOP_LIBDIR}/pam_afs.so.1 ${TOP_LIBDIR}/pam_afs.krb.so.1
 
 afs_setcred.o: afs_setcred.c afs_pam_msg.h afs_message.h afs_util.h
-	${CC} ${CFLAGS} $(PAM_CFLAGS) -c afs_setcred.c -o afs_setcred.o
+	${CC} ${CFLAGS} -c afs_setcred.c -o afs_setcred.o
 
 afs_setcred_krb.o: afs_setcred.c afs_pam_msg.h afs_message.h afs_util.h
-	${CC} ${CFLAGS} $(PAM_CFLAGS)  -DAFS_KERBEROS_ENV -c afs_setcred.c -o afs_setcred_krb.o
+	${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c afs_setcred.c -o afs_setcred_krb.o
 
 afs_auth.o: afs_auth.c afs_pam_msg.h afs_message.h afs_util.h
-	${CC} ${CFLAGS}  $(PAM_CFLAGS)  -c afs_auth.c -o afs_auth.o
+	${CC} ${CFLAGS}  -c afs_auth.c -o afs_auth.o
 
 afs_auth_krb.o: afs_auth.c afs_pam_msg.h afs_message.h afs_util.h
-	${CC} ${CFLAGS} $(PAM_CFLAGS)  -DAFS_KERBEROS_ENV  -c afs_auth.c -o afs_auth_krb.o
+	${CC} ${CFLAGS} -DAFS_KERBEROS_ENV  -c afs_auth.c -o afs_auth_krb.o
 
 afs_util.o: afs_util.c afs_util.h
-	${CC} ${CFLAGS} $(PAM_CFLAGS)  -c afs_util.c -o afs_util.o
+	${CC} ${CFLAGS} -c afs_util.c -o afs_util.o
 
 afs_util_krb.o: afs_util.c afs_util.h
-	${CC} ${CFLAGS} $(PAM_CFLAGS)  -DAFS_KERBEROS_ENV -c afs_util.c -o afs_util_krb.o
+	${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c afs_util.c -o afs_util_krb.o
 
 pam_afs.so.1: $(SHOBJS) afs_setcred.o afs_auth.o afs_util.o
 	set -x; \
@@ -76,7 +76,7 @@ pam_afs.so.1: $(SHOBJS) afs_setcred.o afs_auth.o afs_util.o
 		$(LD) $(LDFLAGS) -M mapfile -o $@ afs_setcred.o afs_auth.o afs_util.o\
 			$(SHOBJS) $(LIBS) ;; \
 	*linux*) \
-		$(CC) $(LDFLAGS) $(PAM_CFLAGS) -o $@ afs_setcred.o afs_auth.o afs_util.o $(SHOBJS)  `find ../pic/ -name "*.o" | grep -v AFS_compo`  -lpam;;\
+		$(CC) $(LDFLAGS) -o $@ afs_setcred.o afs_auth.o afs_util.o $(SHOBJS) $(LIBS) ;;\
 	*fbsd*) \
 		$(CC) $(LDFLAGS) -o $@ afs_setcred.o afs_auth.o afs_util.o $(SHOBJS) $(LIBS) ;;\
 	* ) \
diff --git a/src/rx/Makefile.in b/src/rx/Makefile.in
index fba2b248c..dce3aeb16 100644
--- a/src/rx/Makefile.in
+++ b/src/rx/Makefile.in
@@ -72,15 +72,7 @@ KSRCS = rx.c rx.h rx_clock.c rx_clock.h rx_event.c rx_event.h \
 	xdr_afsuuid.c rx_trace.h xdr_int64.c
 UKSRCS = $(KSRCS) rx_conncache.c
 
-PICTARGET =../pic/rx
-PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(OBJS))
-$(PICTARGET)/%.o: %.c $(PICTARGET)
-	$(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
-
-$(PICTARGET):
-	mkdir -p $(PICTARGET)
-
-all: includes kinstall ukinstall ${TOP_LIBDIR}/librx.a $(PICOBJS)
+all: includes kinstall ukinstall ${TOP_LIBDIR}/librx.a
 
 RX_component_version_number.c: AFS_component_version_number.c
 	sed 's/cml_version/rx_cml_version/' <AFS_component_version_number.c >RX_component_version_number.c
@@ -230,7 +222,7 @@ ${DESTDIR}/include/rx/rx_xmit_nt.h: rx_xmit_nt.h ${TOP_INCDIR}/rx
 # Misc. targets
 #
 clean:
-	$(RM) -f *.o *.a core *_component_version_number.c $(PICTARGET)/*.o
+	$(RM) -f *.o *.a core *_component_version_number.c
 
 include ../config/Makefile.version
 
diff --git a/src/rxkad/Makefile.in b/src/rxkad/Makefile.in
index 043bf3f78..543e4adc7 100644
--- a/src/rxkad/Makefile.in
+++ b/src/rxkad/Makefile.in
@@ -40,15 +40,6 @@ INCLS=${TOP_INCDIR}/rx/rx.h ${TOP_INCDIR}/rx/xdr.h \
 OBJS=rxkad_client.o rxkad_server.o rxkad_common.o ticket.o rxkad_errs.o \
 	fcrypt.o crypt_conn.o ticket.o ticket5.o crc.o
 
-
-PICTARGET =../pic/rxkad
-PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(OBJS))
-$(PICTARGET)/%.o: %.c $(PICTARGET)
-	$(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
-
-$(PICTARGET):
-	mkdir -p $(PICTARGET)
-
 fc_test_OBJS=fc_test.o
 
 fc_test_LIBS=\
@@ -172,7 +163,7 @@ ${DEST}/include/rx/rxkad.h: rxkad.h
 # Build targets
 #
 
-librxkad.a: ${OBJS} AFS_component_version_number.o $(PICOBJS)
+librxkad.a: ${OBJS} AFS_component_version_number.o
 	-$(RM) -f $@
 	$(AR) crv $@ ${OBJS} AFS_component_version_number.o
 	$(RANLIB) $@
@@ -218,7 +209,7 @@ clean:
 	$(RM) -f *.o *.a tcrypt core rxkad_errs.c rxkad.h \
 		AFS_component_version_number.c \
 		crypt_conn.c fcrypt.c fcrypt.h sboxes.h \
-		fc_test $(PICTARGET)/*.o
+		fc_test
 
 test:
 	cd test; $(MAKE)
diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in
index bba010ad3..4082ae845 100644
--- a/src/sys/Makefile.in
+++ b/src/sys/Makefile.in
@@ -36,21 +36,12 @@ SFLAGS=-P -I${TOP_INCDIR}
 LIBS=libsys.a ${TOP_LIBDIR}/librx.a libsys.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/util.a ${XLIBS}
 UKSRCS=afsl.exp
 
-PICTARGET =../pic/sys
-PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(OBJS))
-$(PICTARGET)/%.o: %.c $(PICTARGET)
-	$(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
-
-$(PICTARGET):
-	mkdir -p $(PICTARGET)
-
-
 OBJECTS= afssyscalls.o syscall.o
 RMTOBJS=rmtsysnet.o rmtsysc.o rmtsys.cs.o rmtsys.xdr.o rmtsys.ss.o rmtsyss.o 
 
 include ../config/Makefile.version
 
-all: ${TOP_LIBDIR}/libsys.a rmtsysd ${TOP_INCDIR}/afs/afssyscalls.h pagsh pagsh.krb kinstall ukinstall $(PICOBJS)
+all: ${TOP_LIBDIR}/libsys.a rmtsysd ${TOP_INCDIR}/afs/afssyscalls.h pagsh pagsh.krb kinstall ukinstall
 	case "${SYS_NAME}" in \
 	rs_aix*)			\
 		${INSTALL} afs.exp ${TOP_LIBDIR};;	\
@@ -215,7 +206,7 @@ xfsinode: xfsinode.c  AFS_component_version_number.c
 clean:
 	$(RM) -f *.o libsys.a xfsinode iinc idec icreate iopen istat core \
 	rmtsysc rmtsyss *.o rmtsys.ss.c rmtsys.cs.c rmtsys.xdr.c rmtsys.h \
-	rmtsysd AFS_component_version_number.c pagsh pagsh.krb $(PICTARGET)/*.o
+	rmtsysd AFS_component_version_number.c pagsh pagsh.krb
 ${DEST}/lib/afs/libsys.a: libsys.a
 	${INSTALL} $? $@
 
diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 0ccd05672..6182bc21b 100644
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -45,15 +45,6 @@ objects = assert.o base64.o casestrcpy.o ktime.o volparse.o hostparse.o \
 	 dirpath.o fileutil.o netutils.o flipbase64.o \
 	 afs_atomlist.o afs_lhash.o snprintf.o ${REGEX_OBJ}
 
-
-PICTARGET =../pic/util
-PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(OBJS)) 
-$(PICTARGET)/%.o: %.c $(PICTARGET)
-	$(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
-
-$(PICTARGET):
-	mkdir -p $(PICTARGET)
-
 all: ukinstall kinstall \
 	${TOP_INCDIR}/afs/dirpath.h \
 	${TOP_INCDIR}/afs/pthread_nosigs.h \
@@ -90,7 +81,7 @@ dirpath.h: dirpath.hin Makefile
 		dirpath.hin >dirpath.h.tmp && \
 		mv dirpath.h.tmp dirpath.h )
 
-util.a: ${objects} AFS_component_version_number.o $(PICOBJS)
+util.a: ${objects} AFS_component_version_number.o
 	$(RM) -f util.a
 	$(AR) crv util.a ${objects} AFS_component_version_number.o
 	$(RANLIB) util.a
@@ -454,7 +445,7 @@ ${UKDIR}/afs_lhash.h: afs_lhash.h
 
 clean:
 	$(RM) -f ${objects} sys dirpath.h
-	$(RM) -f util.a *.o core AFS_component_version_number.c $(PICTARGET)/*.o
+	$(RM) -f util.a *.o core AFS_component_version_number.c
 
 test:
 	cd test; $(MAKE)
diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in
index 1e82c0410..60e1509d7 100644
--- a/src/venus/Makefile.in
+++ b/src/venus/Makefile.in
@@ -288,7 +288,7 @@ install: \
 #
 
 clean:
-	$(RM) -f *.o *.a up fs kdump-* kdump kdump64 core cmdebug AFS_component_version_number.c fstrace gcpags livesys
+	$(RM) -f *.o *.a up fs kdump-* kdump kdump64 core cmdebug AFS_component_version_number.c fstrace gcpags
 
 test:
 	cd test; $(MAKE)