Create crypto, des425 Makefiles from top level

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18042 dc483132-0cff-0310-8789-dd5450dbe970

19 files changed, 34 insertions, 54 deletions

diff --git a/src/configure.in b/src/configure.in
index 11ecd5f1f..e8c60520a 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -631,7 +631,7 @@ fi
 if test "$SS_VERSION" = k5 ; then
   AC_CONFIG_SUBDIRS(util/ss)
 fi
-AC_CONFIG_SUBDIRS(lib/crypto lib/krb5 lib/des425 lib/apputils)
+AC_CONFIG_SUBDIRS(lib/krb5 lib/apputils)
 if test -n "$KRB4_LIB"; then
   AC_CONFIG_SUBDIRS(lib/krb4)
 fi
@@ -643,4 +643,4 @@ if true; then
   AC_CONFIG_SUBDIRS(plugins/locate/python)
 fi
 AC_CONFIG_FILES(krb5-config, [chmod +x krb5-config])
-V5_AC_OUTPUT_MAKEFILE(. util util/support util/profile util/send-pr lib lib/kdb kdc slave krb524 config-files gen-manpages include include/kerberosIV clients clients/klist clients/kinit clients/kvno clients/kdestroy clients/kpasswd clients/ksu)
+V5_AC_OUTPUT_MAKEFILE(. util util/support util/profile util/send-pr lib lib/crypto lib/crypto/crc32 lib/crypto/des lib/crypto/dk lib/crypto/enc_provider lib/crypto/hash_provider lib/crypto/keyhash_provider lib/crypto/md4 lib/crypto/md5 lib/crypto/old lib/crypto/raw lib/crypto/sha1 lib/crypto/arcfour lib/crypto/yarrow lib/crypto/aes lib/des425 lib/kdb kdc slave krb524 config-files gen-manpages include include/kerberosIV clients clients/klist clients/kinit clients/kvno clients/kdestroy clients/kpasswd clients/ksu)
diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index f699e116a..55a795090 100644
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=.
+thisconfigdir=../..
 myfulldir=lib/crypto
-mydir=.
+mydir=lib/crypto
 BUILDTOP=$(REL)..$(S)..
 LOCAL_SUBDIRS=crc32 des dk enc_provider hash_provider keyhash_provider \
 	md4 md5 old raw sha1 arcfour yarrow aes
diff --git a/src/lib/crypto/aes/Makefile.in b/src/lib/crypto/aes/Makefile.in
index d3befe145..417a2b624 100644
--- a/src/lib/crypto/aes/Makefile.in
+++ b/src/lib/crypto/aes/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../..
 myfulldir=lib/crypto/aes
-mydir=aes
+mydir=lib/crypto/aes
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../dk
 DEFS=
diff --git a/src/lib/crypto/arcfour/Makefile.in b/src/lib/crypto/arcfour/Makefile.in
index cc6f07d44..0311d1a2d 100644
--- a/src/lib/crypto/arcfour/Makefile.in
+++ b/src/lib/crypto/arcfour/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../..
 myfulldir=lib/crypto/arcfour
-mydir=arcfour
+mydir=lib/crypto/arcfour
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../md4
 DEFS=
diff --git a/src/lib/crypto/configure.in b/src/lib/crypto/configure.in
deleted file mode 100644
index d663bf73b..000000000
--- a/src/lib/crypto/configure.in
+++ /dev/null
@@ -1,11 +0,0 @@
-K5_AC_INIT(configure.in)
-CONFIG_RULES
-
-AC_CHECK_HEADERS(memory.h unistd.h endian.h machine/endian.h)
-
-KRB5_RUN_FLAGS
-KRB5_BUILD_PROGRAM
-KRB5_BUILD_LIBOBJS
-KRB5_BUILD_LIBRARY_WITH_DEPS
-
-V5_AC_OUTPUT_MAKEFILE(. crc32 des dk enc_provider hash_provider keyhash_provider md4 md5 old raw sha1 arcfour yarrow aes)
diff --git a/src/lib/crypto/crc32/Makefile.in b/src/lib/crypto/crc32/Makefile.in
index ffc8cb248..e16171bdd 100644
--- a/src/lib/crypto/crc32/Makefile.in
+++ b/src/lib/crypto/crc32/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../..
 myfulldir=lib/crypto/crc32
-mydir=crc32
+mydir=lib/crypto/crc32
 BUILDTOP=$(REL)..$(S)..$(S)..
 DEFS=
 
diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in
index d719a815a..d24997625 100644
--- a/src/lib/crypto/des/Makefile.in
+++ b/src/lib/crypto/des/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../..
 myfulldir=lib/crypto/des
-mydir=des
+mydir=lib/crypto/des
 BUILDTOP=$(REL)..$(S)..$(S)..
 DEFS=
 
diff --git a/src/lib/crypto/dk/Makefile.in b/src/lib/crypto/dk/Makefile.in
index 03f44ec19..baa93563f 100644
--- a/src/lib/crypto/dk/Makefile.in
+++ b/src/lib/crypto/dk/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../..
 myfulldir=lib/crypto/dk
-mydir=dk
+mydir=lib/crypto/dk
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/..
 DEFS=
