From: Russ Allbery <rra@debian.org>
Date: Fri, 12 Aug 2005 04:00:29 +0000 (+0000)
Subject: Remove the old PAM patches and the makefile logic to build the PIC
X-Git-Tag: debian/1.3.87-1~3
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=4b75ee68f8ab715a567c6654283a8666ad7bd504;p=packages%2Fo%2Fopenafs.git

Remove the old PAM patches and the makefile logic to build the PIC
objects.  Also remove some other now-unnecessary divergences from
upstream to reduce the size of the diff.
---

diff --git a/Makefile.in b/Makefile.in
index 78be341c2..c3fb3a6ae 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -568,7 +568,7 @@ finale: project cmd comerr afsd butc tbutc @ENABLE_KERNEL_MODULE@ libuafs audit
 finale_nolibafs: project cmd comerr afsd butc tbutc libuafs audit kauth log package \
 	ptserver scout bu_utils ubik uss bozo vfsck volser tvolser \
 	venus update xstat afsmonitor dauth rxdebug libafsrpc \
-	libafsauthent shlibafsrpc shlibafsauthent libadmin login pam
+	libafsauthent shlibafsrpc shlibafsauthent libadmin login
 	${COMPILE_PART1} finale ${COMPILE_PART2}
 
 # Use washtool to ensure MakefileProto is current and obj/libafs exists.
