Clean up our cleaning
[openafs.git] / src / crypto / hcrypto / Makefile.in
index fdf68fd..16abc10 100644 (file)
@@ -4,16 +4,23 @@
 # This software has been released under the terms of the BSD License
 # For details, see the LICENSE file in the top level source directory
 
-# API version. Must be incremented whenever something changes.
-LIBMAJOR=1
-LIBMINOR=1
-
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
-include @TOP_OBJDIR@/src/config/Makefile.shared
+include @TOP_OBJDIR@/src/config/Makefile.lwp
+include @TOP_OBJDIR@/src/config/Makefile.lwptool
+top_builddir=@top_builddir@
+
+LT_current = 2
+LT_revision = 0
+LT_age = 0
+
+LT_objs = aes.lo camellia.lo camellia-ntt.lo des.lo engine.lo evp.lo \
+         evp-hcrypto.lo evp-cc.lo hmac.lo md2.lo md4.lo md5.lo pkcs5.lo \
+         rand-egd.lo rand-timer.lo rand-unix.lo rand.lo rc2.lo rc4.lo \
+         rijndael-alg-fst.lo rnd_keys.lo sha.lo sha256.lo sha512.lo ui.lo \
+         validate.lo rand-fortuna.lo
 
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
+LT_libs = $(LDFLAGS_roken) $(LIB_roken)
 
 HEADERS= ${TOP_INCDIR}/hcrypto/aes.h \
         ${TOP_INCDIR}/hcrypto/des.h \
@@ -33,63 +40,48 @@ HEADERS= ${TOP_INCDIR}/hcrypto/aes.h \
 
 UPSTREAM= ${TOP_SRCDIR}/external/heimdal
 
-MODULE_INCLUDE=-I${srcdir} -I${TOP_INCDIR}/hcrypto -I$(UPSTREAM)/hcrypto 
+MODULE_INCLUDE=-I${srcdir} -I${TOP_INCDIR}/hcrypto -I$(UPSTREAM)/hcrypto
 
-SHLIBOBJ= libafshcrypto.${SHLIB_SUFFIX}.${LIBMAJOR}.${LIBMINOR}
+all: @hcrypto_all_target@
 
-all: $(ROKEN_HEADERS) ${HEADERS} ${TOP_LIBDIR}/${SHLIBOBJ} \
+all-internal: ${HEADERS} ${TOP_LIBDIR}/libafshcrypto.$(SHLIB_SUFFIX) \
        ${TOP_LIBDIR}/libafshcrypto.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a
 
-install: libafshcrypto.a ${SHLIBOBJ}
-       ${TOP_OBJDIR}/src/config/shlib-install -d ${DESTDIR}${libdir} \
-               -l libafshcrypto -M ${LIBMAJOR} -m ${LIBMINOR}
-       ${INSTALL_DATA} libafshcrypto.a ${DESTDIR}${libdir}/libafshcrypto.a
+all-lwp: ${HEADERS} ${TOP_LIBDIR}/libafshcrypto_lwp.a
 
-dest: libafshcrypto.a ${SHLIBOBJ}
-       ${TOP_OBJDIR}/src/config/shlib-install -d ${DEST}/lib \
-               -l libafshcrypto -M ${LIBMAJOR} -m ${LIBMINOR}
-       ${INSTALL_DATA} libafshcrypto.a ${DEST}/lib/libafshcrypto.a
+buildtools: ${HEADERS} ${TOP_LIBDIR}/libafshcrypto.a
 
-clean:
-       $(RM) -f ${OBJECTS} ${SHLIBOBJ} libafshcrypto.a libafshcrypto.exp \
-                test_cipher test_cipher.o hex.o
+install: @hcrypto_install_target@
 
-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 warnerr.o
-
-OBJECTS = $(COMMON_OBJS) rand-fortuna.o $(ROKEN_LIBOBJS)
+install-internal: libafshcrypto.la libafshcrypto.a
+       ${LT_INSTALL_DATA} libafshcrypto.la ${DESTDIR}${libdir}/libafshcrypto.la
+       ${RM} ${DESTDIR}${libdir}/libafshcrypto.la
+       ${INSTALL_DATA} libafshcrypto.a ${DESTDIR}${libdir}/libafshcrypto.a
 
