revert-rxkad-new-fcrypt-20021028

[openafs.git] / src / rxkad / Makefile.in

diff --git a/src/rxkad/Makefile.in b/src/rxkad/Makefile.in
index 5999e47..21bb102 100644 (file)
--- a/src/rxkad/Makefile.in
+++ b/src/rxkad/Makefile.in
@@ -10,119 +10,46 @@ include @TOP_OBJDIR@/src/config/Makefile.config
 
 CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
 INCLS=${TOP_INCDIR}/rx/rx.h ${TOP_INCDIR}/rx/xdr.h \
-       rxkad.h
+       ${TOP_INCDIR}/rx/fcrypt.h \
+       rxkad.h rxkad_prototypes.h fcrypt.h v5gen.h
 
-OBJS=rxkad_client.o rxkad_server.o rxkad_common.o ticket.o rxkad_errs.o \
-       fcrypt.o crypt_conn.o
+OBJS=rxkad_client.o rxkad_server.o rxkad_common.o rxkad_errs.o \
+       fcrypt.o crypt_conn.o ticket.o ticket5.o crc.o
 
-all: kinstall ukinstall ${TOP_LIBDIR}/librxkad.a ${TOP_INCDIR}/rx/rxkad.h
+fc_test_OBJS=fc_test.o
 
-#
-# Install targets
-#
-kinstall: \
-       ${KERNELDIR}/afs/private_data.h \
-       ${KERNELDIR}/afs/rxkad.h \
-       ${KERNELDIR}/afs/sboxes.h \
-       ${KERNELDIR}/afs/fcrypt.h \
-       ${KERNELDIR}/afs/fcrypt.c \
-       ${KERNELDIR}/afs/crypt_conn.c \
-       ${KERNELDIR}/afs/rxkad_client.c \
-       ${KERNELDIR}/afs/rxkad_common.c 
-
-${KERNELDIR}/afs/private_data.h: private_data.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afs/rxkad.h: rxkad.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afs/sboxes.h: sboxes.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afs/fcrypt.h: fcrypt.h
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afs/fcrypt.c: fcrypt.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afs/crypt_conn.c: crypt_conn.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afs/rxkad_client.c: rxkad_client.c
-       ${INSTALL} $? $@
-
-${KERNELDIR}/afs/rxkad_common.c: rxkad_common.c
-       ${INSTALL} $? $@
-
-ukinstall: \
-       ${UKERNELDIR}/afs \
-       ${UKERNELDIR}/rx \
-       ${UKERNELDIR}/afs/private_data.h \
-       ${UKERNELDIR}/afs/rxkad.h \
-       ${UKERNELDIR}/rx/rxkad.h \
-       ${UKERNELDIR}/afs/sboxes.h \
-       ${UKERNELDIR}/afs/fcrypt.h \
-       ${UKERNELDIR}/afs/fcrypt.c \
-       ${UKERNELDIR}/afs/crypt_conn.c \
-       ${UKERNELDIR}/afs/rxkad_client.c \
-       ${UKERNELDIR}/afs/rxkad_common.c \
-       ${UKERNELDIR}/afs/ticket.c \
-       ${UKERNELDIR}/afs/rxkad_server.c \
-       ${UKERNELDIR}/afs/lifetimes.h \
-       ${UKERNELDIR}/afs/rxkad_errs.c 
-
-
-${UKERNELDIR}/afs:
-       mkdir -p $?
-
-${UKERNELDIR}/rx:
-       mkdir -p $?
-
-${UKERNELDIR}/afs/private_data.h: private_data.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/rxkad.h: rxkad.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/rx/rxkad.h: rxkad.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/lifetimes.h: lifetimes.h
-       ${INSTALL} $? $@
+fc_test_LIBS=\
+       ${TOP_LIBDIR}/librxkad.a \
+       ${TOP_LIBDIR}/librx.a \
+       ${TOP_LIBDIR}/liblwp.a \
+       ${TOP_LIBDIR}/libsys.a
 
-${UKERNELDIR}/afs/ticket.c: ticket.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/sboxes.h: sboxes.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/fcrypt.h: fcrypt.h
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/fcrypt.c: fcrypt.c
-       ${INSTALL} $? $@
-
-${UKERNELDIR}/afs/crypt_conn.c: crypt_conn.c
-       ${INSTALL} $? $@
+all: ${TOP_LIBDIR}/librxkad.a fc_test depinstall
 