diff --git a/src/lib/crypto/enc_provider/Makefile.in b/src/lib/crypto/enc_provider/Makefile.in
index e665aa29f..8ac9da718 100644
--- a/src/lib/crypto/enc_provider/Makefile.in
+++ b/src/lib/crypto/enc_provider/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../..
 myfulldir=lib/crypto/enc_provider
-mydir=enc_provider
+mydir=lib/crypto/enc_provider
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/../des -I$(srcdir)/../arcfour -I$(srcdir)/../aes
 DEFS=
diff --git a/src/lib/crypto/hash_provider/Makefile.in b/src/lib/crypto/hash_provider/Makefile.in
index 42bc32a7e..7878c9788 100644
--- a/src/lib/crypto/hash_provider/Makefile.in
+++ b/src/lib/crypto/hash_provider/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../..
 myfulldir=lib/crypto/hash_provider
-mydir=hash_provider
+mydir=lib/crypto/hash_provider
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/../crc32 -I$(srcdir)/../md4 \
 	-I$(srcdir)/../md5 -I$(srcdir)/../sha1
diff --git a/src/lib/crypto/keyhash_provider/Makefile.in b/src/lib/crypto/keyhash_provider/Makefile.in
index 7c44c1d57..a3c5017cc 100644
--- a/src/lib/crypto/keyhash_provider/Makefile.in
+++ b/src/lib/crypto/keyhash_provider/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../..
 myfulldir=lib/crypto/keyhash_provider
-mydir=keyhash_provider
+mydir=lib/crypto/keyhash_provider
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/../des -I$(srcdir)/../md4 \
 	-I$(srcdir)/../md5 -I$(srcdir)/../arcfour \
diff --git a/src/lib/crypto/md4/Makefile.in b/src/lib/crypto/md4/Makefile.in
index 84dc0e4a4..7bb87dce7 100644
--- a/src/lib/crypto/md4/Makefile.in
+++ b/src/lib/crypto/md4/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../..
 myfulldir=lib/crypto/md4
-mydir=md4
+mydir=lib/crypto/md4
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)
 DEFS=
diff --git a/src/lib/crypto/md5/Makefile.in b/src/lib/crypto/md5/Makefile.in
index 9dcacb794..e915e9e8a 100644
--- a/src/lib/crypto/md5/Makefile.in
+++ b/src/lib/crypto/md5/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../..
 myfulldir=lib/crypto/md5
-mydir=md5
+mydir=lib/crypto/md5
 BUILDTOP=$(REL)..$(S)..$(S)..
 DEFS=
 
diff --git a/src/lib/crypto/old/Makefile.in b/src/lib/crypto/old/Makefile.in
index f9c003e3d..006183db6 100644
--- a/src/lib/crypto/old/Makefile.in
+++ b/src/lib/crypto/old/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../..
 myfulldir=lib/crypto/old
-mydir=old
+mydir=lib/crypto/old
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/../des
 DEFS=
diff --git a/src/lib/crypto/raw/Makefile.in b/src/lib/crypto/raw/Makefile.in
index 8379a57e2..c2389e1be 100644
--- a/src/lib/crypto/raw/Makefile.in
+++ b/src/lib/crypto/raw/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../..
 myfulldir=lib/crypto/raw
-mydir=raw
+mydir=lib/crypto/raw
 BUILDTOP=$(REL)..$(S)..$(S)..
 DEFS=
 
diff --git a/src/lib/crypto/sha1/Makefile.in b/src/lib/crypto/sha1/Makefile.in
index 7c6536b83..49ec4437f 100644
--- a/src/lib/crypto/sha1/Makefile.in
+++ b/src/lib/crypto/sha1/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../..
 myfulldir=lib/crypto/sha1
-mydir=sha1
+mydir=lib/crypto/sha1
 BUILDTOP=$(REL)..$(S)..$(S)..
 DEFS=
 
diff --git a/src/lib/crypto/yarrow/Makefile.in b/src/lib/crypto/yarrow/Makefile.in
index 99b46b819..9610636e0 100644
--- a/src/lib/crypto/yarrow/Makefile.in
+++ b/src/lib/crypto/yarrow/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../../..
 myfulldir=lib/crypto/yarrow
-mydir=yarrow
+mydir=lib/crypto/yarrow
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../sha1 -I$(srcdir)/../enc_provider
 DEFS=
diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in
index 3d71fbfc6..61489fff6 100644
--- a/src/lib/des425/Makefile.in
+++ b/src/lib/des425/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=.
+thisconfigdir=../..
 myfulldir=lib/des425
-mydir=.
+mydir=lib/des425
 BUILDTOP=$(REL)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/../crypto/des -I$(srcdir)/../../include/kerberosIV
 DEFS=
diff --git a/src/lib/des425/configure.in b/src/lib/des425/configure.in
deleted file mode 100644
index 4739c3a5d..000000000
--- a/src/lib/des425/configure.in
+++ /dev/null
@@ -1,9 +0,0 @@
-K5_AC_INIT(configure.in)
-CONFIG_RULES
-dnl
-KRB5_RUN_FLAGS
-KRB5_BUILD_LIBOBJS
-KRB5_BUILD_LIBRARY_WITH_DEPS
-KRB5_BUILD_PROGRAM
-dnl
-V5_AC_OUTPUT_MAKEFILE