rename des to hcrypto

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@20466 ec53bebd-3082-4978-b11e-865c3cabbd6b

lib/Makefile.am

@@ -15,8 +15,8 @@ if COM_ERR
 dir_com_err = com_err
 endif
 if !HAVE_OPENSSL
-dir_des = des
+dir_hcrypto = hcrypto
 endif
 
-SUBDIRS = roken vers editline $(dir_com_err) sl asn1 $(dir_des) hx509 \
+SUBDIRS = roken vers editline $(dir_com_err) sl asn1 $(dir_hcrypto) hx509 \
 	krb5 ntlm kafs gssapi hdb kadm5 auth $(dir_45) $(dir_otp) $(dir_dce)

lib/auth/afskauthlib/Makefile.am

@@ -32,7 +32,7 @@ L = \
 	$(top_builddir)/lib/krb5/libkrb5.la	\
 	$(top_builddir)/lib/asn1/libasn1.la	\
 	$(LIB_krb4)				\
-	$(LIB_des)				\
+	$(LIB_hcrypto)				\
 	$(top_builddir)/lib/roken/libroken.la	\
 	-lc
 
@@ -41,7 +41,7 @@ else
 L = \
 	$(KAFS)	\
 	$(LIB_krb4)				\
-	$(LIB_des)				\
+	$(LIB_hcrypto)				\
 	$(top_builddir)/lib/roken/libroken.la	\
 	-lc
 endif

lib/auth/pam/Makefile.am

@@ -19,14 +19,14 @@ KAFS_S=$(top_builddir)/lib/kafs/.libs/libkafs.so
 L = \
 	$(KAFS)						\
 	$(top_builddir)/lib/krb/.libs/libkrb.a		\
-	$(LIB_des_a)		\
+	$(LIB_hcrypto_a)		\
 	$(top_builddir)/lib/roken/.libs/libroken.a	\
 	-lc
 
 L_shared = \
 	$(KAFS_S)					\
 	$(top_builddir)/lib/krb/.libs/libkrb.so		\
-	$(LIB_des_so)		\
+	$(LIB_hcrypto_so)		\
 	$(top_builddir)/lib/roken/.libs/libroken.so	\
 	$(LIB_getpwnam_r)				\
 	-lc

lib/auth/sia/Makefile.am

@@ -21,7 +21,7 @@ L = \
 	$(top_builddir)/lib/krb5/.libs/libkrb5.a	\
 	$(top_builddir)/lib/asn1/.libs/libasn1.a	\
 	$(LIB_krb4)					\
-	$(LIB_des_a)					\
+	$(LIB_hcrypto_a)					\
 	$(LIB_com_err_a)				\
 	$(top_builddir)/lib/roken/.libs/libroken.a	\
 	$(LIB_getpwnam_r)				\
@@ -32,7 +32,7 @@ L_shared = \
 	$(top_builddir)/lib/krb5/.libs/libkrb5.so	\
 	$(top_builddir)/lib/asn1/.libs/libasn1.so	\
 	$(LIB_krb4)					\
-	$(LIB_des_so)					\
+	$(LIB_hcrypto_so)					\
 	$(LIB_com_err_so)				\
 	$(top_builddir)/lib/roken/.libs/libroken.so	\
 	$(LIB_getpwnam_r)				\
@@ -46,7 +46,7 @@ L = \
 	$(KAFS)						\
 	$(top_builddir)/lib/kadm/.libs/libkadm.a	\
 	$(top_builddir)/lib/krb/.libs/libkrb.a		\
-	$(LIB_des_a)		\
+	$(LIB_hcrypto_a)		\
 	$(top_builddir)/lib/com_err/.libs/libcom_err.a	\
 	$(top_builddir)/lib/roken/.libs/libroken.a	\
 	$(LIB_getpwnam_r)				\
@@ -56,7 +56,7 @@ L_shared = \
 	$(KAFS_S)					\
 	$(top_builddir)/lib/kadm/.libs/libkadm.so	\
 	$(top_builddir)/lib/krb/.libs/libkrb.so		\
-	$(LIB_des_so)		\
+	$(LIB_hcrypto_so)		\
 	$(top_builddir)/lib/com_err/.libs/libcom_err.so	\
 	$(top_builddir)/lib/roken/.libs/libroken.so	\
 	$(LIB_getpwnam_r)				\

lib/gssapi/Makefile.am

@@ -7,7 +7,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 AM_CPPFLAGS += -I$(srcdir)/../krb5 \
 	-I$(srcdir) \
 	-I$(srcdir)/mech \
-	$(INCLUDE_des) \
+	$(INCLUDE_hcrypto) \
 	$(INCLUDE_krb4)
 
 lib_LTLIBRARIES = libgssapi.la
@@ -201,7 +201,7 @@ libgssapi_la_LIBADD = \
 	$(top_builddir)/lib/krb5/libkrb5.la \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIB_com_err) \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(LIBADD_roken)
 
 man_MANS = gssapi.3 gss_acquire_cred.3

lib/hcrypto/Makefile.am

@@ -130,7 +130,7 @@ imathsource =			\
 $(libhcrypto_la_OBJECTS): hcrypto-link
 
 hcrypto-link:
-	$(LN_S) $(srcdir)/../des hcrypto
+	$(LN_S) $(srcdir)/../hcrypto hcrypto
 	touch hcrypto-link
 
 do_subst = sed -e 's,[@]srcdir[@],$(srcdir),g'

lib/hdb/Makefile.am

@@ -2,7 +2,7 @@
 
 include $(top_srcdir)/Makefile.am.common
 
