revert-bg-fcrypt-cleanup-20021030
authorDerrick Brashear <shadow@dementia.org>
Tue, 10 Dec 2002 19:53:38 +0000 (19:53 +0000)
committerDerrick Brashear <shadow@dementia.org>
Tue, 10 Dec 2002 19:53:38 +0000 (19:53 +0000)
unroll the rest of it

src/libafs/Makefile.common.in
src/libafsrpc/Makefile.in
src/libuafs/Makefile.common.in
src/shlibafsrpc/Makefile.in

index a533ec1..4055283 100644 (file)
@@ -28,6 +28,7 @@ COMMON_INCLUDE = -I. -I.. -I../nfs \
        -I${TOP_SRCDIR}/config \
        -I${TOP_SRCDIR}/rx/${MKAFS_OSTYPE} \
        -I${TOP_SRCDIR}/rxkad \
+       -I${TOP_SRCDIR}/rxkad/domestic \
        -I${TOP_SRCDIR}/util \
        -I${TOP_OBJDIR}/src \
        -I${TOP_OBJDIR}/src/afs \
@@ -125,7 +126,7 @@ AFSAOBJS = \
        xdr_int32.o     \
        xdr_int64.o     \
        Kvice.cs.o      \
-       bg-fcrypt.o             \
+       fcrypt.o                \
        rx.o            \
        rx_rdwr.o       \
        rx_clock.o      \
@@ -145,6 +146,7 @@ AFSAOBJS = \
        Krxstat.ss.o    \
        Krxstat.xdr.o   \
        rxstat.o        \
+       crypt_conn.o    \
        AFS_component_version_number.o\
        afs_exporter.o  \
        rxkad_client.o  \
@@ -275,7 +277,9 @@ afs_memcache.o: $(TOP_SRC_AFS)/afs_memcache.c
        $(CRULE1)
 afs_stat.o: $(TOP_SRC_AFS)/afs_stat.c
        $(CRULE1)
-bg-fcrypt.o:   $(TOP_SRC_RXKAD)/bg-fcrypt.c
+fcrypt.o:      $(TOP_SRC_RXKAD)/domestic/fcrypt.c
+       $(CRULE1)
+crypt_conn.o: $(TOP_SRC_RXKAD)/domestic/crypt_conn.c
        $(CRULE1)
 rxkad_client.o: $(TOP_SRC_RXKAD)/rxkad_client.c
        $(CRULE1)
index c8cafbf..7b905a2 100644 (file)
@@ -85,7 +85,8 @@ RXKADOBJS =\
        ticket.o \
        ticket5.o \
        crc.o \
-       bg-fcrypt.o
+       fcrypt.o \
+       crypt_conn.o
 
 DESOBJS =\
        des.o \
@@ -189,7 +190,10 @@ ticket5.o: ${RXKAD}/ticket5.c
 crc.o: ${RXKAD}/crc.c
        ${CCRULE}
 
-bg-fcrypt.o: ${RXKAD}/bg-fcrypt.c
+fcrypt.o: ${RXKAD}/fcrypt.c
+       ${CCRULE}
+
+crypt_conn.o: ${RXKAD}/crypt_conn.c
        ${CCRULE}
 
 AFS_component_version_number.o: ${RX}/AFS_component_version_number.c
index 1c544d0..a80bb31 100644 (file)
@@ -39,6 +39,7 @@ COMMON_INCLUDE = -I. -I.. -I../nfs \
         -I${TOP_SRCDIR}/rx \
         -I${TOP_SRCDIR}/rx/UKERNEL \
         -I${TOP_SRCDIR}/rxkad \
+        -I${TOP_SRCDIR}/rxkad/domestic \
         -I${TOP_SRCDIR}/util \
         -I${TOP_OBJDIR}/src \
         -I${TOP_OBJDIR}/src/afs/UKERNEL \
@@ -141,7 +142,7 @@ UAFSOBJ = \
        $(UOBJ)/Kvice.xdr.o \
        $(UOBJ)/xdr_arrayn.o \
        $(UOBJ)/Kvice.cs.o \
-       $(UOBJ)/bg-fcrypt.o \
+       $(UOBJ)/fcrypt.o \
        $(UOBJ)/rx.o \
        $(UOBJ)/rx_rdwr.o \
        $(UOBJ)/rx_clock.o \
@@ -159,6 +160,7 @@ UAFSOBJ = \
        $(UOBJ)/Kvldbint.cs.o \
        $(UOBJ)/Kvldbint.xdr.o \
        $(UOBJ)/Kcallback.ss.o \
+       $(UOBJ)/crypt_conn.o \
        $(UOBJ)/AFS_component_version_number.o \
        $(UOBJ)/afs_exporter.o \
        $(UOBJ)/rxkad_client.o \
@@ -260,7 +262,7 @@ AFSWEBOBJ = \
        $(WEBOBJ)/Kvice.xdr.o \
        $(WEBOBJ)/xdr_arrayn.o \
        $(WEBOBJ)/Kvice.cs.o \
-       $(WEBOBJ)/bg-fcrypt.o \
+       $(WEBOBJ)/fcrypt.o \
        $(WEBOBJ)/rx.o \
        $(WEBOBJ)/rx_rdwr.o \
        $(WEBOBJ)/rx_clock.o \
@@ -278,6 +280,7 @@ AFSWEBOBJ = \
        $(WEBOBJ)/Kvldbint.cs.o \
        $(WEBOBJ)/Kvldbint.xdr.o \
        $(WEBOBJ)/Kcallback.ss.o \