diff --git a/debian/patch.build_pam b/debian/patch.build_pam
deleted file mode 100644
index d9e288183..000000000
--- a/debian/patch.build_pam
+++ /dev/null
@@ -1,466 +0,0 @@
-? src/tests/run-tests
-? src/tests/OpenAFS/Dirpath.pm
-Index: src/audit/Makefile.in
-===================================================================
-RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/audit/Makefile.in,v
-retrieving revision 1.7
-diff -u -r1.7 Makefile.in
---- src/audit/Makefile.in	13 Apr 2003 20:41:58 -0000	1.7
-+++ src/audit/Makefile.in	13 Apr 2003 21:14:09 -0000
-@@ -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
-Index: src/auth/Makefile.in
-===================================================================
-RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/auth/Makefile.in,v
-retrieving revision 1.7
-diff -u -r1.7 Makefile.in
---- src/auth/Makefile.in	13 Apr 2003 20:41:58 -0000	1.7
-+++ src/auth/Makefile.in	13 Apr 2003 21:14:09 -0000
-@@ -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
-Index: src/cmd/Makefile.in
-===================================================================
-RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/cmd/Makefile.in,v
-retrieving revision 1.7
-diff -u -r1.7 Makefile.in
---- src/cmd/Makefile.in	13 Apr 2003 20:41:58 -0000	1.7
-+++ src/cmd/Makefile.in	13 Apr 2003 21:14:12 -0000
-@@ -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
- 
-@@ -53,12 +61,12 @@
- 	${CC} ${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS64} -c -o cmd64.o cmd.c
- 
- 
--libcmd64.a: ${LIB64OBJS} AFS_component_version_number64.o
-+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
-+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
-Index: src/comerr/Makefile.in
-===================================================================
-RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/comerr/Makefile.in,v
-retrieving revision 1.7
-diff -u -r1.7 Makefile.in
---- src/comerr/Makefile.in	13 Apr 2003 20:41:59 -0000	1.7
-+++ src/comerr/Makefile.in	13 Apr 2003 21:14:12 -0000
-@@ -45,7 +45,18 @@
- 	${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 +119,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)
-Index: src/des/Makefile.in
-===================================================================
-RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/des/Makefile.in,v
-retrieving revision 1.7
-diff -u -r1.7 Makefile.in
---- src/des/Makefile.in	13 Apr 2003 20:41:59 -0000	1.7
-+++ src/des/Makefile.in	13 Apr 2003 21:14:12 -0000
-@@ -73,7 +73,16 @@
- .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 +221,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
-Index: src/kauth/Makefile.in
-===================================================================
-RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/kauth/Makefile.in,v
-retrieving revision 1.7
-diff -u -r1.7 Makefile.in
---- src/kauth/Makefile.in	13 Apr 2003 20:41:59 -0000	1.7
-+++ src/kauth/Makefile.in	13 Apr 2003 21:14:14 -0000
-@@ -79,13 +79,22 @@
- 
- 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
-Index: src/lwp/Makefile.in
-===================================================================
-RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/lwp/Makefile.in,v
-retrieving revision 1.8
-diff -u -r1.8 Makefile.in
---- src/lwp/Makefile.in	13 Apr 2003 20:41:59 -0000	1.8
-+++ src/lwp/Makefile.in	13 Apr 2003 21:14:19 -0000
-@@ -37,7 +37,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
-@@ -143,7 +151,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
-Index: src/pam/Makefile.in
-===================================================================
-RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/pam/Makefile.in,v
-retrieving revision 1.8
-diff -u -r1.8 Makefile.in
---- src/pam/Makefile.in	13 Apr 2003 20:41:59 -0000	1.8
-+++ src/pam/Makefile.in	13 Apr 2003 21:14:21 -0000
-@@ -49,22 +49,22 @@
- 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} -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;;\
- 	*fbsd*) \
- 		$(CC) $(LDFLAGS) -o $@ afs_setcred.o afs_auth.o afs_util.o $(SHOBJS) $(LIBS) ;;\
- 	* ) \
-Index: src/rx/Makefile.in
-===================================================================
-RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/rx/Makefile.in,v
-retrieving revision 1.7
-diff -u -r1.7 Makefile.in
---- src/rx/Makefile.in	13 Apr 2003 20:41:59 -0000	1.7
-+++ src/rx/Makefile.in	13 Apr 2003 21:14:22 -0000
-@@ -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,$(OBJS))
-+$(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
- 
-Index: src/rxkad/Makefile.in
-===================================================================
-RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/rxkad/Makefile.in,v
-retrieving revision 1.7
-diff -u -r1.7 Makefile.in
---- src/rxkad/Makefile.in	13 Apr 2003 20:41:59 -0000	1.7
-+++ src/rxkad/Makefile.in	13 Apr 2003 21:14:24 -0000
-@@ -40,6 +40,15 @@
- 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=\
-@@ -163,7 +172,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) $@
-@@ -209,7 +218,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)
-Index: src/sys/Makefile.in
-===================================================================
-RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/sys/Makefile.in,v
-retrieving revision 1.8
-diff -u -r1.8 Makefile.in
---- src/sys/Makefile.in	13 Apr 2003 20:41:59 -0000	1.8
-+++ src/sys/Makefile.in	13 Apr 2003 21:14:26 -0000
-@@ -36,12 +36,21 @@
- 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
-+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};;	\
-@@ -206,7 +215,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} $? $@
- 
-Index: src/util/Makefile.in
-===================================================================
-RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/util/Makefile.in,v
-retrieving revision 1.8
-diff -u -r1.8 Makefile.in
---- src/util/Makefile.in	13 Apr 2003 20:41:59 -0000	1.8
-+++ src/util/Makefile.in	13 Apr 2003 21:14:27 -0000
-@@ -45,6 +45,15 @@
- 	 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 \
-@@ -81,7 +90,7 @@
- 		dirpath.hin >dirpath.h.tmp && \
- 		mv dirpath.h.tmp dirpath.h )
- 
--util.a: ${objects} AFS_component_version_number.o
-+util.a: ${objects} AFS_component_version_number.o $(PICOBJS)
- 	$(RM) -f util.a
- 	$(AR) crv util.a ${objects} AFS_component_version_number.o
- 	$(RANLIB) util.a
-@@ -445,7 +454,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)
-Index: src/venus/Makefile.in
-===================================================================
-RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/venus/Makefile.in,v
-retrieving revision 1.7
-diff -u -r1.7 Makefile.in
---- src/venus/Makefile.in	13 Apr 2003 20:41:59 -0000	1.7
-+++ src/venus/Makefile.in	13 Apr 2003 21:14:29 -0000
-@@ -288,7 +288,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)
diff --git a/debian/patch.build_pam2 b/debian/patch.build_pam2
deleted file mode 100644
index 1386e2b14..000000000
--- a/debian/patch.build_pam2
+++ /dev/null
@@ -1,200 +0,0 @@
-? src/pic
-? src/shlibafsauthent/Makefile
-? src/shlibafsrpc/Makefile
-? src/tests/Makefile
-? src/tests/run-tests
-? src/tests/OpenAFS/Dirpath.pm
-Index: src/pam/Makefile.in
-===================================================================
-RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/pam/Makefile.in,v
-retrieving revision 1.13
-diff -u -r1.13 Makefile.in
---- src/pam/Makefile.in	30 Jul 2003 17:23:45 -0000	1.13
-+++ src/pam/Makefile.in	13 Oct 2003 04:23:02 -0000
-@@ -76,7 +76,7 @@
- 		$(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) $(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) ;;\
- 	* ) \
-Index: src/ptserver/Makefile.in
-===================================================================
-RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/ptserver/Makefile.in,v
-retrieving revision 1.1.1.3
-diff -u -r1.1.1.3 Makefile.in
---- src/ptserver/Makefile.in	30 Jul 2003 17:12:41 -0000	1.1.1.3
-+++ src/ptserver/Makefile.in	13 Oct 2003 04:23:02 -0000
-@@ -59,8 +59,18 @@
- 	${TOP_LIBDIR}/util.a \
- 	${TOP_LIBDIR}/libsys.a
- 
-+LIBOBJS = ptuser.o pterror.o ptint.cs.o ptint.xdr.o 
- 
--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
-+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
-@@ -110,7 +120,7 @@
- 	$(RM) -f pterror.h pterror.c
- 	${COMPILE_ET} pterror
- 
--libprot.a: ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_component_version_number.o
-+libprot.a: ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_component_version_number.o 
- 	$(RM) -f $@
- 	$(AR) crv $@ ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_component_version_number.o
- 	$(RANLIB) $@
-@@ -250,7 +260,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
-Index: src/rx/Makefile.in
-===================================================================
-RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/rx/Makefile.in,v
-retrieving revision 1.9
-diff -u -r1.9 Makefile.in
---- src/rx/Makefile.in	30 Jul 2003 17:23:45 -0000	1.9
-+++ src/rx/Makefile.in	13 Oct 2003 04:23:03 -0000
-@@ -73,7 +73,7 @@
- UKSRCS = $(KSRCS) rx_conncache.c
- 
- PICTARGET =../pic/rx
--PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(OBJS))
-+PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(LIBOBJS))
- $(PICTARGET)/%.o: %.c $(PICTARGET)
- 	$(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
- 
-@@ -118,7 +118,7 @@
- rxperf: rxperf.o librx.a
- 	${CC} -o $@ rxperf.o ${LIBS}
- 
--librx.a: ${LIBOBJS} RX_component_version_number.o
-+librx.a: ${LIBOBJS} RX_component_version_number.o 
- 	-$(RM) -f $@
- 	$(AR) crv $@ ${LIBOBJS} RX_component_version_number.o
- 	$(RANLIB) $@
-Index: src/sys/Makefile.in
-===================================================================
-RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/sys/Makefile.in,v
-retrieving revision 1.10
-diff -u -r1.10 Makefile.in
---- src/sys/Makefile.in	30 Jul 2003 17:23:45 -0000	1.10
-+++ src/sys/Makefile.in	13 Oct 2003 04:23:03 -0000
-@@ -44,13 +44,14 @@
- $(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 $(PICOBJS)
-+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};;	\
-@@ -78,7 +79,7 @@
- ${DEST}/include/afs/afssyscalls.h: afssyscalls.h
- 	${INSTALL} $? $@
- 
--libsys.a: ${OBJECTS} ${RMTOBJS} AFS_component_version_number.o
-+libsys.a: ${OBJECTS} ${RMTOBJS} AFS_component_version_number.o 
- 	-$(RM) -f $@
- 	$(AR) crv $@ ${OBJECTS} ${RMTOBJS} AFS_component_version_number.o
- 	$(RANLIB) $@
-Index: src/ubik/Makefile.in
-===================================================================
-RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/ubik/Makefile.in,v
-retrieving revision 1.1.1.3
-diff -u -r1.1.1.3 Makefile.in
---- src/ubik/Makefile.in	30 Jul 2003 17:13:20 -0000	1.1.1.3
-+++ src/ubik/Makefile.in	13 Oct 2003 04:23:04 -0000
-@@ -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)
-@@ -85,7 +93,7 @@
- 	$(RM) -f ubik.h uerrors.c
- 	${COMPILE_ET} uerrors -h ubik
- 
--libubik.a: ${LIBOBJS} AFS_component_version_number.o
-+libubik.a: ${LIBOBJS} AFS_component_version_number.o 
- 	-$(RM) -f $@
- 	$(AR) crc $@ ${LIBOBJS} AFS_component_version_number.o
- 	$(RANLIB) $@
-@@ -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
- 
-Index: src/util/Makefile.in
-===================================================================
-RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/util/Makefile.in,v
-retrieving revision 1.9
-diff -u -r1.9 Makefile.in
---- src/util/Makefile.in	13 Apr 2003 21:16:40 -0000	1.9
-+++ src/util/Makefile.in	13 Oct 2003 04:23:04 -0000
-@@ -47,7 +47,7 @@
- 
- 
- PICTARGET =../pic/util
--PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(OBJS)) 
-+PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(objects)) 
- $(PICTARGET)/%.o: %.c $(PICTARGET)
- 	$(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
- 
-@@ -73,7 +73,7 @@
- 	${TOP_INCDIR}/potpourri.h \
- 	${TOP_LIBDIR}/util.a \
- 	${TOP_LIBDIR}/libafsutil.a \
--	sys
-+	sys $(PICOBJS)
- 
- dirpath.h: dirpath.hin Makefile
- 	( sed \
-@@ -90,7 +90,7 @@
- 		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
diff --git a/src/audit/Makefile.in b/src/audit/Makefile.in
index c0305f6a7..64aebe1d5 100644
--- a/src/audit/Makefile.in
+++ b/src/audit/Makefile.in
@@ -37,11 +37,9 @@ libaudit.a: audit.o AFS_component_version_number.o
 
 audit.o: audit.c audit.h 
 	${CC} ${CFLAGS} -c ${srcdir}/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 0d60b4aad..33797066b 100644
--- a/src/auth/Makefile.in
+++ b/src/auth/Makefile.in
@@ -22,15 +22,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 $@
-
-all: ${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/libauth.krb.a depinstall copyauth setkey $(PICOBJS)
-
-$(PICTARGET):
-	mkdir -p $(PICTARGET)
+all: ${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/libauth.krb.a depinstall copyauth setkey
 
 depinstall: ${TOP_INCDIR}/afs/keys.h ${TOP_INCDIR}/afs/cellconfig.h ${TOP_INCDIR}/afs/auth.h
 
@@ -105,7 +97,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/cf/linux-test3.m4 b/src/cf/linux-test3.m4
index 14e234cac..e7d547f3b 100644
--- a/src/cf/linux-test3.m4
+++ b/src/cf/linux-test3.m4
@@ -40,7 +40,7 @@ else
   save_CPPFLAGS="$CPPFLAGS"
   CPPFLAGS="-I${LINUX_KERNEL_PATH}/include -D__KERNEL__ $RHCONFIG_SP $CPPFLAGS"
   AC_MSG_CHECKING(which kernel modules to build)
-  if false; then
+  if test "x$ac_linux_rhconfig" = "xyes"; then
       MPS="MP SP"
   else
   AC_CACHE_VAL(ac_cv_linux_config_smp, [
diff --git a/src/cmd/Makefile.in b/src/cmd/Makefile.in
index d655a45e5..73dd0aa28 100644
--- a/src/cmd/Makefile.in
+++ b/src/cmd/Makefile.in
@@ -11,18 +11,6 @@ include @TOP_OBJDIR@/src/config/Makefile.config
 LIBOBJS=cmd_errors.o cmd.o 
 LIB64OBJS=cmd_errors64.o cmd64.o 
 
-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
@@ -44,12 +32,12 @@ cmd64.o: cmd.c cmd.h
 	${CC} ${OPTMZ} -I. -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS64} -c -o cmd64.o ${srcdir}/cmd.c
 
 
-libcmd64.a: ${LIB64OBJS} AFS_component_version_number64.o 
+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) $@
@@ -80,7 +68,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 6336b73e7..2dba67874 100644
--- a/src/comerr/Makefile.in
+++ b/src/comerr/Makefile.in
@@ -21,17 +21,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) $@
@@ -60,7 +50,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/config/afsconfig.h.in b/src/config/afsconfig.h.in
index cbe9bf2f3..76088c2de 100644
--- a/src/config/afsconfig.h.in
+++ b/src/config/afsconfig.h.in
@@ -1,4 +1,4 @@
-/* src/config/afsconfig.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
+/* src/config/afsconfig.h.in.  Generated automatically from configure.in by autoheader.  */
 
 /* Define if on AIX 3.
    System headers sometimes define this.
diff --git a/src/des/Makefile.in b/src/des/Makefile.in
index 06332b316..c3c5013d7 100644
--- a/src/des/Makefile.in
+++ b/src/des/Makefile.in
@@ -53,16 +53,7 @@ all: \
 #
 # Build rules
 #
-
-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
@@ -200,7 +191,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 5ae75da0b..4f43156a6 100644
--- a/src/kauth/Makefile.in
+++ b/src/kauth/Makefile.in
@@ -51,18 +51,10 @@ KLIBS=${TOP_LIBDIR}/libubik.a \
 OBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o token.o kautils.o kalocalcell.o kaerrors.o user.o krb_tf.o 
 KOBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o token.o kautils.o kalocalcell.o kaerrors.o user.krb.o krb_tf.o
 
-PICTARGET =../pic/kauth
-PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(OBJS))
-$(PICTARGET)/%.o: %.c $(PICTARGET)
-	$(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
-
-$(PICTARGET):
-	mkdir -p $(PICTARGET)
-
 all: kaserver kas kpwvalid klog klog.krb knfs kpasswd rebuild kdb \
 	${TOP_LIBDIR}/libkauth.a \
 	${TOP_LIBDIR}/libkauth.krb.a \
-	depinstall $(PICOBJS)
+	depinstall
 
 depinstall: \
 	kaerrors.c kauth.cs.c kauth.xdr.c \
@@ -377,7 +369,7 @@ ${DEST}/include/afs/kaport.h: kaport.h
 include ../config/Makefile.version
 
 clean:
-	$(RM) -f *.o *.a *.xdr.c *.cs.c *.ss.c core $(PICTARGET)/*.o \
+	$(RM) -f *.o *.a *.xdr.c *.cs.c *.ss.c core \
 		kaserver kas klog multiklog kpasswd klogin rebuild \
 		kauth.h kautils.h kaerrors.c kpwvalid AFS_component_version_number.c \
 		klog.krb knfs klogin.krb kdb Kkauth.h
diff --git a/src/lwp/Makefile.in b/src/lwp/Makefile.in
index ebbb8fc05..8345e01aa 100644
--- a/src/lwp/Makefile.in
+++ b/src/lwp/Makefile.in
@@ -15,15 +15,7 @@ CFLAGS=${LWP_DBG} ${LWP_OPTMZ} ${XCFLAGS} ${COMMON_INCL}
 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 $@
-
-all: ${TOP_LIBDIR}/liblwp.a ${TOP_INCDIR}/lock.h ${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/preempt.h ${TOP_INCDIR}/timer.h $(PICOBJS)
-
-$(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
 
 depinstall: ${TOP_INCDIR}/lock.h ${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/preempt.h ${TOP_INCDIR}/timer.h
 
@@ -149,7 +141,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/ptserver/Makefile.in b/src/ptserver/Makefile.in
index cdaee203e..ed9f56f12 100644
--- a/src/ptserver/Makefile.in
+++ b/src/ptserver/Makefile.in
@@ -38,18 +38,8 @@ LIBS=${TOP_LIBDIR}/libubik.a \
 	${TOP_LIBDIR}/libsys.a \
 	${TOP_LIBDIR}/libafsutil.a
 
-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 $@
-
 all: ptserver pts pt_util db_verify ${TOP_LIBDIR}/libprot.a \
-	depinstall readgroup readpwd testpt $(PICOBJS)
-
-$(PICTARGET):
-	mkdir -p $(PICTARGET)
+	depinstall readgroup readpwd testpt
 
 depinstall: \
 	ptint.cs.c ptint.xdr.c \
@@ -233,7 +223,7 @@ ${DEST}/include/afs/ptuser.h: ptuser.h
 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 $(PICTARGET)/*.o
+	core AFS_component_version_number.c Kptint.cs.c Kptint.h Kptint.xdr.c
 
 include ../config/Makefile.version
 ${DESTDIR}${afssrvlibexecdir}/ptserver: ptserver
diff --git a/src/rx/Makefile.in b/src/rx/Makefile.in
index b4961f775..e1988fd34 100644
--- a/src/rx/Makefile.in
+++ b/src/rx/Makefile.in
@@ -41,20 +41,12 @@ BASICINCLS=${TOP_INCDIR}/lwp.h ${TOP_INCDIR}/lock.h \
 LIBS=librx.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \
 	       ${TOP_LIBDIR}/util.a
 
-PICTARGET =../pic/rx
-PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(LIBOBJS))
-$(PICTARGET)/%.o: %.c $(PICTARGET)
-	$(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
-
 all: \
 	includes \
-	${TOP_LIBDIR}/librx.a $(PICOBJS)
+	${TOP_LIBDIR}/librx.a
 
 depinstall: includes
 
-$(PICTARGET):
-	mkdir -p $(PICTARGET)
-
 install-djgpp: \
 	includes \
 	${TOP_INCDIR}/rx/rx_xmit_nt.h \
@@ -317,6 +309,6 @@ ${DEST}/include/rx/xdr_prototypes.h: xdr_prototypes.h
 # 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 7576a529e..c05c0cdf6 100644
--- a/src/rxkad/Makefile.in
+++ b/src/rxkad/Makefile.in
@@ -19,17 +19,6 @@ OBJS=rxkad_client.o rxkad_server.o rxkad_common.o rxkad_errs.o \
 	fcrypt.o crypt_conn.o ticket.o ticket5.o crc.o \
 	md4.o md5.o
 
-PICTARGET =../pic/rxkad
-PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(OBJS))
-$(PICTARGET)/%.o: %.c $(PICTARGET)
-	$(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
-
-$(PICTARGET)/%.o: domestic/%.c $(PICTARGET)
-	$(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
-
-$(PICTARGET):
-	mkdir -p $(PICTARGET)
-
 fc_test_OBJS=fc_test.o
 
 fc_test_LIBS=\
@@ -72,7 +61,7 @@ ${DEST}/include/rx/rxkad_prototypes.h: rxkad_prototypes.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) $@
@@ -124,7 +113,7 @@ clean:
 	$(RM) -f *.o *.a tcrypt core rxkad_errs.c rxkad.h \
 		AFS_component_version_number.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 83a5a678f..456a0fb44 100644
--- a/src/sys/Makefile.in
+++ b/src/sys/Makefile.in
@@ -14,20 +14,10 @@ CFLAGS=-I. -I${srcdir} ${DBUG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR}  ${XCF
 SFLAGS=-P -I${TOP_INCDIR}
 LIBS=libsys.a ${TOP_LIBDIR}/librx.a libsys.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/util.a ${XLIBS}
 
-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 
 
-all: $(PICOBJS) \
+all: \
 	rmtsysd \
 	pagsh \
 	pagsh.krb \
@@ -79,7 +69,6 @@ afssyscalls.o: afssyscalls.c afssyscalls.h
 	${CCOBJ} ${CFLAGS} -c ${srcdir}/afssyscalls.c
 
 rmtsysnet.o rmtsysc.o rmtsyss.o rmtsysd.o: rmtsys.h
-$(PICTARGET)/rmtsysnet.o $(PICTARGET)/rmtsysc.o: rmtsys.h
 rmtsysd: AFS_component_version_number.o afs.exp afsl.exp
 
 rmtsys.cs.c: rmtsys.xg
@@ -282,4 +271,4 @@ 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 \
-	afs.exp afsl.exp $(PICOBJS)
+	afs.exp afsl.exp
diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in
index 9a14d38c5..416289120 100644
--- a/src/ubik/Makefile.in
+++ b/src/ubik/Makefile.in
@@ -20,18 +20,13 @@ LIBS=${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a \
      ${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/libcmd.a \
      ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libsys.a ${XLIBS}
 
-PICTARGET =../pic/ubik
-PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(LIBOBJS))
-$(PICTARGET)/%.o: %.c $(PICTARGET)
-	$(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
+all: depinstall ${TOP_LIBDIR}/libubik.a udebug utst_server utst_client
+
 depinstall: \
 	ubik_int.cs.c ubik_int.xdr.c \
 	${TOP_INCDIR}/ubik.h \
 	${TOP_INCDIR}/ubik_int.h
 
-$(PICTARGET):
-	mkdir -p $(PICTARGET)
-
 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)
 
@@ -150,7 +145,7 @@ ${DEST}/include/ubik_int.h: ubik_int.h
 #
 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 $(PICTARGET)/*.o
+	$(RM) -f utst_int.h ubik_int.h uerrors.c ubik.h core AFS_component_version_number.c Kubik_int.h
 
 include ../config/Makefile.version
 
diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index b8eb9d225..22c6228e2 100644
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -16,14 +16,6 @@ objects = assert.o base64.o casestrcpy.o ktime.o volparse.o hostparse.o \
 	 afs_atomlist.o afs_lhash.o snprintf.o strlcat.o strlcpy.o \
 	 daemon.o rxkstats.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)
-
 includes = \
 	${TOP_INCDIR}/afs/dirpath.h \
 	${TOP_INCDIR}/afs/pthread_nosigs.h \
@@ -46,7 +38,7 @@ includes = \
 all: ${includes} \
 	${TOP_LIBDIR}/util.a \
 	${TOP_LIBDIR}/libafsutil.a \
-	sys $(PICOBJS)
+	sys
 
 depinstall: ${includes}
 
@@ -363,7 +355,7 @@ ${DEST}/bin/sys: sys
 
 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)