diff -uNr openafs-1.2.13.orig/Makefile.in openafs-1.2.13/Makefile.in
--- openafs-1.2.13.orig/Makefile.in	2003-10-24 01:24:31.000000000 -0400
+++ openafs-1.2.13/Makefile.in	2005-01-03 19:42:36.000000000 -0500
@@ -487,8 +487,8 @@
 
 shlibafsrpc: rx rxkad des
 	case ${SYS_NAME} in \
-	amd64_linux24) \
-		echo Skipping shlibafsprc for amd64_linux24 ;; \
+	*linux*) \
+		echo Skipping shlibafsprc for linux ;; \
 	alpha_dux*|sgi_*|sun*_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*) \
 	${COMPILE_PART1} shlibafsrpc ${COMPILE_PART2} ;; \
 	*) \
@@ -497,8 +497,8 @@
 
 shlibafsauthent: ubik auth kauth shlibafsrpc
 	case ${SYS_NAME} in \
-	amd64_linux24) \
-		echo Skipping shlibafsauthent for amd64_linux24 ;; \
+	*linux*) \
+		echo Skipping shlibafsauthent for linux ;; \
 	alpha_dux*|sgi_*|sun*_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*) \
 	${COMPILE_PART1} shlibafsauthent ${COMPILE_PART2} ;; \
 	*) \
diff -uNr openafs-1.2.13.orig/src/audit/Makefile.in openafs-1.2.13/src/audit/Makefile.in
--- openafs-1.2.13.orig/src/audit/Makefile.in	2003-07-07 16:16:27.000000000 -0400
+++ openafs-1.2.13/src/audit/Makefile.in	2005-01-03 19:42:36.000000000 -0500
@@ -65,9 +65,11 @@
 
 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