+       $(WEBOBJ)/crypt_conn.o \
        $(WEBOBJ)/AFS_component_version_number.o \
        $(WEBOBJ)/afs_exporter.o \
        $(WEBOBJ)/rxkad_client.o \
@@ -377,7 +380,7 @@ AFSWEBOBJKRB = \
        $(WEBOBJ)/Kvice.xdr.o \
        $(WEBOBJ)/xdr_arrayn.o \
        $(WEBOBJ)/Kvice.cs.o \
-       $(WEBOBJ)/bg-fcrypt.o \
+       $(WEBOBJ)/fcrypt.o \
        $(WEBOBJ)/rx.o \
        $(WEBOBJ)/rx_rdwr.o \
        $(WEBOBJ)/rx_clock.o \
@@ -395,6 +398,7 @@ AFSWEBOBJKRB = \
        $(WEBOBJ)/Kvldbint.cs.o \
        $(WEBOBJ)/Kvldbint.xdr.o \
        $(WEBOBJ)/Kcallback.ss.o \
+       $(WEBOBJ)/crypt_conn.o \
        $(WEBOBJ)/AFS_component_version_number.o \
        $(WEBOBJ)/afs_exporter.o \
        $(WEBOBJ)/rxkad_client.o \
@@ -495,7 +499,7 @@ JUAFSOBJ = \
        $(JUAFS)/Kvice.xdr.o \
        $(JUAFS)/xdr_arrayn.o \
        $(JUAFS)/Kvice.cs.o \
-       $(JUAFS)/bg-fcrypt.o \
+       $(JUAFS)/fcrypt.o \
        $(JUAFS)/rx.o \
        $(JUAFS)/rx_rdwr.o \
        $(JUAFS)/rx_clock.o \
@@ -512,6 +516,7 @@ JUAFSOBJ = \
        $(JUAFS)/Kvldbint.cs.o \
        $(JUAFS)/Kvldbint.xdr.o \
        $(JUAFS)/Kcallback.ss.o \
+       $(JUAFS)/crypt_conn.o \
        $(JUAFS)/AFS_component_version_number.o \
        $(JUAFS)/afs_exporter.o \
        $(JUAFS)/rxkad_client.o \
@@ -651,7 +656,9 @@ $(UOBJ)/afs_memcache.o: $(TOP_SRC_AFS)/afs_memcache.c
        $(CRULE1)
 $(UOBJ)/afs_stat.o: $(TOP_SRC_AFS)/afs_stat.c
        $(CRULE1)
-$(UOBJ)/bg-fcrypt.o:   $(TOP_SRC_RXKAD)/bg-fcrypt.c
+$(UOBJ)/fcrypt.o:      $(TOP_SRC_RXKAD)/domestic/fcrypt.c
+       $(CRULE1)
+$(UOBJ)/crypt_conn.o: $(TOP_SRC_RXKAD)/domestic/crypt_conn.c
        $(CRULE1)
 $(UOBJ)/rxkad_client.o: $(TOP_SRC_RXKAD)/rxkad_client.c
        $(CRULE1)
@@ -896,7 +903,9 @@ $(WEBOBJ)/afs_memcache.o: $(TOP_SRC_AFS)/afs_memcache.c
        $(CRULE2)
 $(WEBOBJ)/afs_stat.o: $(TOP_SRC_AFS)/afs_stat.c
        $(CRULE2)
-$(WEBOBJ)/bg-fcrypt.o:         $(TOP_SRC_RXKAD)/bg-fcrypt.c
+$(WEBOBJ)/fcrypt.o:    $(TOP_SRC_RXKAD)/domestic/fcrypt.c
+       $(CRULE2)
+$(WEBOBJ)/crypt_conn.o: $(TOP_SRC_RXKAD)/domestic/crypt_conn.c
        $(CRULE2)
 $(WEBOBJ)/rxkad_client.o: $(TOP_SRC_RXKAD)/rxkad_client.c
        $(CRULE2)
@@ -1145,7 +1154,9 @@ $(JUAFS)/afs_memcache.o: $(TOP_SRC_AFS)/afs_memcache.c
        $(CRULE1)
 $(JUAFS)/afs_stat.o: $(TOP_SRC_AFS)/afs_stat.c
        $(CRULE1)
-$(JUAFS)/bg-fcrypt.o:  $(TOP_SRC_RXKAD)/bg-fcrypt.c
+$(JUAFS)/fcrypt.o:     $(TOP_SRC_RXKAD)/domestic/fcrypt.c
+       $(CRULE1)
+$(JUAFS)/crypt_conn.o: $(TOP_SRC_RXKAD)/domestic/crypt_conn.c
        $(CRULE1)
 $(JUAFS)/rxkad_client.o: $(TOP_SRC_RXKAD)/rxkad_client.c
        $(CRULE1)
index f3f204c..ec37b5e 100644 (file)
@@ -87,7 +87,8 @@ RXKADOBJS =\
        ticket.o \
        ticket5.o \
        crc.o \
-       bg-fcrypt.o 
+       fcrypt.o \
+       crypt_conn.o
 
 DESOBJS =\
        des.o \
@@ -197,7 +198,10 @@ ticket5.o: ${RXKAD}/ticket5.c
 crc.o: ${RXKAD}/crc.c
        ${CCRULE}
 
-bg-fcrypt.o: ${RXKAD}/bg-fcrypt.c
+fcrypt.o: ${RXKAD}/fcrypt.c
+       ${CCRULE}
+
+crypt_conn.o: ${RXKAD}/crypt_conn.c
        ${CCRULE}
 
 AFS_component_version_number.o: ${RX}/AFS_component_version_number.c