crypto: Fixes for recent Heimdal changes

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

diff --git a/src/crypto/hcrypto/Makefile.in b/src/crypto/hcrypto/Makefile.in
index c2c5773..b480b0f 100644 (file)
--- a/src/crypto/hcrypto/Makefile.in
+++ b/src/crypto/hcrypto/Makefile.in
@@ -53,7 +53,7 @@ dest: libafshcrypto.a ${SHLIBOBJ}
 
 clean:
        $(RM) -f ${OBJECTS} ${SHLIBOBJ} rand-fortuna_lwp.o \
-               libafshcrypto.a libafshcrypto.exp \
+               libafshcrypto.a libafshcrypto_lwp.a libafshcrypto.exp \
                test_cipher test_cipher.o
 
 COMMON_OBJS= aes.o camellia.o camellia-ntt.o des.o engine.o evp.o \
@@ -66,9 +66,6 @@ OBJECTS = $(COMMON_OBJS) rand-fortuna.o
 
 LWP_OBJS = $(COMMON_OBJS) rand-fortuna_lwp.o
 
-LWPRULE=$(CC) $(AFS_CPPFLAGS) $(COMMON_CFLAGS) $(XCFLAGS) $(ARCHFLAGS) \
-       -I$(TOP_INCDIR)/hcrypto -I$(UPSTREAM)/hcrypto -c $?
-
 ${TOP_LIBDIR}/${SHLIBOBJ}: ${SHLIBOBJ}
        ${TOP_OBJDIR}/src/config/shlib-install -d ${TOP_LIBDIR} \
                -l libafshcrypto -M ${LIBMAJOR} -m ${LIBMINOR}
@@ -76,7 +73,7 @@ ${TOP_LIBDIR}/${SHLIBOBJ}: ${SHLIBOBJ}
 ${SHLIBOBJ}: ${OBJECTS} libafshcrypto.map
        ${TOP_OBJDIR}/src/config/shlib-build -d $(srcdir) -l libafshcrypto \
                -M ${LIBMAJOR} -m ${LIBMINOR} -- \
-               ${OBJECTS} -L$(TOP_LIBDIR) -lrokenafs ${MT_LIBS}
+               ${OBJECTS} $(LDFLAGS_roken) $(LIB_roken) ${MT_LIBS}
 
 libafshcrypto.a: ${OBJECTS}
        $(RM) -f $@
@@ -250,5 +247,5 @@ test_cipher.o: ${UPSTREAM}/hcrypto/test_cipher.c
 # LWP Targets
 
 rand-fortuna_lwp.o: ${UPSTREAM}/hcrypto/rand-fortuna.c
-       ${LWPRULE} -o rand-fortuna_lwp.o
+       $(LWP_CCRULE) $(UPSTREAM)/hcrypto/rand-fortuna.c