-LWP_OBJS = $(COMMON_OBJS) rand-fortuna_lwp.o $(ROKEN_LIBOBJS)
+dest: libafshcrypto.la libafshcrypto.a
+       ${LT_INSTALL_DATA} libafshcrypto.la ${DEST}/lib/libafshcrypto.la
+       ${RM} ${DEST}/lib/libafshcrypto.la
+       ${INSTALL_DATA} libafshcrypto.a ${DEST}/lib/libafshcrypto.a
 
-LWPRULE=$(CC) $(AFS_CPPFLAGS) $(COMMON_CFLAGS) $(XCFLAGS) $(ARCHFLAGS) \
-       -I$(TOP_INCDIR)/hcrypto -I$(UPSTREAM)/hcrypto -c $?
+clean:
+       $(LT_CLEAN)
+       $(RM) -f *.o libafshcrypto.a libafshcrypto_lwp.a libafshcrypto.exp \
+               test_cipher
 
-${TOP_LIBDIR}/${SHLIBOBJ}: ${SHLIBOBJ}
-       ${TOP_OBJDIR}/src/config/shlib-install -d ${TOP_LIBDIR} \
-               -l libafshcrypto -M ${LIBMAJOR} -m ${LIBMINOR}
+$(LT_objs): $(HEADERS)
 
-${SHLIBOBJ}: ${OBJECTS} libafshcrypto.map
-       ${TOP_OBJDIR}/src/config/shlib-build -d $(srcdir) -l libafshcrypto \
-               -M ${LIBMAJOR} -m ${LIBMINOR} -- \
-               ${OBJECTS} ${MT_LIBS}
+libafshcrypto.la: libafshcrypto.la.sym $(LT_objs)
+       $(LT_LDLIB_shlib) $(LT_objs) $(LT_libs)
 
-libafshcrypto.a: ${OBJECTS}
-       $(RM) -f $@
-       $(AR) crv $@ ${OBJECTS}
-       $(RANLIB) $@
+libafshcrypto.a: $(LT_objs)
+       $(LT_LDLIB_static) $(LT_objs)
 
-libafshcrypto_lwp.a: $(LWP_OBJS)
-       $(RM) -f $@
-       $(AR) crv $@ $(LWP_OBJS)
-       $(RANLIB) $@
+libafshcrypto_lwp.a: $(LT_objs)
+       $(LT_LDLIB_lwp) $(LT_objs)
 
-test_cipher: test_cipher.o hex.o libafshcrypto.a
-       $(AFS_LDRULE) test_cipher.o hex.o libafshcrypto.a
+test_cipher: test_cipher.lo libafshcrypto.la
+       $(LT_LDRULE_static) test_cipher.lo libafshcrypto.la
 
 ${TOP_INCDIR}/hcrypto/aes.h: ${UPSTREAM}/hcrypto/aes.h
        ${INSTALL_DATA} $? $@
@@ -151,6 +143,11 @@ ${TOP_INCDIR}/hcrypto/sha.h: ${UPSTREAM}/hcrypto/sha.h
 ${TOP_INCDIR}/hcrypto/ui.h: ${UPSTREAM}/hcrypto/ui.h
        ${INSTALL_DATA} $? $@
 
+${TOP_LIBDIR}/libafshcrypto.$(SHLIB_SUFFIX): libafshcrypto.la
+       $(LT_INSTALL_DATA) libafshcrypto.la $(TOP_LIBDIR)/libafshcrypto.la
+       # libtool gets confused if we leave these around
+       $(RM) $(TOP_LIBDIR)/libafshcrypto.la
+
 ${TOP_LIBDIR}/libafshcrypto.a: libafshcrypto.a
        ${INSTALL_DATA} $? $@
 
@@ -159,185 +156,94 @@ ${TOP_LIBDIR}/libafshcrypto_lwp.a: libafshcrypto_lwp.a
 
 # Pthread Targets
 