-${UKERNELDIR}/afs/rxkad_client.c: rxkad_client.c
-       ${INSTALL} $? $@
+depinstall: \
+       ${TOP_INCDIR}/rx/rxkad.h \
+       ${TOP_INCDIR}/rx/rxkad_prototypes.h \
+       ${TOP_INCDIR}/rx/fcrypt.h
 
-${UKERNELDIR}/afs/rxkad_errs.c: rxkad_errs.c
-       ${INSTALL} $? $@
+#
+# Install targets
+#
+install:   \
+       ${DESTDIR}${libdir}/librxkad.a \
+       ${DESTDIR}${includedir}/rx/fcrypt.h \
+       ${DESTDIR}${includedir}/rx/rxkad.h \
+       ${DESTDIR}${includedir}/rx/rxkad_prototypes.h
 
-${UKERNELDIR}/afs/rxkad_server.c: rxkad_server.c
+${DEST}/lib/librxkad.a: librxkad.a
        ${INSTALL} $? $@
 
-${UKERNELDIR}/afs/rxkad_common.c: rxkad_common.c
+${DEST}/include/rx/fcrypt.h: fcrypt.h
        ${INSTALL} $? $@
 
-install:   ${DESTDIR}${libdir}/librxkad.a ${DESTDIR}${includedir}/rx/rxkad.h
-
-${DEST}/lib/librxkad.a: librxkad.a
+${DEST}/include/rx/rxkad.h: rxkad.h
        ${INSTALL} $? $@
 
-${DEST}/include/rx/rxkad.h: rxkad.h
+${DEST}/include/rx/rxkad_prototypes.h: rxkad_prototypes.h
        ${INSTALL} $? $@
 
 #
@@ -150,7 +77,11 @@ rxkad_errs.c rxkad.h: rxkad_errs.et rxkad.p.h
 
 ticket.o: ticket.c lifetimes.h ${INCLS}
 
-fcrypt.o: fcrypt.c fcrypt.h sboxes.h rxkad.h
+ticket5.o: ticket5.c v5gen.c v5der.c v5gen-rewrite.h ${INCLS}
+
+crc.o: crc.c ${INCLS}
+
+fcrypt.o: fcrypt.c fcrypt.h sboxes.h rxkad.h rxkad_prototypes.h
        ${CC} ${CFLAGS} -c fcrypt.c
 
 tcrypt: tcrypt.o librxkad.a 
@@ -158,6 +89,11 @@ tcrypt: tcrypt.o librxkad.a
 
 tcrypt.o: tcrypt.c AFS_component_version_number.o
 
+fc_test: ${fc_test_OBJS}
+       ${CC} ${CFLAGS} -o fc_test ${fc_test_OBJS} ${fc_test_LIBS} ${XLIBS}
+
+fc_test.o: ${INCLS}
+
 #
 # Misc. targets
 #
@@ -165,7 +101,8 @@ tcrypt.o: tcrypt.c AFS_component_version_number.o
 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
+               crypt_conn.c fcrypt.c fcrypt.h sboxes.h \
+               fc_test
 
 test:
        cd test; $(MAKE)
@@ -195,11 +132,27 @@ ${DESTDIR}${libdir}/librxkad.a: librxkad.a
 ${TOP_LIBDIR}/librxkad.a: librxkad.a
        ${INSTALL} $? $@
 
+${DESTDIR}${includedir}/rx/fcrypt.h: fcrypt.h
+       ${INSTALL} $? $@
+
 ${DESTDIR}${includedir}/rx/rxkad.h: rxkad.h
        ${INSTALL} $? $@
 
+${DESTDIR}${includedir}/rx/rxkad_prototypes.h: rxkad_prototypes.h
+       ${INSTALL} $? $@
+
+${TOP_INCDIR}/rx/fcrypt.h: fcrypt.h
+       ${INSTALL} $? $@
+
 ${TOP_INCDIR}/rx/rxkad.h: rxkad.h
        ${INSTALL} $? $@
 
-dest:   ${DEST}/lib/librxkad.a ${DEST}/include/rx/rxkad.h
+${TOP_INCDIR}/rx/rxkad_prototypes.h: rxkad_prototypes.h
+       ${INSTALL} $? $@
+
+dest:   \
+       ${DEST}/lib/librxkad.a \
+       ${DEST}/include/rx/fcrypt.h \
+       ${DEST}/include/rx/rxkad.h \
+       ${DEST}/include/rx/rxkad_prototypes.h