From 9e814d8ca7523792b5e964e6591fec158867e399 Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Sun, 2 Feb 2003 18:57:28 +0000 Subject: [PATCH] Update include patch handling in pam patch --- debian/patch.build_pam | 108 +++++++++++++++++++++-------------------- src/audit/Makefile.in | 4 +- src/auth/Makefile.in | 12 ++++- src/cmd/Makefile.in | 19 +++++--- src/comerr/Makefile.in | 15 +++++- src/des/Makefile.in | 13 ++++- src/kauth/Makefile.in | 13 ++++- src/lwp/Makefile.in | 12 ++++- src/pam/Makefile.in | 18 +++---- src/rx/Makefile.in | 12 ++++- src/rxkad/Makefile.in | 13 ++++- src/sys/Makefile.in | 13 ++++- src/util/Makefile.in | 13 ++++- src/venus/Makefile.in | 2 +- 14 files changed, 178 insertions(+), 89 deletions(-) diff --git a/debian/patch.build_pam b/debian/patch.build_pam index ea035f432..ee3f6b1fe 100644 --- a/debian/patch.build_pam +++ b/debian/patch.build_pam @@ -1,10 +1,12 @@ +? 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.1.1.1 -diff -u -r1.1.1.1 Makefile.in ---- src/audit/Makefile.in 11 Sep 2001 14:31:18 -0000 1.1.1.1 -+++ src/audit/Makefile.in 19 Jan 2003 22:27:46 -0000 +retrieving revision 1.3 +diff -u -r1.3 Makefile.in +--- src/audit/Makefile.in 2 Feb 2003 18:52:06 -0000 1.3 ++++ src/audit/Makefile.in 2 Feb 2003 18:55:32 -0000 @@ -65,9 +65,11 @@ audit.o: audit.c audit.h @@ -21,10 +23,10 @@ diff -u -r1.1.1.1 Makefile.in Index: src/auth/Makefile.in =================================================================== RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/auth/Makefile.in,v -retrieving revision 1.1.1.2 -diff -u -r1.1.1.2 Makefile.in ---- src/auth/Makefile.in 22 Jan 2002 19:52:27 -0000 1.1.1.2 -+++ src/auth/Makefile.in 19 Jan 2003 22:12:47 -0000 +retrieving revision 1.3 +diff -u -r1.3 Makefile.in +--- src/auth/Makefile.in 2 Feb 2003 18:52:06 -0000 1.3 ++++ src/auth/Makefile.in 2 Feb 2003 18:55:33 -0000 @@ -45,7 +45,15 @@ UKSRCS=${KSRCS} cellconfig.h acfg_errors.c keys.h cellconfig.c \ ktc.c authcon.c ktc_errors.c @@ -54,10 +56,10 @@ diff -u -r1.1.1.2 Makefile.in Index: src/cmd/Makefile.in =================================================================== RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/cmd/Makefile.in,v -retrieving revision 1.1.1.1 -diff -u -r1.1.1.1 Makefile.in ---- src/cmd/Makefile.in 11 Sep 2001 14:32:00 -0000 1.1.1.1 -+++ src/cmd/Makefile.in 19 Jan 2003 22:16:08 -0000 +retrieving revision 1.3 +diff -u -r1.3 Makefile.in +--- src/cmd/Makefile.in 2 Feb 2003 18:52:06 -0000 1.3 ++++ src/cmd/Makefile.in 2 Feb 2003 18:55:35 -0000 @@ -34,6 +34,15 @@ CFLAGS=${OPTMZ} -I${TOP_SRCDIR}/config -I${TOP_INCDIR} ${XCFLAGS} @@ -112,10 +114,10 @@ diff -u -r1.1.1.1 Makefile.in Index: src/comerr/Makefile.in =================================================================== RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/comerr/Makefile.in,v -retrieving revision 1.1.1.1 -diff -u -r1.1.1.1 Makefile.in ---- src/comerr/Makefile.in 11 Sep 2001 14:32:02 -0000 1.1.1.1 -+++ src/comerr/Makefile.in 19 Jan 2003 22:12:47 -0000 +retrieving revision 1.3 +diff -u -r1.3 Makefile.in +--- src/comerr/Makefile.in 2 Feb 2003 18:52:06 -0000 1.3 ++++ src/comerr/Makefile.in 2 Feb 2003 18:55:35 -0000 @@ -45,7 +45,18 @@ ${CC} ${CFLAGS} -o compile_et compile_et.o error_table.o -L${TOP_LIBDIR} -lafsutil -ll;; \ esac @@ -148,10 +150,10 @@ diff -u -r1.1.1.1 Makefile.in Index: src/des/Makefile.in =================================================================== RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/des/Makefile.in,v -retrieving revision 1.1.1.2 -diff -u -r1.1.1.2 Makefile.in ---- src/des/Makefile.in 22 Jan 2002 19:53:04 -0000 1.1.1.2 -+++ src/des/Makefile.in 19 Jan 2003 22:19:28 -0000 +retrieving revision 1.3 +diff -u -r1.3 Makefile.in +--- src/des/Makefile.in 2 Feb 2003 18:52:06 -0000 1.3 ++++ src/des/Makefile.in 2 Feb 2003 18:55:38 -0000 @@ -73,7 +73,16 @@ .c.o: ${CC} -c -I. -I${TOP_INCDIR} -I${TOP_SRCDIR}/config ${XCFLAGS} $< @@ -161,7 +163,7 @@ diff -u -r1.1.1.2 Makefile.in +PICTARGET =../pic/des +PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(OBJS)) +$(PICTARGET)/%.o: %.c $(PICTARGET) -+ $(CC) -I../des -I../libafs -I../include -I../config -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@ ++ $(CC) -I. -I${TOP_INCDIR} -I${TOP_SRCDIR}/config ${XCFLAGS} -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@ + +$(PICTARGET): + mkdir -p $(PICTARGET) @@ -182,10 +184,10 @@ diff -u -r1.1.1.2 Makefile.in Index: src/kauth/Makefile.in =================================================================== RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/kauth/Makefile.in,v -retrieving revision 1.1.1.2 -diff -u -r1.1.1.2 Makefile.in ---- src/kauth/Makefile.in 22 Jan 2002 19:53:20 -0000 1.1.1.2 -+++ src/kauth/Makefile.in 19 Jan 2003 22:22:00 -0000 +retrieving revision 1.3 +diff -u -r1.3 Makefile.in +--- src/kauth/Makefile.in 2 Feb 2003 18:52:06 -0000 1.3 ++++ src/kauth/Makefile.in 2 Feb 2003 18:55:40 -0000 @@ -79,13 +79,22 @@ noversion: install @@ -214,10 +216,10 @@ diff -u -r1.1.1.2 Makefile.in Index: src/lwp/Makefile.in =================================================================== RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/lwp/Makefile.in,v -retrieving revision 1.1.1.2 -diff -u -r1.1.1.2 Makefile.in ---- src/lwp/Makefile.in 20 Sep 2001 06:15:30 -0000 1.1.1.2 -+++ src/lwp/Makefile.in 19 Jan 2003 22:23:30 -0000 +retrieving revision 1.3 +diff -u -r1.3 Makefile.in +--- src/lwp/Makefile.in 2 Feb 2003 18:52:06 -0000 1.3 ++++ src/lwp/Makefile.in 2 Feb 2003 18:55:42 -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 @@ -247,10 +249,10 @@ diff -u -r1.1.1.2 Makefile.in Index: src/pam/Makefile.in =================================================================== RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/pam/Makefile.in,v -retrieving revision 1.1.1.5 -diff -u -r1.1.1.5 Makefile.in ---- src/pam/Makefile.in 26 Sep 2002 19:07:19 -0000 1.1.1.5 -+++ src/pam/Makefile.in 19 Jan 2003 22:49:13 -0000 +retrieving revision 1.3 +diff -u -r1.3 Makefile.in +--- src/pam/Makefile.in 2 Feb 2003 18:52:06 -0000 1.3 ++++ src/pam/Makefile.in 2 Feb 2003 18:55:43 -0000 @@ -43,29 +43,29 @@ SHOBJS = afs_account.o afs_session.o afs_password.o \ afs_pam_msg.o afs_message.o AFS_component_version_number.o @@ -301,10 +303,10 @@ diff -u -r1.1.1.5 Makefile.in Index: src/rx/Makefile.in =================================================================== RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/rx/Makefile.in,v -retrieving revision 1.1.1.4 -diff -u -r1.1.1.4 Makefile.in ---- src/rx/Makefile.in 11 Dec 2002 02:44:27 -0000 1.1.1.4 -+++ src/rx/Makefile.in 19 Jan 2003 22:16:08 -0000 +retrieving revision 1.3 +diff -u -r1.3 Makefile.in +--- src/rx/Makefile.in 2 Feb 2003 18:52:06 -0000 1.3 ++++ src/rx/Makefile.in 2 Feb 2003 18:55:45 -0000 @@ -72,7 +72,15 @@ xdr_afsuuid.c rx_trace.h xdr_int64.c UKSRCS = $(KSRCS) rx_conncache.c @@ -334,10 +336,10 @@ diff -u -r1.1.1.4 Makefile.in Index: src/rxkad/Makefile.in =================================================================== RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/rxkad/Makefile.in,v -retrieving revision 1.1.1.3 -diff -u -r1.1.1.3 Makefile.in ---- src/rxkad/Makefile.in 11 Dec 2002 02:44:45 -0000 1.1.1.3 -+++ src/rxkad/Makefile.in 19 Jan 2003 22:22:00 -0000 +retrieving revision 1.3 +diff -u -r1.3 Makefile.in +--- src/rxkad/Makefile.in 2 Feb 2003 18:52:06 -0000 1.3 ++++ src/rxkad/Makefile.in 2 Feb 2003 18:55:48 -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 @@ -375,10 +377,10 @@ diff -u -r1.1.1.3 Makefile.in Index: src/sys/Makefile.in =================================================================== RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/sys/Makefile.in,v -retrieving revision 1.1.1.2 -diff -u -r1.1.1.2 Makefile.in ---- src/sys/Makefile.in 20 Sep 2001 06:16:23 -0000 1.1.1.2 -+++ src/sys/Makefile.in 19 Jan 2003 22:16:08 -0000 +retrieving revision 1.3 +diff -u -r1.3 Makefile.in +--- src/sys/Makefile.in 2 Feb 2003 18:52:06 -0000 1.3 ++++ src/sys/Makefile.in 2 Feb 2003 18:55:49 -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 @@ -414,10 +416,10 @@ diff -u -r1.1.1.2 Makefile.in Index: src/util/Makefile.in =================================================================== RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/util/Makefile.in,v -retrieving revision 1.1.1.2 -diff -u -r1.1.1.2 Makefile.in ---- src/util/Makefile.in 14 Oct 2001 18:06:59 -0000 1.1.1.2 -+++ src/util/Makefile.in 19 Jan 2003 22:22:00 -0000 +retrieving revision 1.3 +diff -u -r1.3 Makefile.in +--- src/util/Makefile.in 2 Feb 2003 18:52:07 -0000 1.3 ++++ src/util/Makefile.in 2 Feb 2003 18:55:51 -0000 @@ -45,6 +45,15 @@ dirpath.o fileutil.o netutils.o flipbase64.o \ afs_atomlist.o afs_lhash.o snprintf.o ${REGEX_OBJ} @@ -455,10 +457,10 @@ diff -u -r1.1.1.2 Makefile.in Index: src/venus/Makefile.in =================================================================== RCS file: /afs/sipb/project/openafs/debian/cvs/openafs/src/venus/Makefile.in,v -retrieving revision 1.1.1.5 -diff -u -r1.1.1.5 Makefile.in ---- src/venus/Makefile.in 26 Sep 2002 19:09:03 -0000 1.1.1.5 -+++ src/venus/Makefile.in 19 Jan 2003 21:45:28 -0000 +retrieving revision 1.3 +diff -u -r1.3 Makefile.in +--- src/venus/Makefile.in 2 Feb 2003 18:52:07 -0000 1.3 ++++ src/venus/Makefile.in 2 Feb 2003 18:55:51 -0000 @@ -288,7 +288,7 @@ # diff --git a/src/audit/Makefile.in b/src/audit/Makefile.in index aeebffc29..aebbbdbe5 100644 --- a/src/audit/Makefile.in +++ b/src/audit/Makefile.in @@ -65,9 +65,11 @@ 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 + $(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 --git a/src/auth/Makefile.in b/src/auth/Makefile.in index 60f8aeb23..a48c04a5d 100644 --- a/src/auth/Makefile.in +++ b/src/auth/Makefile.in @@ -45,7 +45,15 @@ KSRCS=auth.h 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 @@ test: 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 --git a/src/cmd/Makefile.in b/src/cmd/Makefile.in index f564e1ec9..6e25f0958 100644 --- a/src/cmd/Makefile.in +++ b/src/cmd/Makefile.in @@ -34,6 +34,15 @@ 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 @@ -42,10 +51,6 @@ 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 @@ -53,12 +58,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 +libcmd64.a: ${LIB64OBJS} AFS_component_version_number64.o $(PIC64OBJS) -$(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 +94,7 @@ test tests: (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 --git a/src/comerr/Makefile.in b/src/comerr/Makefile.in index a7974b0bb..ab21fba4f 100644 --- a/src/comerr/Makefile.in +++ b/src/comerr/Makefile.in @@ -45,7 +45,18 @@ 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 -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 @@ 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 + eddep makedep core AFS_component_version_number.c $(PICTARGET)/*.o test: cd test; $(MAKE) diff --git a/src/des/Makefile.in b/src/des/Makefile.in index 388780150..b72c3620d 100644 --- a/src/des/Makefile.in +++ b/src/des/Makefile.in @@ -73,7 +73,16 @@ 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} $< -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 @@ 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 + 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 --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in index 59360c1db..4d8db9165 100644 --- a/src/kauth/Makefile.in +++ b/src/kauth/Makefile.in @@ -79,13 +79,22 @@ include ../config/Makefile.version 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 --git a/src/lwp/Makefile.in b/src/lwp/Makefile.in index ffb0679ff..0a8e61cc8 100644 --- a/src/lwp/Makefile.in +++ b/src/lwp/Makefile.in @@ -37,7 +37,15 @@ 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 -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 @@ -147,7 +155,7 @@ ${DEST}/include/timer.h: timer.h # 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 --git a/src/pam/Makefile.in b/src/pam/Makefile.in index ba61bb8bd..caf1a6fd7 100644 --- a/src/pam/Makefile.in +++ b/src/pam/Makefile.in @@ -43,29 +43,29 @@ LDFLAGS = ${SHLIB_LDFLAGS} SHOBJS = afs_account.o afs_session.o afs_password.o \ afs_pam_msg.o afs_message.o AFS_component_version_number.o OBJS = $(SHOBJS) test_pam.o -INCLUDES=-I${TOP_SRCDIR}/config -I${TOP_INCDIR} \ - -I/usr/include -I/usr/include/sys +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 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; \ @@ -77,7 +77,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) -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) ;;\ * ) \ diff --git a/src/rx/Makefile.in b/src/rx/Makefile.in index dce3aeb16..fba2b248c 100644 --- a/src/rx/Makefile.in +++ b/src/rx/Makefile.in @@ -72,7 +72,15 @@ 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 -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/' RX_component_version_number.c @@ -222,7 +230,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 + $(RM) -f *.o *.a core *_component_version_number.c $(PICTARGET)/*.o include ../config/Makefile.version diff --git a/src/rxkad/Makefile.in b/src/rxkad/Makefile.in index 543e4adc7..043bf3f78 100644 --- a/src/rxkad/Makefile.in +++ b/src/rxkad/Makefile.in @@ -40,6 +40,15 @@ 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=\ @@ -163,7 +172,7 @@ ${DEST}/include/rx/rxkad.h: rxkad.h # 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 @@ 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 + fc_test $(PICTARGET)/*.o test: cd test; $(MAKE) diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in index 30f3af868..9a055a0e7 100644 --- a/src/sys/Makefile.in +++ b/src/sys/Makefile.in @@ -36,12 +36,21 @@ 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 +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 @@ 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 + rmtsysd AFS_component_version_number.c pagsh pagsh.krb $(PICTARGET)/*.o ${DEST}/lib/afs/libsys.a: libsys.a ${INSTALL} $? $@ diff --git a/src/util/Makefile.in b/src/util/Makefile.in index 6d4474f6d..acb2d2aab 100644 --- a/src/util/Makefile.in +++ b/src/util/Makefile.in @@ -45,6 +45,15 @@ 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 \ @@ -80,7 +89,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 +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 @@ -434,7 +443,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 + $(RM) -f util.a *.o core AFS_component_version_number.c $(PICTARGET)/*.o test: cd test; $(MAKE) diff --git a/src/venus/Makefile.in b/src/venus/Makefile.in index 60e1509d7..1e82c0410 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 + $(RM) -f *.o *.a up fs kdump-* kdump kdump64 core cmdebug AFS_component_version_number.c fstrace gcpags livesys test: cd test; $(MAKE) -- 2.39.5