-CFLAGS_test_cipher.o= -I${UPSTREAM}/roken/
-CFLAGS_rand-unix.o=@CFLAGS_NOERROR@
-CFLAGS_evp.o=-DHAVE_CONFIG_H
-
-aes.o: ${UPSTREAM}/hcrypto/aes.c
-       $(AFS_CCRULE) $(UPSTREAM)/hcrypto/aes.c
-
-bn.o: ${UPSTREAM}/hcrypto/bn.c
-       $(AFS_CCRULE) $(UPSTREAM)/hcrypto/bn.c
-
-camellia.o: ${UPSTREAM}/hcrypto/camellia.c
-       $(AFS_CCRULE) $(UPSTREAM)/hcrypto/camellia.c
-
-camellia-ntt.o: ${UPSTREAM}/hcrypto/camellia-ntt.c
-       $(AFS_CCRULE) $(UPSTREAM)/hcrypto/camellia-ntt.c
-
-des.o: ${UPSTREAM}/hcrypto/des.c
-       $(AFS_CCRULE) $(UPSTREAM)/hcrypto/des.c
-       
-evp.o: ${UPSTREAM}/hcrypto/evp.c
-       $(AFS_CCRULE) $(UPSTREAM)/hcrypto/evp.c
-       
-evp-hcrypto.o: ${UPSTREAM}/hcrypto/evp-hcrypto.c
-       $(AFS_CCRULE) $(UPSTREAM)/hcrypto/evp-hcrypto.c
-       
-evp-cc.o: ${UPSTREAM}/hcrypto/evp-cc.c
-       $(AFS_CCRULE) $(UPSTREAM)/hcrypto/evp-cc.c
-
-hmac.o: ${UPSTREAM}/hcrypto/hmac.c
-       $(AFS_CCRULE) $(UPSTREAM)/hcrypto/hmac.c
-
-md2.o: ${UPSTREAM}/hcrypto/md2.c
-       $(AFS_CCRULE) $(UPSTREAM)/hcrypto/md2.c
-
-md4.o: ${UPSTREAM}/hcrypto/md4.c
-       $(AFS_CCRULE) $(UPSTREAM)/hcrypto/md4.c
-
-md5.o: ${UPSTREAM}/hcrypto/md5.c
-       $(AFS_CCRULE) $(UPSTREAM)/hcrypto/md5.c
-
-pkcs5.o: ${UPSTREAM}/hcrypto/pkcs5.c
-       $(AFS_CCRULE) $(UPSTREAM)/hcrypto/pkcs5.c
-
-rand-egd.o: ${UPSTREAM}/hcrypto/rand-egd.c
-       $(AFS_CCRULE) $(UPSTREAM)/hcrypto/rand-egd.c
-
-rand-fortuna.o: ${UPSTREAM}/hcrypto/rand-fortuna.c
-       $(AFS_CCRULE) $(UPSTREAM)/hcrypto/rand-fortuna.c
-
-rand-timer.o: ${UPSTREAM}/hcrypto/rand-timer.c
-       $(AFS_CCRULE) $(UPSTREAM)/hcrypto/rand-timer.c
-
-rand-unix.o: ${UPSTREAM}/hcrypto/rand-unix.c
-       $(AFS_CCRULE) $(UPSTREAM)/hcrypto/rand-unix.c
-
-rand.o: ${UPSTREAM}/hcrypto/rand.c
-       $(AFS_CCRULE) $(UPSTREAM)/hcrypto/rand.c
-
-rc2.o: ${UPSTREAM}/hcrypto/rc2.c
-       $(AFS_CCRULE) $(UPSTREAM)/hcrypto/rc2.c
-
-rc4.o: ${UPSTREAM}/hcrypto/rc4.c
-       $(AFS_CCRULE) $(UPSTREAM)/hcrypto/rc4.c
-
-rijndael-alg-fst.o: ${UPSTREAM}/hcrypto/rijndael-alg-fst.c
-       $(AFS_CCRULE) $(UPSTREAM)/hcrypto/rijndael-alg-fst.c
-
-rnd_keys.o: ${UPSTREAM}/hcrypto/rnd_keys.c
-       $(AFS_CCRULE) $(UPSTREAM)/hcrypto/rnd_keys.c
-
-sha.o: ${UPSTREAM}/hcrypto/sha.c
-       $(AFS_CCRULE) $(UPSTREAM)/hcrypto/sha.c
-
-sha256.o: ${UPSTREAM}/hcrypto/sha256.c
-       $(AFS_CCRULE) $(UPSTREAM)/hcrypto/sha256.c
-
-sha512.o: ${UPSTREAM}/hcrypto/sha512.c
-       ${AFS_CCRULE} $(UPSTREAM)/hcrypto/sha512.c
-
-ui.o: ${UPSTREAM}/hcrypto/ui.c
-       $(AFS_CCRULE) $(UPSTREAM)/hcrypto/ui.c
-
-validate.o: ${UPSTREAM}/hcrypto/validate.c
-       ${AFS_CCRULE} ${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
+CFLAGS_test_cipher.lo= -I${UPSTREAM}/roken/
+CFLAGS_rand-unix.lo=@CFLAGS_NOERROR@
+CFLAGS_validate.lo=@CFLAGS_NOERROR@
+CFLAGS_evp.lo=-DHAVE_CONFIG_H
 
-net_read.o: ${UPSTREAM}/roken/net_read.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/net_read.c
+# Here we have explicit rules for all the libtool objects we might need to
+# build.  The implicit rules don't work since the sources are in a different
+# castle.
+aes.lo: ${UPSTREAM}/hcrypto/aes.c ${HEADERS}
+       $(LTLWP_CCRULE) $(UPSTREAM)/hcrypto/aes.c
 
-net_write.o: ${UPSTREAM}/roken/net_write.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/net_write.c
+bn.lo: ${UPSTREAM}/hcrypto/bn.c ${HEADERS}
+       $(LTLWP_CCRULE) $(UPSTREAM)/hcrypto/bn.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.
+camellia.lo: ${UPSTREAM}/hcrypto/camellia.c ${HEADERS}
+       $(LTLWP_CCRULE) $(UPSTREAM)/hcrypto/camellia.c
 
+camellia-ntt.lo: ${UPSTREAM}/hcrypto/camellia-ntt.c ${HEADERS}
+       $(LTLWP_CCRULE) $(UPSTREAM)/hcrypto/camellia-ntt.c
 
-daemon.o: ${UPSTREAM}/roken/daemon.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/daemon.c
+des.lo: ${UPSTREAM}/hcrypto/des.c ${HEADERS}
+       $(LTLWP_CCRULE) $(UPSTREAM)/hcrypto/des.c
 
-ecalloc.o: ${UPSTREAM}/roken/ecalloc.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/ecalloc.c
+evp.lo: ${UPSTREAM}/hcrypto/evp.c ${HEADERS}
+       $(LTLWP_CCRULE) $(UPSTREAM)/hcrypto/evp.c
 
-emalloc.o: ${UPSTREAM}/roken/emalloc.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/emalloc.c
+evp-hcrypto.lo: ${UPSTREAM}/hcrypto/evp-hcrypto.c ${HEADERS}
+       $(LTLWP_CCRULE) $(UPSTREAM)/hcrypto/evp-hcrypto.c
 
-erealloc.o: ${UPSTREAM}/roken/erealloc.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/erealloc.c
+evp-cc.lo: ${UPSTREAM}/hcrypto/evp-cc.c ${HEADERS}
+       $(LTLWP_CCRULE) $(UPSTREAM)/hcrypto/evp-cc.c
 
-err.h: ${UPSTREAM}/roken/err.hin
-       cp $? $@
+hmac.lo: ${UPSTREAM}/hcrypto/hmac.c ${HEADERS}
+       $(LTLWP_CCRULE) $(UPSTREAM)/hcrypto/hmac.c
 
-err.o: ${UPSTREAM}/roken/err.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/err.c
+md2.lo: ${UPSTREAM}/hcrypto/md2.c ${HEADERS}
+       $(LTLWP_CCRULE) $(UPSTREAM)/hcrypto/md2.c
 
-errx.o: ${UPSTREAM}/roken/errx.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/errx.c
+md4.lo: ${UPSTREAM}/hcrypto/md4.c ${HEADERS}
+       $(LTLWP_CCRULE) $(UPSTREAM)/hcrypto/md4.c
 
-getopt.o: ${UPSTREAM}/roken/getopt.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/getopt.c
+md5.lo: ${UPSTREAM}/hcrypto/md5.c ${HEADERS}
+       $(LTLWP_CCRULE) $(UPSTREAM)/hcrypto/md5.c
 
-getprogname.o: ${UPSTREAM}/roken/getprogname.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/getprogname.c
+pkcs5.lo: ${UPSTREAM}/hcrypto/pkcs5.c ${HEADERS}
+       $(LTLWP_CCRULE) $(UPSTREAM)/hcrypto/pkcs5.c
 
-socket.o: ${UPSTREAM}/roken/socket.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/socket.c
+rand-egd.lo: ${UPSTREAM}/hcrypto/rand-egd.c ${HEADERS}
+       $(LTLWP_CCRULE) $(UPSTREAM)/hcrypto/rand-egd.c
 
-strlcat.o: ${UPSTREAM}/roken/strlcat.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/strlcat.c
+rand-fortuna.lo: ${UPSTREAM}/hcrypto/rand-fortuna.c ${HEADERS}
+       $(LTLWP_CCRULE) $(UPSTREAM)/hcrypto/rand-fortuna.c
 
-strlcpy.o: ${UPSTREAM}/roken/strlcpy.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/strlcpy.c
+rand-timer.lo: ${UPSTREAM}/hcrypto/rand-timer.c ${HEADERS}
+       $(LTLWP_CCRULE) $(UPSTREAM)/hcrypto/rand-timer.c
 
-strnlen.o: ${UPSTREAM}/roken/strnlen.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/strnlen.c
+rand-unix.lo: ${UPSTREAM}/hcrypto/rand-unix.c ${HEADERS}
+       $(LTLWP_CCRULE) $(UPSTREAM)/hcrypto/rand-unix.c
 
-verr.o: ${UPSTREAM}/roken/verr.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/verr.c
+rand.lo: ${UPSTREAM}/hcrypto/rand.c ${HEADERS}
+       $(LTLWP_CCRULE) $(UPSTREAM)/hcrypto/rand.c
 
-verrx.o: ${UPSTREAM}/roken/verrx.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/verrx.c
+rc2.lo: ${UPSTREAM}/hcrypto/rc2.c ${HEADERS}
+       $(LTLWP_CCRULE) $(UPSTREAM)/hcrypto/rc2.c
 
-vsyslog.o: ${UPSTREAM}/roken/vsyslog.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/vsyslog.c
+rc4.lo: ${UPSTREAM}/hcrypto/rc4.c ${HEADERS}
+       $(LTLWP_CCRULE) $(UPSTREAM)/hcrypto/rc4.c
 
-vwarn.o: ${UPSTREAM}/roken/vwarn.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/vwarn.c
+rijndael-alg-fst.lo: ${UPSTREAM}/hcrypto/rijndael-alg-fst.c ${HEADERS}
+       $(LTLWP_CCRULE) $(UPSTREAM)/hcrypto/rijndael-alg-fst.c
 
-vwarnx.o: ${UPSTREAM}/roken/vwarnx.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/vwarnx.c
+rnd_keys.lo: ${UPSTREAM}/hcrypto/rnd_keys.c ${HEADERS}
+       $(LTLWP_CCRULE) $(UPSTREAM)/hcrypto/rnd_keys.c
 
-warn.o: ${UPSTREAM}/roken/warn.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/warn.c
+sha.lo: ${UPSTREAM}/hcrypto/sha.c ${HEADERS}
+       $(LTLWP_CCRULE) $(UPSTREAM)/hcrypto/sha.c
 
-warnerr.o: ${UPSTREAM}/roken/warnerr.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/warnerr.c
+sha256.lo: ${UPSTREAM}/hcrypto/sha256.c ${HEADERS}
+       $(LTLWP_CCRULE) $(UPSTREAM)/hcrypto/sha256.c
 
-warnx.o: ${UPSTREAM}/roken/warnx.c
-       $(AFS_CCRULE) $(UPSTREAM)/roken/warnx.c
+sha512.lo: ${UPSTREAM}/hcrypto/sha512.c ${HEADERS}
+       ${LTLWP_CCRULE} $(UPSTREAM)/hcrypto/sha512.c
 
-# LWP Targets
+ui.lo: ${UPSTREAM}/hcrypto/ui.c ${HEADERS}
+       $(LTLWP_CCRULE) $(UPSTREAM)/hcrypto/ui.c
 
-rand-fortuna_lwp.o: ${UPSTREAM}/hcrypto/rand-fortuna.c
-       ${LWPRULE} -o rand-fortuna_lwp.o
+validate.lo: ${UPSTREAM}/hcrypto/validate.c ${HEADERS}
+       ${LTLWP_CCRULE} ${UPSTREAM}/hcrypto/validate.c
 
+test_cipher.lo: ${UPSTREAM}/hcrypto/test_cipher.c ${HEADERS}
+       $(LTLWP_CCRULE) $(UPSTREAM)/hcrypto/test_cipher.c