hcrypto: Use system wide libroken

[openafs.git] / src / crypto / hcrypto / Makefile.in

diff --git a/src/crypto/hcrypto/Makefile.in b/src/crypto/hcrypto/Makefile.in
index ea2ae1e..ea73d68 100644 (file)
--- a/src/crypto/hcrypto/Makefile.in
+++ b/src/crypto/hcrypto/Makefile.in
@@ -37,7 +37,7 @@ MODULE_INCLUDE=-I${srcdir} -I${TOP_INCDIR}/hcrypto -I$(UPSTREAM)/hcrypto
 
 SHLIBOBJ= libafshcrypto.${SHLIB_SUFFIX}.${LIBMAJOR}.${LIBMINOR}
 
-all: $(ROKEN_HEADERS) ${HEADERS} ${TOP_LIBDIR}/${SHLIBOBJ} \
+all: ${HEADERS} ${TOP_LIBDIR}/${SHLIBOBJ} \
        ${TOP_LIBDIR}/libafshcrypto.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a
 
@@ -53,19 +53,17 @@ dest: libafshcrypto.a ${SHLIBOBJ}
 
 clean:
        $(RM) -f ${OBJECTS} ${SHLIBOBJ} libafshcrypto.a libafshcrypto.exp \
-                test_cipher test_cipher.o hex.o
+                test_cipher test_cipher.o
 
 COMMON_OBJS= aes.o camellia.o camellia-ntt.o des.o engine.o evp.o \
             evp-hcrypto.o evp-cc.o hmac.o md2.o md4.o md5.o pkcs5.o \
             rand-egd.o rand-timer.o rand-unix.o rand.o rc2.o rc4.o \
             rijndael-alg-fst.o rnd_keys.o sha.o sha256.o sha512.o ui.o \
-            validate.o \
-            cloexec.o ct.o issuid.o net_read.o net_write.o snprintf.o \
-            warnerr.o
+            validate.o
 
-OBJECTS = $(COMMON_OBJS) rand-fortuna.o $(ROKEN_LIBOBJS)
+OBJECTS = $(COMMON_OBJS) rand-fortuna.o
 
-LWP_OBJS = $(COMMON_OBJS) rand-fortuna_lwp.o $(ROKEN_LIBOBJS)
+LWP_OBJS = $(COMMON_OBJS) rand-fortuna_lwp.o
 
 LWPRULE=$(CC) $(AFS_CPPFLAGS) $(COMMON_CFLAGS) $(XCFLAGS) $(ARCHFLAGS) \
        -I$(TOP_INCDIR)/hcrypto -I$(UPSTREAM)/hcrypto -c $?
@@ -77,7 +75,7 @@ ${TOP_LIBDIR}/${SHLIBOBJ}: ${SHLIBOBJ}
 ${SHLIBOBJ}: ${OBJECTS} libafshcrypto.map
        ${TOP_OBJDIR}/src/config/shlib-build -d $(srcdir) -l libafshcrypto \
                -M ${LIBMAJOR} -m ${LIBMINOR} -- \
-               ${OBJECTS} ${MT_LIBS}
+               ${OBJECTS} -L$(TOP_LIBDIR) -lrokenafs ${MT_LIBS}
 
 libafshcrypto.a: ${OBJECTS}
        $(RM) -f $@
@@ -89,8 +87,8 @@ libafshcrypto_lwp.a: $(LWP_OBJS)
        $(AR) crv $@ $(LWP_OBJS)
        $(RANLIB) $@
 
-test_cipher: test_cipher.o hex.o libafshcrypto.a
-       $(AFS_LDRULE) test_cipher.o hex.o libafshcrypto.a
+test_cipher: test_cipher.o libafshcrypto.a
+       $(AFS_LDRULE) test_cipher.o libafshcrypto.a $(LIB_roken)
 
 ${TOP_INCDIR}/hcrypto/aes.h: ${UPSTREAM}/hcrypto/aes.h
        ${INSTALL_DATA} $? $@
@@ -248,101 +246,6 @@ validate.o: ${UPSTREAM}/hcrypto/validate.c
 test_cipher.o: ${UPSTREAM}/hcrypto/test_cipher.c
        $(AFS_CCRULE) $(UPSTREAM)/hcrypto/test_cipher.c
 
-# These bits of libroken are new functionality, rather than compatibility
-# code. Where they should go eventually is unclear.
-
-cloexec.o: ${UPSTREAM}/roken/cloexec.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/cloexec.c
-
-ct.o: ${UPSTREAM}/roken/ct.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/ct.c
-
-hex.o: ${UPSTREAM}/roken/hex.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/hex.c
-
-issuid.o: ${UPSTREAM}/roken/issuid.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/issuid.c
-
-net_read.o: ${UPSTREAM}/roken/net_read.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/net_read.c
-
-net_write.o: ${UPSTREAM}/roken/net_write.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/net_write.c
-
-# The upstream snprintf.c has some pointer warnings in it
-CFLAGS_snprintf.o = @CFLAGS_NOERROR@
-
-snprintf.o: ${UPSTREAM}/roken/snprintf.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/snprintf.c
-
-# These bits of libroken are compatibility functions. They should get moved
-# out into a new libroken top level target, which allows the use of an
-# existing libroken, if one is available.
-
-
-daemon.o: ${UPSTREAM}/roken/daemon.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/daemon.c
-
-ecalloc.o: ${UPSTREAM}/roken/ecalloc.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/ecalloc.c
-
-emalloc.o: ${UPSTREAM}/roken/emalloc.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/emalloc.c
-
-erealloc.o: ${UPSTREAM}/roken/erealloc.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/erealloc.c
-
-err.h: ${UPSTREAM}/roken/err.hin
-       cp $? $@
-
-err.o: ${UPSTREAM}/roken/err.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/err.c
-
-errx.o: ${UPSTREAM}/roken/errx.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/errx.c
-
-getopt.o: ${UPSTREAM}/roken/getopt.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/getopt.c
-
-getprogname.o: ${UPSTREAM}/roken/getprogname.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/getprogname.c
-
-socket.o: ${UPSTREAM}/roken/socket.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/socket.c
-
-strlcat.o: ${UPSTREAM}/roken/strlcat.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/strlcat.c
-
-strlcpy.o: ${UPSTREAM}/roken/strlcpy.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/strlcpy.c
-
-strnlen.o: ${UPSTREAM}/roken/strnlen.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/strnlen.c
-
-verr.o: ${UPSTREAM}/roken/verr.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/verr.c
-
-verrx.o: ${UPSTREAM}/roken/verrx.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/verrx.c
-
-vsyslog.o: ${UPSTREAM}/roken/vsyslog.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/vsyslog.c
-
-vwarn.o: ${UPSTREAM}/roken/vwarn.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/vwarn.c
-
-vwarnx.o: ${UPSTREAM}/roken/vwarnx.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/vwarnx.c
-
-warn.o: ${UPSTREAM}/roken/warn.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/warn.c
-
-warnerr.o: ${UPSTREAM}/roken/warnerr.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/warnerr.c
-
-warnx.o: ${UPSTREAM}/roken/warnx.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/warnx.c
-
 # LWP Targets
 
 rand-fortuna_lwp.o: ${UPSTREAM}/hcrypto/rand-fortuna.c