+	$(RM) -f *.a *.o core AFS_component_version_number.c $(PICTARGET)/*.o ../pic/audit/audit.o
 
 include ../config/Makefile.version
 ${DESTDIR}${libdir}/afs/libaudit.a: libaudit.a
diff -uNr openafs-1.2.13.orig/src/auth/Makefile.in openafs-1.2.13/src/auth/Makefile.in
--- openafs-1.2.13.orig/src/auth/Makefile.in	2003-07-07 16:16:28.000000000 -0400
+++ openafs-1.2.13/src/auth/Makefile.in	2005-01-03 19:42:36.000000000 -0500
@@ -45,7 +45,15 @@
 UKSRCS=${KSRCS} cellconfig.h acfg_errors.c keys.h cellconfig.c \
        ktc.c authcon.c ktc_errors.c
 
-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
+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)
 
 cellconfig.o: cellconfig.c ${INCLS}
 ktc.o: ktc.c ${INCLS} ${TOP_INCDIR}/afs/vice.h
@@ -155,7 +163,7 @@
 
 clean:
 	$(RM) -f *.o *.a copyauth setkey auth.h cellconfig.h acfg_errors.c ktc_errors.c core\
-	AFS_component_version_number.c
+	AFS_component_version_number.c $(PICTARGET)/*.o
 
 include ../config/Makefile.version
 ${DESTDIR}${libdir}/afs/libauth.a: libauth.a
diff -uNr openafs-1.2.13.orig/src/cmd/Makefile.in openafs-1.2.13/src/cmd/Makefile.in
--- openafs-1.2.13.orig/src/cmd/Makefile.in	2001-09-07 19:34:51.000000000 -0400
+++ openafs-1.2.13/src/cmd/Makefile.in	2005-01-03 19:46:55.000000000 -0500
@@ -34,6 +34,18 @@
 
 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)/%64.o: %.c $(PICTARGET)
+	$(CC) -c $(PAM_CFLAGS) $(CFLAGS)${XCFLAGS64} $< -o $@
+
+$(PICTARGET):
+	mkdir -p $(PICTARGET)
+
 all: ${TOP_LIBDIR}/libcmd.a ${TOP_INCDIR}/afs/cmd.h
 
 all64: all ${TOP_LIBDIR}/libcmd64.a
@@ -42,10 +54,6 @@
 	$(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,7 +66,7 @@
 	$(AR) crv $@ ${LIB64OBJS} AFS_component_version_number64.o
 	$(RANLIB) $@
 
-libcmd.a: ${LIBOBJS} AFS_component_version_number.o
+libcmd.a: ${LIBOBJS} AFS_component_version_number.o $(PICOBJS)
 	-$(RM) -f $@
 	$(AR) crv $@ ${LIBOBJS} AFS_component_version_number.o
 	$(RANLIB) $@
@@ -89,7 +97,7 @@
 	(cd test; $(MAKE) )
 
 clean:
-	$(RM) -f  *.a *.o ctest dtest cmd.h cmd_errors.c core AFS_component_version_number.c
+	$(RM) -f  *.a *.o ctest dtest cmd.h cmd_errors.c core AFS_component_version_number.c $(PICTARGET)/*.o
 
 include ../config/Makefile.version
 ${DESTDIR}${libdir}/afs/libcmd.a: libcmd.a
diff -uNr openafs-1.2.13.orig/src/comerr/Makefile.in openafs-1.2.13/src/comerr/Makefile.in
--- openafs-1.2.13.orig/src/comerr/Makefile.in	2003-07-07 16:16:29.000000000 -0400
+++ openafs-1.2.13/src/comerr/Makefile.in	2005-01-03 19:42:36.000000000 -0500
@@ -45,7 +45,17 @@
 	${CC} ${CFLAGS} -o compile_et compile_et.o error_table.o -L${TOP_LIBDIR} -lafsutil -ll;; \
 	esac
 
-libcom_err.a: error_msg.o et_name.o com_err.o AFS_component_version_number.o
+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)
 	$(RM) -f $@
 	$(AR) crv $@ error_msg.o et_name.o com_err.o AFS_component_version_number.o
 	$(RANLIB) $@
@@ -108,7 +118,7 @@
 		*.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
+		eddep makedep core AFS_component_version_number.c $(PICTARGET)/*.o
 
 test:
 	cd test; $(MAKE)
diff -uNr openafs-1.2.13.orig/src/des/Makefile.in openafs-1.2.13/src/des/Makefile.in
--- openafs-1.2.13.orig/src/des/Makefile.in	2003-07-07 16:16:29.000000000 -0400
+++ openafs-1.2.13/src/des/Makefile.in	2005-01-03 19:42:36.000000000 -0500
@@ -73,7 +73,15 @@
 .c.o:
 	${CC} -c -I. -I${TOP_INCDIR} -I${TOP_SRCDIR}/config ${XCFLAGS} $<
 
-libdes.a: ${OBJS} AFS_component_version_number.o
+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)
 	$(RM) -f libdes.a
 	$(AR) crv libdes.a ${OBJS} AFS_component_version_number.o
 	$(RANLIB) libdes.a
@@ -212,7 +220,7 @@
 	$(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
+		s_table.h odd.h p.c s.c fp.c ip.c AFS_component_version_number.c $(PICTARGET)/*.o
 	cd test; $(MAKE) clean
 
 include ../config/Makefile.version
diff -uNr openafs-1.2.13.orig/src/kauth/Makefile.in openafs-1.2.13/src/kauth/Makefile.in
--- openafs-1.2.13.orig/src/kauth/Makefile.in	2003-07-07 16:16:33.000000000 -0400
+++ openafs-1.2.13/src/kauth/Makefile.in	2005-01-03 19:42:36.000000000 -0500
@@ -79,13 +79,21 @@
 
 noversion: install
 
-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
+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)
 
 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
+	$(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
 
 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 -uNr openafs-1.2.13.orig/src/lwp/Makefile.in openafs-1.2.13/src/lwp/Makefile.in
--- openafs-1.2.13.orig/src/lwp/Makefile.in	2003-10-24 01:24:59.000000000 -0400
+++ openafs-1.2.13/src/lwp/Makefile.in	2005-01-03 19:42:36.000000000 -0500
@@ -39,7 +39,15 @@
 LIBOBJS=lwp.o process.o lock.o iomgr.o timer.o fasttime.o preempt.o \
 	waitkey.o threadname.o AFS_component_version_number.o
 
-all: ${TOP_LIBDIR}/liblwp.a ${TOP_INCDIR}/lock.h ${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/preempt.h ${TOP_INCDIR}/timer.h
+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)
 
 #
 # Build rules
@@ -145,7 +153,7 @@
 # Misc. targets
 #
 clean:
-	$(RM) -f *.o *.a core AFS_component_version_number.c
+	$(RM) -f *.o *.a core AFS_component_version_number.c $(PICTARGET)/*.o
 
 include ../config/Makefile.version
 ${DESTDIR}${libdir}/liblwp.a: liblwp.a
diff -uNr openafs-1.2.13.orig/src/pam/Makefile.in openafs-1.2.13/src/pam/Makefile.in
--- openafs-1.2.13.orig/src/pam/Makefile.in	2003-07-07 16:16:36.000000000 -0400
+++ openafs-1.2.13/src/pam/Makefile.in	2005-01-03 19:50:27.000000000 -0500
@@ -46,25 +46,25 @@
 INCLUDES=-I${TOP_SRCDIR}/config -I${TOP_INCDIR}
 CFLAGS =  ${DEBUG} ${INCLUDES} ${PAM_CFLAGS}
 
-all: test_pam ${TOP_LIBDIR}/pam_afs.so.1 ${TOP_LIBDIR}/pam_afs.krb.so.1
+all: test_pam ${TOP_LIBDIR}/pam_afs.so.1
 
 afs_setcred.o: afs_setcred.c afs_pam_msg.h afs_message.h afs_util.h
-	${CC} ${CFLAGS} -c afs_setcred.c -o afs_setcred.o
+	${CC} ${CFLAGS} $(PAM_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} -DAFS_KERBEROS_ENV -c afs_setcred.c -o afs_setcred_krb.o
+	${CC} ${CFLAGS} $(PAM_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}  -c afs_auth.c -o afs_auth.o
+	${CC} ${CFLAGS} $(PAM_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} -DAFS_KERBEROS_ENV  -c afs_auth.c -o afs_auth_krb.o
+	${CC} ${CFLAGS} $(PAM_CFLAGS) -DAFS_KERBEROS_ENV  -c afs_auth.c -o afs_auth_krb.o
 
 afs_util.o: afs_util.c afs_util.h
-	${CC} ${CFLAGS} -c afs_util.c -o afs_util.o
+	${CC} ${CFLAGS} $(PAM_CFLAGS) -c afs_util.c -o afs_util.o
 
 afs_util_krb.o: afs_util.c afs_util.h
-	${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c afs_util.c -o afs_util_krb.o
+	${CC} ${CFLAGS} $(PAM_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 @@
 		$(LD) $(LDFLAGS) -M mapfile -o $@ afs_setcred.o afs_auth.o afs_util.o\
 			$(SHOBJS) $(LIBS) ;; \
 	*linux*) \
-		$(CC) $(LDFLAGS) -o $@ afs_setcred.o afs_auth.o afs_util.o $(SHOBJS) $(LIBS) ;;\
+		$(CC) $(LDFLAGS) $(PAM_CFLAGS) -o $@ afs_setcred.o afs_auth.o afs_util.o $(SHOBJS)  `find ../pic/ -name "*.o" | grep -v AFS_compo`  -lpam -lresolv;;\
 	*fbsd*) \
 		$(CC) $(LDFLAGS) -o $@ afs_setcred.o afs_auth.o afs_util.o $(SHOBJS) $(LIBS) ;;\
 	* ) \
@@ -115,7 +115,7 @@
 		echo No link line for system $(SYS_NAME). ;; \
 	esac
 
-install:  ${DESTDIR}${libdir}/pam_afs.so.1 ${DESTDIR}${libdir}/pam_afs.krb.so.1
+install:  ${DESTDIR}${libdir}/pam_afs.so.1
 
 ${DEST}/lib/pam_afs.so.1: pam_afs.so.1
 	${INSTALL} $? $@
@@ -146,5 +146,5 @@
 ${TOP_LIBDIR}/pam_afs.krb.so.1: pam_afs.krb.so.1
 	${INSTALL} $? $@
 
-dest:  ${DEST}/lib/pam_afs.so.1 ${DEST}/lib/pam_afs.krb.so.1
+dest:  ${DEST}/lib/pam_afs.so.1
 
diff -uNr openafs-1.2.13.orig/src/ptserver/Makefile.in openafs-1.2.13/src/ptserver/Makefile.in
--- openafs-1.2.13.orig/src/ptserver/Makefile.in	2003-10-24 01:25:03.000000000 -0400
+++ openafs-1.2.13/src/ptserver/Makefile.in	2005-01-03 19:42:36.000000000 -0500
@@ -62,7 +62,17 @@
 	${TOP_LIBDIR}/libsys.a
 
 
-all: ukinstall ptserver pts pt_util db_verify ${TOP_LIBDIR}/libprot.a ${TOP_INCDIR}/afs/prclient.h ${TOP_INCDIR}/afs/prerror.h ${TOP_INCDIR}/afs/print.h ${TOP_INCDIR}/afs/prserver.h ${TOP_INCDIR}/afs/ptclient.h ${TOP_INCDIR}/afs/pterror.h ${TOP_INCDIR}/afs/ptint.h ${TOP_INCDIR}/afs/ptserver.h readgroup readpwd testpt
+LIBOBJS = ptuser.o pterror.o ptint.cs.o ptint.xdr.o 
+
+PICTARGET =../pic/ptserver
+PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(LIBOBJS))
+$(PICTARGET)/%.o: %.c $(PICTARGET)
+	$(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
+
+$(PICTARGET):
+	mkdir -p $(PICTARGET)
+
+all: ukinstall ptserver pts pt_util db_verify ${TOP_LIBDIR}/libprot.a ${TOP_INCDIR}/afs/prclient.h ${TOP_INCDIR}/afs/prerror.h ${TOP_INCDIR}/afs/print.h ${TOP_INCDIR}/afs/prserver.h ${TOP_INCDIR}/afs/ptclient.h ${TOP_INCDIR}/afs/pterror.h ${TOP_INCDIR}/afs/ptint.h ${TOP_INCDIR}/afs/ptserver.h readgroup readpwd testpt $(PICOBJS)
 
 #
 # Build targets
@@ -252,7 +262,7 @@
 clean:
 	$(RM) -f *.a *.o ptserver ptint.cs.c ptint.ss.c ptclient ptint.xdr.c ptint.h \
 	libprot.a pts readgroup readpwd db_verify testpt pt_util pterror.h pterror.c \
-	core AFS_component_version_number.c Kptint.cs.c Kptint.h Kptint.xdr.c
+	core AFS_component_version_number.c Kptint.cs.c Kptint.h Kptint.xdr.c $(PICTARGET)/*.o
 
 include ../config/Makefile.version
 ${DESTDIR}${afssrvlibexecdir}/ptserver: ptserver
diff -uNr openafs-1.2.13.orig/src/rx/Makefile.in openafs-1.2.13/src/rx/Makefile.in
--- openafs-1.2.13.orig/src/rx/Makefile.in	2003-07-07 16:16:38.000000000 -0400
+++ openafs-1.2.13/src/rx/Makefile.in	2005-01-03 19:42:36.000000000 -0500
@@ -72,7 +72,15 @@
 	xdr_afsuuid.c rx_trace.h xdr_int64.c
 UKSRCS = $(KSRCS) rx_conncache.c
 
-all: includes kinstall ukinstall ${TOP_LIBDIR}/librx.a
+PICTARGET =../pic/rx
+PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(LIBOBJS))
+$(PICTARGET)/%.o: %.c $(PICTARGET)
+	$(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
+
+$(PICTARGET):
+	mkdir -p $(PICTARGET)
+
+all: includes kinstall ukinstall ${TOP_LIBDIR}/librx.a $(PICOBJS)
 
 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
@@ -222,7 +230,7 @@
 # Misc. targets
 #
 clean:
-	$(RM) -f *.o *.a core *_component_version_number.c
+	$(RM) -f *.o *.a core *_component_version_number.c $(PICTARGET)/*.o
 
 include ../config/Makefile.version
 
diff -uNr openafs-1.2.13.orig/src/rxkad/Makefile.in openafs-1.2.13/src/rxkad/Makefile.in
--- openafs-1.2.13.orig/src/rxkad/Makefile.in	2003-10-24 01:25:06.000000000 -0400
+++ openafs-1.2.13/src/rxkad/Makefile.in	2005-01-03 19:42:36.000000000 -0500
@@ -42,6 +42,14 @@
 OBJS=rxkad_client.o rxkad_server.o rxkad_common.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=\
@@ -165,7 +173,7 @@
 # Build targets
 #
 
-librxkad.a: ${OBJS} AFS_component_version_number.o
+librxkad.a: ${OBJS} AFS_component_version_number.o $(PICOBJS)
 	-$(RM) -f $@
 	$(AR) crv $@ ${OBJS} AFS_component_version_number.o
 	$(RANLIB) $@
@@ -211,7 +219,7 @@
 	$(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
+		fc_test $(PICTARGET)/*.o
 
 test:
 	cd test; $(MAKE)
diff -uNr openafs-1.2.13.orig/src/sys/Makefile.in openafs-1.2.13/src/sys/Makefile.in
--- openafs-1.2.13.orig/src/sys/Makefile.in	2003-10-24 01:25:12.000000000 -0400
+++ openafs-1.2.13/src/sys/Makefile.in	2005-01-03 19:42:36.000000000 -0500
@@ -38,12 +38,22 @@
 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)
+
+OBJS = afssyscalls.o $(RMTOBJS)
+
 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
+all: ${TOP_LIBDIR}/libsys.a rmtsysd ${TOP_INCDIR}/afs/afssyscalls.h pagsh pagsh.krb kinstall ukinstall $(PICOBJS) 
 	case "${SYS_NAME}" in \
 	rs_aix*)			\
 		${INSTALL} afs.exp ${TOP_LIBDIR};;	\
@@ -208,7 +218,7 @@
 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
+	rmtsysd AFS_component_version_number.c pagsh pagsh.krb $(PICTARGET)/*.o
 ${DEST}/lib/afs/libsys.a: libsys.a
 	${INSTALL} $? $@
 
diff -uNr openafs-1.2.13.orig/src/ubik/Makefile.in openafs-1.2.13/src/ubik/Makefile.in
--- openafs-1.2.13.orig/src/ubik/Makefile.in	2003-07-07 16:16:47.000000000 -0400
+++ openafs-1.2.13/src/ubik/Makefile.in	2005-01-03 19:42:36.000000000 -0500
@@ -44,7 +44,15 @@
 RXGEN=${TOP_SRCDIR}/rxgen/rxgen
 COMPILE_ET=${TOP_SRCDIR}/comerr/compile_et
 
-all: ukinstall ${TOP_LIBDIR}/libubik.a ${TOP_INCDIR}/ubik.h ${TOP_INCDIR}/ubik_int.h udebug utst_server utst_client
+PICTARGET =../pic/ubik
+PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(LIBOBJS))
+$(PICTARGET)/%.o: %.c $(PICTARGET)
+	$(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
+
+$(PICTARGET):
+	mkdir -p $(PICTARGET)
+
+all: ukinstall ${TOP_LIBDIR}/libubik.a ${TOP_INCDIR}/ubik.h ${TOP_INCDIR}/ubik_int.h udebug utst_server utst_client $(PICOBJS)
 
 utst_server: utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a 
 	${CC} ${CFLAGS} -o utst_server utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a $(LIBS)
@@ -168,7 +176,7 @@
 #
 clean:
 	$(RM) -f *.o utst_server utst_client udebug *.a *.cs.c *.ss.c *.xdr.c
-	$(RM) -f utst_int.h ubik_int.h uerrors.c ubik.h core AFS_component_version_number.c Kubik_int.h
+	$(RM) -f utst_int.h ubik_int.h uerrors.c ubik.h core AFS_component_version_number.c Kubik_int.h $(PICTARGET)/*.o
 
 include ../config/Makefile.version
 
diff -uNr openafs-1.2.13.orig/src/util/Makefile.in openafs-1.2.13/src/util/Makefile.in
--- openafs-1.2.13.orig/src/util/Makefile.in	2003-01-31 16:08:58.000000000 -0500
+++ openafs-1.2.13/src/util/Makefile.in	2005-01-03 19:42:36.000000000 -0500
@@ -45,6 +45,14 @@
 	 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,$(objects)) 
+$(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 \
@@ -64,7 +72,7 @@
 	${TOP_INCDIR}/potpourri.h \
 	${TOP_LIBDIR}/util.a \
 	${TOP_LIBDIR}/libafsutil.a \
-	sys
+	sys $(PICOBJS)
 
 dirpath.h: dirpath.hin Makefile
 	( sed \
@@ -445,7 +453,7 @@
 
 clean:
 	$(RM) -f ${objects} sys dirpath.h
-	$(RM) -f util.a *.o core AFS_component_version_number.c
+	$(RM) -f util.a *.o core AFS_component_version_number.c $(PICTARGET)/*.o
 
 test:
 	cd test; $(MAKE)
diff -uNr openafs-1.2.13.orig/src/venus/Makefile.in openafs-1.2.13/src/venus/Makefile.in
--- openafs-1.2.13.orig/src/venus/Makefile.in	2003-07-01 15:04:15.000000000 -0400
+++ openafs-1.2.13/src/venus/Makefile.in	2005-01-03 19:51:55.000000000 -0500
@@ -297,7 +297,7 @@
 #
 
 clean:
-	$(RM) -f *.o *.a up fs kdump-* kdump kdump64 core cmdebug AFS_component_version_number.c fstrace gcpags
+	$(RM) -f *.o *.a up fs kdump-* kdump kdump64 core cmdebug AFS_component_version_number.c fstrace gcpags livesys
 
 test:
 	cd test; $(MAKE)