-AM_CPPFLAGS += -I../asn1 -I$(srcdir)/../asn1 $(INCLUDE_des)
+AM_CPPFLAGS += -I../asn1 -I$(srcdir)/../asn1 $(INCLUDE_hcrypto)
 
 BUILT_SOURCES = \
 	$(gen_files_hdb:.x=.c)	\
@@ -32,7 +32,7 @@ LDADD = libhdb.la \
 	$(LIB_openldap) \
 	../krb5/libkrb5.la \
 	../asn1/libasn1.la \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(LIB_roken) \
 	$(LIB_ldopen)
 

lib/hx509/Makefile.am

@@ -80,12 +80,12 @@ dist_libhx509_la_SOURCES = \
 
 libhx509_la_LIBADD = \
 	$(LIB_com_err) \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIBADD_roken) \
 	$(LIB_dlopen)
 
-libhx509_la_CPPFLAGS = -I$(srcdir)/ref $(INCLUDE_des)
+libhx509_la_CPPFLAGS = -I$(srcdir)/ref $(INCLUDE_hcrypto)
 nodist_libhx509_la_SOURCES = $(BUILT_SOURCES)
 
 $(gen_files_ocsp) ocsp_asn1.h: ocsp_asn1_files
@@ -125,11 +125,11 @@ nodist_hxtool_SOURCES = hxtool-commands.c hxtool-commands.h
 
 $(hxtool_OBJECTS): hxtool-commands.h
 
-hxtool_CPPFLAGS = $(INCLUDE_des)
+hxtool_CPPFLAGS = $(INCLUDE_hcrypto)
 hxtool_LDADD = \
 	libhx509.la \
 	$(top_builddir)/lib/asn1/libasn1.la \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(LIB_roken) \
 	$(top_builddir)/lib/sl/libsl.la
 

lib/kadm5/Makefile.am

@@ -120,7 +120,7 @@ LDADD = \
 	$(LIB_openldap) \
 	$(top_builddir)/lib/krb5/libkrb5.la \
 	$(top_builddir)/lib/asn1/libasn1.la \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(LIB_roken) \
 	$(DBLIB) \
 	$(LIB_dlopen) \
@@ -132,7 +132,7 @@ iprop_log_LDADD = \
 	$(LIB_openldap) \
 	$(top_builddir)/lib/krb5/libkrb5.la \
 	$(top_builddir)/lib/asn1/libasn1.la \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(top_builddir)/lib/sl/libsl.la \
 	$(LIB_readline) \
 	$(LIB_roken) \

lib/kafs/Makefile.am

@@ -5,7 +5,7 @@ include $(top_srcdir)/Makefile.am.common
 AM_CPPFLAGS += $(AFS_EXTRA_DEFS) $(ROKEN_RENAME)
 
 if KRB4
-DEPLIB_krb4 = $(LIB_krb4) $(LIB_des)
+DEPLIB_krb4 = $(LIB_krb4) $(LIB_hcrypto)
 krb4_am_workaround = $(INCLUDE_krb4)
 else
 DEPLIB_krb4  =
@@ -15,7 +15,7 @@ AM_CPPFLAGS += $(krb4_am_workaround)
 
 if KRB5
 DEPLIB_krb5 = ../krb5/libkrb5.la 
-krb5_am_workaround = $(INCLUDE_des) -I$(top_srcdir)/lib/krb5
+krb5_am_workaround = $(INCLUDE_hcrypto) -I$(top_srcdir)/lib/krb5
 else
 DEPLIB_krb5  =
 krb5_am_workaround = 

lib/krb5/Makefile.am

@@ -2,7 +2,7 @@
 
 include $(top_srcdir)/Makefile.am.common
 
-AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_des) -I../com_err -I$(srcdir)/../com_err
+AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_hcrypto) -I../com_err -I$(srcdir)/../com_err
 
 bin_PROGRAMS = verify_krb5_conf
 
@@ -39,7 +39,7 @@ TESTS =						\
 check_PROGRAMS = $(TESTS) test_hostname
 
 LDADD = libkrb5.la \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIB_roken)
 
@@ -50,7 +50,7 @@ endif
 libkrb5_la_LIBADD = \
 	$(LIB_pkinit) \
 	$(LIB_com_err) \
-	$(LIB_des) \
+	$(LIB_hcrypto) \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIBADD_roken) \
 	$(LIB_door_create) \

lib/otp/Makefile.am

@@ -2,7 +2,7 @@
 
 include $(top_srcdir)/Makefile.am.common
 
-AM_CPPFLAGS += $(INCLUDE_des) $(ROKEN_RENAME)
+AM_CPPFLAGS += $(INCLUDE_hcrypto) $(ROKEN_RENAME)
 
 noinst_PROGRAMS = otptest
 
@@ -14,7 +14,7 @@ include_HEADERS = otp.h
 
 lib_LTLIBRARIES = libotp.la
 libotp_la_LDFLAGS = -version-info 1:4:1
-libotp_la_LIBADD  = $(LIB_des) $(LIB_roken) $(LIB_NDBM)
+libotp_la_LIBADD  = $(LIB_hcrypto) $(LIB_roken) $(LIB_NDBM)
 
 if HAVE_DB3
 ndbm_wrap = ndbm_wrap.c ndbm_wrap.h

lib/vers/Makefile.am

@@ -14,7 +14,7 @@ if KRB4
 if KRB5
 ## need to link with des here; otherwise, if krb4 is shared the link
 ## will fail with unresolved references
-make_print_version_LDADD = $(LIB_krb4) $(LIB_des)
+make_print_version_LDADD = $(LIB_krb4) $(LIB_hcrypto)
 endif
 endif