diff options
author | Greg Hudson <ghudson@mit.edu> | 2010-11-28 01:36:42 +0000 |
---|---|---|
committer | Greg Hudson <ghudson@mit.edu> | 2010-11-28 01:36:42 +0000 |
commit | 505ae39e1f5ef32013b0e95ff487de28663680cf (patch) | |
tree | 34c0858af3f8934170366fcbc1f2e6744be37041 /src/lib | |
parent | d5160f60f49585a6208c9107f9a65a7fdc2087ba (diff) | |
download | krb5-505ae39e1f5ef32013b0e95ff487de28663680cf.tar.gz krb5-505ae39e1f5ef32013b0e95ff487de28663680cf.tar.xz krb5-505ae39e1f5ef32013b0e95ff487de28663680cf.zip |
Use for loops for recursion in the Windows build, cutting down on the
verbiage in Makefile.in files. For correctness of output, every
Makefile.in mydir= definition is changed to use $(S) instead of /.
ticket: 6826
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24536 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
69 files changed, 74 insertions, 788 deletions
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 07954f89b9..4256f05867 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -1,5 +1,6 @@ mydir=lib SUBDIRS=crypto krb5 gssapi rpc kdb kadm5 apputils +WINSUBDIRS=crypto krb5 gssapi BUILDTOP=$(REL).. all-unix:: @@ -134,31 +135,5 @@ clean-windows:: ##WIN32##gssapi.lib: $(GLIB) ##WIN32##profile.lib: $(PLIB) -##WIN32##all-windows:: -##WIN32## @echo Making in lib\crypto -##WIN32## cd crypto -##WIN32## $(MAKE) -$(MFLAGS) -##WIN32## @echo Making in lib\krb5 -##WIN32## cd ..\krb5 -##WIN32## $(MAKE) -$(MFLAGS) -##WIN32## @echo Making in lib\gssapi -##WIN32## cd ..\gssapi -##WIN32## $(MAKE) -$(MFLAGS) -##WIN32## @echo Making in lib -##WIN32## cd .. - -##WIN32##all-windows:: lib-windows +##WIN32##all-windows:: all-recurse lib-windows ##WIN32##lib-windows:: krb5.lib gssapi.lib - -##WIN32##clean-windows:: -##WIN32## @echo Making clean in lib\crypto -##WIN32## cd crypto -##WIN32## $(MAKE) -$(MFLAGS) clean -##WIN32## @echo Making clean in lib\krb5 -##WIN32## cd ..\krb5 -##WIN32## $(MAKE) -$(MFLAGS) clean -##WIN32## @echo Making clean in lib\gssapi -##WIN32## cd ..\gssapi -##WIN32## $(MAKE) -$(MFLAGS) clean -##WIN32## @echo Making clean in lib -##WIN32## cd .. diff --git a/src/lib/apputils/Makefile.in b/src/lib/apputils/Makefile.in index 58273248b2..75dd613dc0 100644 --- a/src/lib/apputils/Makefile.in +++ b/src/lib/apputils/Makefile.in @@ -2,7 +2,7 @@ prefix=@prefix@ bindir=@bindir@ datadir=@datadir@ mydatadir=$(datadir)/apputils -mydir=lib/apputils +mydir=lib$(S)apputils BUILDTOP=$(REL)..$(S).. RELDIR=../lib/apputils SED = sed diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in index 12098d60ca..464db261b0 100644 --- a/src/lib/crypto/Makefile.in +++ b/src/lib/crypto/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/crypto +mydir=lib$(S)crypto BUILDTOP=$(REL)..$(S).. SUBDIRS= krb $(CRYPTO_IMPL) crypto_tests @@ -74,30 +74,6 @@ libcrypto.lib: clean-unix:: clean-liblinks clean-libs clean-libobjs -all-windows:: - cd krb - @echo Making in crypto\krb - $(MAKE) -$(MFLAGS) - cd ..\$(CRYPTO_IMPL) - @echo Making in crypto\$(CRYPTO_IMPL) - $(MAKE) -$(MFLAGS) - cd ..\crypto_tests - @echo Making in crypto\crypto_tests - $(MAKE) -$(MFLAGS) - cd .. - -clean-windows:: - cd krb - @echo Making in clean crypto\krb - $(MAKE) -$(MFLAGS) clean - cd ..\$(CRYPTO_IMPL) - @echo Making clean in crypto\$(CRYPTO_IMPL) - $(MAKE) -$(MFLAGS) clean - cd ..\crypto_tests - @echo Making clean in crypto\crypto_tests - $(MAKE) -$(MFLAGS) clean - cd .. - @lib_frag@ @libobj_frag@ diff --git a/src/lib/crypto/builtin/Makefile.in b/src/lib/crypto/builtin/Makefile.in index 603c57cd07..66e16ce69e 100644 --- a/src/lib/crypto/builtin/Makefile.in +++ b/src/lib/crypto/builtin/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/crypto/builtin +mydir=lib$(S)crypto$(S)builtin BUILDTOP=$(REL)..$(S)..$(S).. SUBDIRS=camellia des aes md4 md5 sha1 sha2 enc_provider hash_provider LOCALINCLUDES = -I$(srcdir)/../krb \ @@ -72,103 +72,6 @@ t_cf2$(EXEEXT): t_cf2.$(OBJEXT) $(SUPPORT_DEPLIB) clean:: $(RM) t_cf2 t_cf2.o t_cf2.output - - - -all-windows:: - cd des - @echo Making in crypto\builtin\des - $(MAKE) -$(MFLAGS) - cd ..\md4 - @echo Making in crypto\builtin\md4 - $(MAKE) -$(MFLAGS) - cd ..\md5 - @echo Making in crypto\builtin\md5 - $(MAKE) -$(MFLAGS) - cd ..\sha1 - @echo Making in crypto\builtin\sha1 - $(MAKE) -$(MFLAGS) - cd ..\sha2 - @echo Making in crypto\builtin\sha2 - $(MAKE) -$(MFLAGS) - cd ..\hash_provider - @echo Making in crypto\builtin\hash_provider - $(MAKE) -$(MFLAGS) - cd ..\enc_provider - @echo Making in crypto\builtin\enc_provider - $(MAKE) -$(MFLAGS) - cd ..\aes - @echo Making in crypto\builtin\aes - $(MAKE) -$(MFLAGS) - cd ..\camellia - @echo Making in crypto\builtin\camellia - $(MAKE) -$(MFLAGS) - cd .. - @echo Making in crypto\builtin - -clean-windows:: - cd des - @echo Making clean in crypto\builtin\des - $(MAKE) -$(MFLAGS) clean - cd ..\md4 - @echo Making clean in crypto\builtin\md4 - $(MAKE) -$(MFLAGS) clean - cd ..\md5 - @echo Making clean in crypto\builtin\md5 - $(MAKE) -$(MFLAGS) clean - cd ..\sha1 - @echo Making clean in crypto\builtin\sha1 - $(MAKE) -$(MFLAGS) clean - cd ..\sha2 - @echo Making clean in crypto\builtin\sha2 - $(MAKE) -$(MFLAGS) clean - cd ..\hash_provider - @echo Making clean in crypto\builtin\hash_provider - $(MAKE) -$(MFLAGS) clean - cd ..\enc_provider - @echo Making clean in crypto\builtin\enc_provider - $(MAKE) -$(MFLAGS) clean - cd ..\aes - @echo Making clean in crypto\builtin\aes - $(MAKE) -$(MFLAGS) clean - cd ..\camellia - @echo Making clean in crypto\builtin\camellia - $(MAKE) -$(MFLAGS) clean - cd .. - @echo Making clean in crypto\builtin - -check-windows:: - cd des - @echo Making check in crypto\builtin\des - $(MAKE) -$(MFLAGS) check - cd ..\md4 - @echo Making check in crypto\builtin\md4 - $(MAKE) -$(MFLAGS) check - cd ..\md5 - @echo Making check in crypto\builtin\md5 - $(MAKE) -$(MFLAGS) check - cd ..\sha1 - @echo Making check in crypto\builtin\sha1 - $(MAKE) -$(MFLAGS) check - cd ..\sha2 - @echo Making check in crypto\builtin\sha2 - $(MAKE) -$(MFLAGS) check - cd ..\hash_provider - @echo Making check in crypto\builtin\hash_provider - $(MAKE) -$(MFLAGS) check - cd ..\enc_provider - @echo Making check in crypto\builtin\enc_provider - $(MAKE) -$(MFLAGS) check - cd ..\aes - @echo Making check in crypto\builtin\aes - $(MAKE) -$(MFLAGS) check - cd ..\camellia - @echo Making check in crypto\builtin\camellia - $(MAKE) -$(MFLAGS) check - cd .. - @echo Making check in crypto\builtin - - @lib_frag@ @libobj_frag@ diff --git a/src/lib/crypto/builtin/aes/Makefile.in b/src/lib/crypto/builtin/aes/Makefile.in index 64f73a379b..9a242cc45a 100644 --- a/src/lib/crypto/builtin/aes/Makefile.in +++ b/src/lib/crypto/builtin/aes/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/crypto/builtin/aes +mydir=lib$(S)crypto$(S)builtin$(S)aes BUILDTOP=$(REL)..$(S)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk -I$(srcdir)/../../../../include DEFS= diff --git a/src/lib/crypto/builtin/camellia/Makefile.in b/src/lib/crypto/builtin/camellia/Makefile.in index 2ad3e73f66..b11716ecc9 100644 --- a/src/lib/crypto/builtin/camellia/Makefile.in +++ b/src/lib/crypto/builtin/camellia/Makefile.in @@ -1,6 +1,6 @@ thisconfigdir=../../../.. myfulldir=lib/crypto/builtin/camellia -mydir=lib/crypto/builtin/camellia +mydir=lib$(S)crypto$(S)builtin$(S)camellia BUILDTOP=$(REL)..$(S)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk \ -I$(srcdir)/../../../../include -I$(srcdir)/../aes diff --git a/src/lib/crypto/builtin/des/Makefile.in b/src/lib/crypto/builtin/des/Makefile.in index 5001d48bfc..9b5d814029 100644 --- a/src/lib/crypto/builtin/des/Makefile.in +++ b/src/lib/crypto/builtin/des/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/crypto/builtin/des +mydir=lib$(S)crypto$(S)builtin$(S)des BUILDTOP=$(REL)..$(S)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. -I$(srcdir)/../../krb DEFS= diff --git a/src/lib/crypto/builtin/enc_provider/Makefile.in b/src/lib/crypto/builtin/enc_provider/Makefile.in index 80bfc60bd3..e843d602a9 100644 --- a/src/lib/crypto/builtin/enc_provider/Makefile.in +++ b/src/lib/crypto/builtin/enc_provider/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/crypto/builtin/enc_provider +mydir=lib$(S)crypto$(S)builtin$(S)enc_provider BUILDTOP=$(REL)..$(S)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/../des \ -I$(srcdir)/../arcfour \ diff --git a/src/lib/crypto/builtin/hash_provider/Makefile.in b/src/lib/crypto/builtin/hash_provider/Makefile.in index e91901ee5b..f008e7118b 100644 --- a/src/lib/crypto/builtin/hash_provider/Makefile.in +++ b/src/lib/crypto/builtin/hash_provider/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/crypto/builtin/hash_provider +mydir=lib$(S)crypto$(S)builtin$(S)hash_provider BUILDTOP=$(REL)..$(S)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/../../krb/crc32 -I$(srcdir)/../md4 \ -I$(srcdir)/../md5 -I$(srcdir)/../sha1 -I$(srcdir)/../../krb diff --git a/src/lib/crypto/builtin/md4/Makefile.in b/src/lib/crypto/builtin/md4/Makefile.in index 00ec64315a..3dbeb5bd70 100644 --- a/src/lib/crypto/builtin/md4/Makefile.in +++ b/src/lib/crypto/builtin/md4/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/crypto/builtin/md4 +mydir=lib$(S)crypto$(S)builtin$(S)md4 BUILDTOP=$(REL)..$(S)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir) DEFS= diff --git a/src/lib/crypto/builtin/md5/Makefile.in b/src/lib/crypto/builtin/md5/Makefile.in index 840bb62b94..1ab1ce96fa 100644 --- a/src/lib/crypto/builtin/md5/Makefile.in +++ b/src/lib/crypto/builtin/md5/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/crypto/builtin/md5 +mydir=lib$(S)crypto$(S)builtin$(S)md5 BUILDTOP=$(REL)..$(S)..$(S)..$(S).. DEFS= diff --git a/src/lib/crypto/builtin/sha1/Makefile.in b/src/lib/crypto/builtin/sha1/Makefile.in index 719f633702..00e6cb6d4a 100644 --- a/src/lib/crypto/builtin/sha1/Makefile.in +++ b/src/lib/crypto/builtin/sha1/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/crypto/builtin/sha1 +mydir=lib$(S)crypto$(S)builtin$(S)sha1 BUILDTOP=$(REL)..$(S)..$(S)..$(S).. DEFS= diff --git a/src/lib/crypto/builtin/sha2/Makefile.in b/src/lib/crypto/builtin/sha2/Makefile.in index 3b854ec29e..da176e66d2 100644 --- a/src/lib/crypto/builtin/sha2/Makefile.in +++ b/src/lib/crypto/builtin/sha2/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/crypto/builtin/sha2 +mydir=lib$(S)crypto$(S)builtin$(S)sha2 BUILDTOP=$(REL)..$(S)..$(S)..$(S).. DEFS= diff --git a/src/lib/crypto/crypto_tests/Makefile.in b/src/lib/crypto/crypto_tests/Makefile.in index 17e1683d61..50700fd6cd 100644 --- a/src/lib/crypto/crypto_tests/Makefile.in +++ b/src/lib/crypto/crypto_tests/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/crypto/crypto_tests +mydir=lib$(S)crypto$(S)crypto_tests BUILDTOP=$(REL)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/../krb -I$(srcdir)/../$(CRYPTO_IMPL)/enc_provider \ -I$(srcdir)/../$(CRYPTO_IMPL)/hash_provider \ diff --git a/src/lib/crypto/krb/Makefile.in b/src/lib/crypto/krb/Makefile.in index 7536bf80be..29c8897a96 100644 --- a/src/lib/crypto/krb/Makefile.in +++ b/src/lib/crypto/krb/Makefile.in @@ -1,7 +1,6 @@ -mydir=lib/crypto/krb +mydir=lib$(S)crypto$(S)krb BUILDTOP=$(REL)..$(S)..$(S).. -SUBDIRS= arcfour checksum crc32 dk \ - prf rand2key old raw prng +SUBDIRS= arcfour checksum crc32 dk prf rand2key old raw prng LOCALINCLUDES = -I$(srcdir) -I$(srcdir)/../$(CRYPTO_IMPL)/enc_provider \ -I$(srcdir)/dk -I$(srcdir)/../$(CRYPTO_IMPL)/hash_provider \ -I$(srcdir)/prf -I$(srcdir)/rand2key \ @@ -159,100 +158,6 @@ depend:: $(SRCS) clean-unix:: clean-libobjs -all-windows:: - cd arcfour - @echo Making in crypto\krb\arcfour - $(MAKE) -$(MFLAGS) - cd ..\crc32 - @echo Making in crypto\krb\crc32 - $(MAKE) -$(MFLAGS) - cd ..\checksum - @echo Making in crypto\krb\checksum - $(MAKE) -$(MFLAGS) - cd ..\dk - @echo Making in crypto\krb\dk - $(MAKE) -$(MFLAGS) - cd ..\prf - @echo Making in crypto\krb\prf - $(MAKE) -$(MFLAGS) - cd ..\rand2key - @echo Making in crypto\krb\rand2key - $(MAKE) -$(MFLAGS) - cd ..\old - @echo Making in crypto\krb\old - $(MAKE) -$(MFLAGS) - cd ..\raw - @echo Making in crypto\krb\raw - $(MAKE) -$(MFLAGS) - cd ..\prng - @echo Making in crypto\krb\prng - $(MAKE) -$(MFLAGS) - cd .. - @echo Making in crypto\krb - -clean-windows:: - cd arcfour - @echo Making in clean crypto\krb\arcfour - $(MAKE) -$(MFLAGS) clean - cd ..\crc32 - @echo Making in clean crypto\krb\crc32 - $(MAKE) -$(MFLAGS) clean - cd ..\checksum - @echo Making clean in crypto\krb\checksum - $(MAKE) -$(MFLAGS) clean - cd ..\dk - @echo Making clean in crypto\krb\dk - $(MAKE) -$(MFLAGS) clean - cd ..\prf - @echo Making clean in crypto\krb\prf - $(MAKE) -$(MFLAGS) clean - cd ..\rand2key - @echo Making clean in crypto\krb\rand2key - $(MAKE) -$(MFLAGS) clean - cd ..\old - @echo Making clean in crypto\krb\old - $(MAKE) -$(MFLAGS) clean - cd ..\raw - @echo Making clean in crypto\krb\raw - $(MAKE) -$(MFLAGS) clean - cd ..\prng - @echo Making clean in crypto\krb\prng - $(MAKE) -$(MFLAGS) clean - cd .. - @echo Making clean in crypto\krb - -check-windows:: - cd arcfour - @echo Making in check crypto\krb\arcfour - $(MAKE) -$(MFLAGS) check - cd ..\crc32 - @echo Making in check crypto\krb\crc32 - $(MAKE) -$(MFLAGS) check - cd ..\checksum - @echo Making check in crypto\krb\checksum - $(MAKE) -$(MFLAGS) check - cd ..\dk - @echo Making check in crypto\krb\dk - $(MAKE) -$(MFLAGS) check - cd ..\prf - @echo Making check in crypto\krb\prf - $(MAKE) -$(MFLAGS) check - cd ..\rand2key - @echo Making check in crypto\krb\rand2key - $(MAKE) -$(MFLAGS) check - cd ..\old - @echo Making check in crypto\krb\old - $(MAKE) -$(MFLAGS) check - cd ..\raw - @echo Making check in crypto\krb\raw - $(MAKE) -$(MFLAGS) check - cd ..\prng - @echo Making check in crypto\krb\prng - $(MAKE) -$(MFLAGS) check - cd .. - @echo Making check in crypto\krb - - @lib_frag@ @libobj_frag@ diff --git a/src/lib/crypto/krb/arcfour/Makefile.in b/src/lib/crypto/krb/arcfour/Makefile.in index f3f0a9bb02..93af66273c 100644 --- a/src/lib/crypto/krb/arcfour/Makefile.in +++ b/src/lib/crypto/krb/arcfour/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/crypto/krb/arcfour +mydir=lib$(S)crypto$(S)krb$(S)arcfour BUILDTOP=$(REL)..$(S)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../$(CRYPTO_IMPL) \ -I$(srcdir)/../../$(CRYPTO_IMPL)/md4 diff --git a/src/lib/crypto/krb/checksum/Makefile.in b/src/lib/crypto/krb/checksum/Makefile.in index 65a8cbcf4d..2d4148168f 100644 --- a/src/lib/crypto/krb/checksum/Makefile.in +++ b/src/lib/crypto/krb/checksum/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/crypto/krb/checksum +mydir=lib$(S)crypto$(S)krb$(S)checksum BUILDTOP=$(REL)..$(S)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../arcfour DEFS= diff --git a/src/lib/crypto/krb/crc32/Makefile.in b/src/lib/crypto/krb/crc32/Makefile.in index d46c739626..5360339e73 100644 --- a/src/lib/crypto/krb/crc32/Makefile.in +++ b/src/lib/crypto/krb/crc32/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/crypto/krb/crc32 +mydir=lib$(S)crypto$(S)krb$(S)crc32 BUILDTOP=$(REL)..$(S)..$(S)..$(S).. DEFS= diff --git a/src/lib/crypto/krb/dk/Makefile.in b/src/lib/crypto/krb/dk/Makefile.in index 0a710110c1..63e55b6ffe 100644 --- a/src/lib/crypto/krb/dk/Makefile.in +++ b/src/lib/crypto/krb/dk/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/crypto/krb/dk +mydir=lib$(S)crypto$(S)krb$(S)dk BUILDTOP=$(REL)..$(S)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../$(CRYPTO_IMPL) DEFS= diff --git a/src/lib/crypto/krb/old/Makefile.in b/src/lib/crypto/krb/old/Makefile.in index 0f21070cf5..8cbd7fc0bd 100644 --- a/src/lib/crypto/krb/old/Makefile.in +++ b/src/lib/crypto/krb/old/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/crypto/krb/old +mydir=lib$(S)crypto$(S)krb$(S)old BUILDTOP=$(REL)..$(S)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/../../$(CRYPTO_IMPL)/des -I$(srcdir)/.. -I$(srcdir) DEFS= diff --git a/src/lib/crypto/krb/prf/Makefile.in b/src/lib/crypto/krb/prf/Makefile.in index c2f412d8ea..b57029fa05 100644 --- a/src/lib/crypto/krb/prf/Makefile.in +++ b/src/lib/crypto/krb/prf/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/crypto/krb/prf +mydir=lib$(S)crypto$(S)krb$(S)prf BUILDTOP=$(REL)..$(S)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir) -I$(srcdir)/.. \ -I$(srcdir)/../dk \ diff --git a/src/lib/crypto/krb/prng/Makefile.in b/src/lib/crypto/krb/prng/Makefile.in index cef3710cfc..843fdd2f2f 100644 --- a/src/lib/crypto/krb/prng/Makefile.in +++ b/src/lib/crypto/krb/prng/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/crypto/krb/prng +mydir=lib$(S)crypto$(S)krb$(S)prng BUILDTOP=$(REL)..$(S)..$(S)..$(S).. SUBDIRS= $(PRNG_ALG) LOCALINCLUDES = -I$(srcdir) -I$(srcdir)/../../$(CRYPTO_IMPL)/enc_provider \ @@ -41,27 +41,6 @@ depend:: $(SRCS) clean-unix:: clean-libobjs -all-windows:: - cd yarrow - @echo Making in crypto\krb\prng\yarrow - $(MAKE) -$(MFLAGS) - cd .. - @echo Making in crypto\krb\prng - -clean-windows:: - cd yarrow - @echo Making clean in crypto\krb\prng\yarrow - $(MAKE) -$(MFLAGS) clean - cd .. - @echo Making clean in crypto\krb\prng - -check-windows:: - cd yarrow - @echo Making check in crypto\krb\prng\yarrow - $(MAKE) -$(MFLAGS) check - cd .. - @echo Making check in crypto\krb\prng - @lib_frag@ @libobj_frag@ diff --git a/src/lib/crypto/krb/prng/fortuna/Makefile.in b/src/lib/crypto/krb/prng/fortuna/Makefile.in index 367eb01742..544f4a1540 100644 --- a/src/lib/crypto/krb/prng/fortuna/Makefile.in +++ b/src/lib/crypto/krb/prng/fortuna/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/crypto/krb/prng/fortuna +mydir=lib$(S)crypto$(S)krb$(S)prng$(S)fortuna BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. \ -I$(srcdir)/../../../$(CRYPTO_IMPL) \ diff --git a/src/lib/crypto/krb/prng/nss/Makefile.in b/src/lib/crypto/krb/prng/nss/Makefile.in index d6d29b9329..a026076724 100644 --- a/src/lib/crypto/krb/prng/nss/Makefile.in +++ b/src/lib/crypto/krb/prng/nss/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/crypto/krb/prng/nss +mydir=lib$(S)crypto$(S)krb$(S)prng$(S)nss BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S).. CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@ LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. \ diff --git a/src/lib/crypto/krb/prng/yarrow/Makefile.in b/src/lib/crypto/krb/prng/yarrow/Makefile.in index 93d6bc44c0..3ecb64a4fd 100644 --- a/src/lib/crypto/krb/prng/yarrow/Makefile.in +++ b/src/lib/crypto/krb/prng/yarrow/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/crypto/krb/prng/yarrow +mydir=lib$(S)crypto$(S)krb$(S)prng$(S)yarrow BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. \ -I$(srcdir)/../../../$(CRYPTO_IMPL) \ diff --git a/src/lib/crypto/krb/rand2key/Makefile.in b/src/lib/crypto/krb/rand2key/Makefile.in index f6975d7d9e..7d1fb0705a 100644 --- a/src/lib/crypto/krb/rand2key/Makefile.in +++ b/src/lib/crypto/krb/rand2key/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/crypto/krb/rand2key +mydir=lib$(S)crypto$(S)krb$(S)rand2key BUILDTOP=$(REL)..$(S)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/. -I$(srcdir)/../../$(CRYPTO_IMPL)/des DEFS= diff --git a/src/lib/crypto/krb/raw/Makefile.in b/src/lib/crypto/krb/raw/Makefile.in index a9c3b09d83..f0b32b5369 100644 --- a/src/lib/crypto/krb/raw/Makefile.in +++ b/src/lib/crypto/krb/raw/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/crypto/krb/raw +mydir=lib$(S)crypto$(S)krb$(S)raw BUILDTOP=$(REL)..$(S)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../$(CRYPTO_IMPL) DEFS= diff --git a/src/lib/crypto/nss/Makefile.in b/src/lib/crypto/nss/Makefile.in index 7ce3cc8a9f..7016e924b2 100644 --- a/src/lib/crypto/nss/Makefile.in +++ b/src/lib/crypto/nss/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/crypto/nss +mydir=lib$(S)crypto$(S)nss BUILDTOP=$(REL)..$(S)..$(S).. SUBDIRS=des aes camellia md4 md5 sha1 sha2 enc_provider hash_provider CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@ @@ -18,12 +18,6 @@ PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) DEFS= -##DOSBUILDTOP = ..\..\.. -##DOSLIBNAME=$(OUTPRE)crypto.lib -##DOSOBJFILE=$(OUTPRE)crypto.lst -##DOSOBJFILELIST=@$(OUTPRE)crypto.lst @$(OUTPRE)des.lst @$(OUTPRE)md4.lst @$(OUTPRE)md5.lst @$(OUTPRE)sha1.lst @$(OUTPRE)crc32.lst @$(OUTPRE)dk.lst @$(OUTPRE)old.lst @$(OUTPRE)raw.lst @$(OUTPRE)enc_prov.lst @$(OUTPRE)hash_pro.lst @$(OUTPRE)kh_pro.lst @$(OUTPRE)yarrow.lst @$(OUTPRE)aes.lst -##DOSOBJFILEDEP =$(OUTPRE)crypto.lst $(OUTPRE)des.lst $(OUTPRE)md4.lst $(OUTPRE)md5.lst $(OUTPRE)sha1.lst $(OUTPRE)crc32.lst $(OUTPRE)dk.lst $(OUTPRE)old.lst $(OUTPRE)raw.lst $(OUTPRE)enc_prov.lst $(OUTPRE)hash_pro.lst $(OUTPRE)kh_pro.lst $(OUTPRE)aes.lst - STLIBOBJS=\ hmac.o \ pbkdf2.o @@ -51,8 +45,6 @@ SUBDIROBJLISTS= des/OBJS.ST md4/OBJS.ST \ aes/OBJS.ST \ camellia/OBJS.ST -##DOS##LIBOBJS = $(OBJS) - all-unix:: all-libobjs includes:: depend @@ -60,97 +52,6 @@ depend:: $(SRCS) clean-unix:: clean-libobjs -all-windows:: - cd ..\des - @echo Making in crypto\des - $(MAKE) -$(MFLAGS) - cd ..\md4 - @echo Making in crypto\md4 - $(MAKE) -$(MFLAGS) - cd ..\md5 - @echo Making in crypto\md5 - $(MAKE) -$(MFLAGS) - cd ..\sha1 - @echo Making in crypto\sha1 - $(MAKE) -$(MFLAGS) - cd ..\sha2 - @echo Making in crypto\sh2a - $(MAKE) -$(MFLAGS) - cd ..\hash_provider - @echo Making in crypto\hash_provider - $(MAKE) -$(MFLAGS) - cd ..\enc_provider - @echo Making in crypto\enc_provider - $(MAKE) -$(MFLAGS) - cd ..\aes - @echo Making in crypto\aes - $(MAKE) -$(MFLAGS) - cd ..\camellia - @echo Making in crypto\aes - $(MAKE) -$(MFLAGS) - cd .. - -clean-windows:: - cd ..\des - @echo Making clean in crypto\des - $(MAKE) -$(MFLAGS) clean - cd ..\md4 - @echo Making clean in crypto\md4 - $(MAKE) -$(MFLAGS) clean - cd ..\md5 - @echo Making clean in crypto\md5 - $(MAKE) -$(MFLAGS) clean - cd ..\sha2 - @echo Making clean in crypto\sha2 - $(MAKE) -$(MFLAGS) clean - cd ..\sha1 - @echo Making clean in crypto\sha1 - $(MAKE) -$(MFLAGS) clean - cd ..\hash_provider - @echo Making clean in crypto\hash_provider - $(MAKE) -$(MFLAGS) clean - cd ..\enc_provider - @echo Making clean in crypto\enc_provider - $(MAKE) -$(MFLAGS) clean - cd ..\aes - @echo Making clean in crypto\aes - $(MAKE) -$(MFLAGS) clean - cd ..\camellia - @echo Making clean in crypto\aes - $(MAKE) -$(MFLAGS) clean - cd .. - -check-windows:: - cd ..\des - @echo Making check in crypto\des - $(MAKE) -$(MFLAGS) check - cd ..\md4 - @echo Making check in crypto\md4 - $(MAKE) -$(MFLAGS) check - cd ..\md5 - @echo Making check in crypto\md5 - $(MAKE) -$(MFLAGS) check - cd ..\sha1 - @echo Making check in crypto\sha1 - $(MAKE) -$(MFLAGS) check - cd ..\sha2 - @echo Making check in crypto\sha2 - $(MAKE) -$(MFLAGS) check - cd ..\hash_provider - @echo Making check in crypto\hash_provider - $(MAKE) -$(MFLAGS) check - cd ..\enc_provider - @echo Making check in crypto\enc_provider - $(MAKE) -$(MFLAGS) check - cd ..\aes - @echo Making check in crypto\aes - $(MAKE) -$(MFLAGS) check - cd ..\camellia - @echo Making check in crypto\aes - $(MAKE) -$(MFLAGS) check - cd .. - - @lib_frag@ @libobj_frag@ diff --git a/src/lib/crypto/nss/aes/Makefile.in b/src/lib/crypto/nss/aes/Makefile.in index 9855eafb02..ffbd4ba50c 100644 --- a/src/lib/crypto/nss/aes/Makefile.in +++ b/src/lib/crypto/nss/aes/Makefile.in @@ -2,15 +2,11 @@ # system currently assumes that all modules have the same directory # structure. -mydir=lib/crypto/nss/aes +mydir=lib$(S)crypto$(S)nss$(S)aes BUILDTOP=$(REL)..$(S)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk -I$(srcdir)/../../../../include DEFS= -##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=aes -##DOS##OBJFILE=..\$(OUTPRE)aes.lst - PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) @@ -21,20 +17,13 @@ OBJS= SRCS= -##DOS##LIBOBJS = $(OBJS) - all-unix:: all-libobjs includes:: depend depend:: $(SRCS) -check:: - - clean-unix:: clean-libobjs -clean:: - @libobj_frag@ diff --git a/src/lib/crypto/nss/camellia/Makefile.in b/src/lib/crypto/nss/camellia/Makefile.in index c937f21974..b8feffc5d7 100644 --- a/src/lib/crypto/nss/camellia/Makefile.in +++ b/src/lib/crypto/nss/camellia/Makefile.in @@ -2,15 +2,11 @@ # system currently assumes that all modules have the same directory # structure. -mydir=lib/crypto/nss/camellia +mydir=lib$(S)crypto$(S)nss$(S)camellia BUILDTOP=$(REL)..$(S)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk -I$(srcdir)/../../../../include DEFS= -##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=camellia -##DOS##OBJFILE=..\$(OUTPRE)camellia.lst - PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) @@ -21,20 +17,13 @@ OBJS= SRCS= -##DOS##LIBOBJS = $(OBJS) - all-unix:: all-libobjs includes:: depend depend:: $(SRCS) -check:: - - clean-unix:: clean-libobjs -clean:: - @libobj_frag@ diff --git a/src/lib/crypto/nss/des/Makefile.in b/src/lib/crypto/nss/des/Makefile.in index dc0e5e8eed..c8ab6e4297 100644 --- a/src/lib/crypto/nss/des/Makefile.in +++ b/src/lib/crypto/nss/des/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/crypto/nss/des +mydir=lib$(S)crypto$(S)nss$(S)des BUILDTOP=$(REL)..$(S)..$(S)..$(S).. CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@ LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. -I$(srcdir)/../../krb \ @@ -6,10 +6,6 @@ LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. -I$(srcdir)/../../krb \ DEFS= -##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=des -##DOS##OBJFILE=..\$(OUTPRE)des.lst - RUN_SETUP = @KRB5_RUN_ENV@ PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) @@ -31,20 +27,12 @@ SRCS= $(srcdir)/f_parity.c \ $(srcdir)/string2key.c -##DOS##LIBOBJS = $(OBJS) - all-unix:: all-libobjs -check-unix:: - includes:: depend depend:: $(SRCS) -check-windows:: - -clean:: - clean-unix:: clean-libobjs @libobj_frag@ diff --git a/src/lib/crypto/nss/enc_provider/Makefile.in b/src/lib/crypto/nss/enc_provider/Makefile.in index f1ed5fb06a..579072df3a 100644 --- a/src/lib/crypto/nss/enc_provider/Makefile.in +++ b/src/lib/crypto/nss/enc_provider/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/crypto/nss/enc_provider +mydir=lib$(S)crypto$(S)nss$(S)enc_provider BUILDTOP=$(REL)..$(S)..$(S)..$(S).. CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@ LOCALINCLUDES = -I$(srcdir)/../des \ @@ -10,10 +10,6 @@ LOCALINCLUDES = -I$(srcdir)/../des \ $(CRYPTO_IMPL_CFLAGS) DEFS= -##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=enc_provider -##DOS##OBJFILE=..\$(OUTPRE)enc_prov.lst - PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) @@ -41,8 +37,6 @@ SRCS= \ $(srcdir)/camellia.c \ $(srcdir)/rc4.c -##DOS##LIBOBJS = $(OBJS) - all-unix:: all-libobjs includes:: depend diff --git a/src/lib/crypto/nss/hash_provider/Makefile.in b/src/lib/crypto/nss/hash_provider/Makefile.in index 36ba7b2df3..719b50079d 100644 --- a/src/lib/crypto/nss/hash_provider/Makefile.in +++ b/src/lib/crypto/nss/hash_provider/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/crypto/nss/hash_provider +mydir=lib$(S)crypto$(S)nss$(S)hash_provider BUILDTOP=$(REL)..$(S)..$(S)..$(S).. CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@ LOCALINCLUDES = -I$(srcdir)/../../krb/crc32 -I$(srcdir)/../md4 \ @@ -7,10 +7,6 @@ LOCALINCLUDES = -I$(srcdir)/../../krb/crc32 -I$(srcdir)/../md4 \ DEFS= -##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=hash_provider -##DOS##OBJFILE=..\$(OUTPRE)hash_pro.lst - PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) @@ -33,8 +29,6 @@ SRCS= $(srcdir)/hash_gen.c \ $(srcdir)/hash_md5.c \ $(srcdir)/hash_sha1.c -##DOS##LIBOBJS = $(OBJS) - all-unix:: all-libobjs includes:: depend diff --git a/src/lib/crypto/nss/md4/Makefile.in b/src/lib/crypto/nss/md4/Makefile.in index f7cb028355..dfb0182fa2 100644 --- a/src/lib/crypto/nss/md4/Makefile.in +++ b/src/lib/crypto/nss/md4/Makefile.in @@ -1,12 +1,8 @@ -mydir=lib/crypto/nss/md4 +mydir=lib$(S)crypto$(S)nss$(S)md4 BUILDTOP=$(REL)..$(S)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir) DEFS= -##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=md4 -##DOS##OBJFILE=..\$(OUTPRE)md4.lst - PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) @@ -16,21 +12,12 @@ OBJS= $(OUTPRE)md4.$(OBJEXT) SRCS= $(srcdir)/md4.c -##DOS##LIBOBJS = $(OBJS) - all-unix:: all-libobjs includes:: depend depend:: $(SRCS) - -check-unix:: - -check-windows:: - -clean:: - clean-unix:: clean-libobjs @libobj_frag@ diff --git a/src/lib/crypto/nss/md5/Makefile.in b/src/lib/crypto/nss/md5/Makefile.in index 83699a3f1a..b0cde50e96 100644 --- a/src/lib/crypto/nss/md5/Makefile.in +++ b/src/lib/crypto/nss/md5/Makefile.in @@ -1,11 +1,7 @@ -mydir=lib/crypto/nss/md5 +mydir=lib$(S)crypto$(S)nss$(S)md5 BUILDTOP=$(REL)..$(S)..$(S)..$(S).. DEFS= -##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=md5 -##DOS##OBJFILE=..\$(OUTPRE)md5.lst - PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@ @@ -18,20 +14,12 @@ OBJS= $(OUTPRE)md5.$(OBJEXT) SRCS= $(srcdir)/md5.c -##DOS##LIBOBJS = $(OBJS) - all-unix:: all-libobjs includes:: depend depend:: $(SRCS) -check-unix:: - -check-windows:: - -clean:: - clean-unix:: clean-libobjs @libobj_frag@ diff --git a/src/lib/crypto/nss/sha1/Makefile.in b/src/lib/crypto/nss/sha1/Makefile.in index 7afeb3813a..82d6d9b91d 100644 --- a/src/lib/crypto/nss/sha1/Makefile.in +++ b/src/lib/crypto/nss/sha1/Makefile.in @@ -1,13 +1,9 @@ -mydir=lib/crypto/nss/sha1 +mydir=lib$(S)crypto$(S)nss$(S)sha1 BUILDTOP=$(REL)..$(S)..$(S)..$(S).. DEFS= CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@ LOCALINCLUDES = -I$(srcdir)/.. $(CRYPTO_IMPL_CFLAGS) -##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=sha1 -##DOS##OBJFILE=..\$(OUTPRE)sha1.lst - PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) @@ -17,16 +13,12 @@ OBJS= $(OUTPRE)shs.$(OBJEXT) SRCS= $(srcdir)/shs.c -##DOS##LIBOBJS = $(OBJS) - all-unix:: all-libobjs includes:: depend depend:: $(SRCS) -clean:: - clean-unix:: clean-libobjs @libobj_frag@ diff --git a/src/lib/crypto/nss/sha2/Makefile.in b/src/lib/crypto/nss/sha2/Makefile.in index c0605e8de0..a8edb60d9e 100644 --- a/src/lib/crypto/nss/sha2/Makefile.in +++ b/src/lib/crypto/nss/sha2/Makefile.in @@ -1,13 +1,9 @@ -mydir=lib/crypto/nss/sha2 +mydir=lib$(S)crypto$(S)nss$(S)sha2 BUILDTOP=$(REL)..$(S)..$(S)..$(S).. DEFS= CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@ LOCALINCLUDES = -I$(srcdir)/.. $(CRYPTO_IMPL_CFLAGS) -##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=sha1 -##DOS##OBJFILE=..\$(OUTPRE)sha2.lst - PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) @@ -17,16 +13,12 @@ OBJS= $(OUTPRE)sha2.$(OBJEXT) SRCS= $(srcdir)/sha2.c -##DOS##LIBOBJS = $(OBJS) - all-unix:: all-libobjs includes:: depend depend:: $(SRCS) -clean:: - clean-unix:: clean-libobjs @libobj_frag@ diff --git a/src/lib/crypto/openssl/Makefile.in b/src/lib/crypto/openssl/Makefile.in index f333c17abb..ff43d56d82 100644 --- a/src/lib/crypto/openssl/Makefile.in +++ b/src/lib/crypto/openssl/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/crypto/openssl +mydir=lib$(S)crypto$(S)openssl BUILDTOP=$(REL)..$(S)..$(S).. SUBDIRS=camellia des aes md4 md5 sha1 sha2 enc_provider hash_provider LOCALINCLUDES = -I$(srcdir)/../krb \ @@ -15,12 +15,6 @@ PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) DEFS= -##DOSBUILDTOP = ..\..\.. -##DOSLIBNAME=$(OUTPRE)crypto.lib -##DOSOBJFILE=$(OUTPRE)crypto.lst -##DOSOBJFILELIST=@$(OUTPRE)crypto.lst @$(OUTPRE)des.lst @$(OUTPRE)md4.lst @$(OUTPRE)md5.lst @$(OUTPRE)sha1.lst @$(OUTPRE)crc32.lst @$(OUTPRE)dk.lst @$(OUTPRE)old.lst @$(OUTPRE)raw.lst @$(OUTPRE)enc_prov.lst @$(OUTPRE)hash_pro.lst @$(OUTPRE)kh_pro.lst @$(OUTPRE)yarrow.lst @$(OUTPRE)aes.lst -##DOSOBJFILEDEP =$(OUTPRE)crypto.lst $(OUTPRE)des.lst $(OUTPRE)md4.lst $(OUTPRE)md5.lst $(OUTPRE)sha1.lst $(OUTPRE)crc32.lst $(OUTPRE)dk.lst $(OUTPRE)old.lst $(OUTPRE)raw.lst $(OUTPRE)enc_prov.lst $(OUTPRE)hash_pro.lst $(OUTPRE)kh_pro.lst $(OUTPRE)aes.lst - STLIBOBJS=\ hmac.o \ init.o \ @@ -49,8 +43,6 @@ SUBDIROBJLISTS= des/OBJS.ST md4/OBJS.ST \ hash_provider/OBJS.ST \ aes/OBJS.ST -##DOS##LIBOBJS = $(OBJS) - all-unix:: all-libobjs includes:: depend @@ -58,85 +50,6 @@ depend:: $(SRCS) clean-unix:: clean-libobjs -all-windows:: - cd ..\des - @echo Making in crypto\des - $(MAKE) -$(MFLAGS) - cd ..\md4 - @echo Making in crypto\md4 - $(MAKE) -$(MFLAGS) - cd ..\md5 - @echo Making in crypto\md5 - $(MAKE) -$(MFLAGS) - cd ..\sha1 - @echo Making in crypto\sha1 - $(MAKE) -$(MFLAGS) - cd ..\sha2 - @echo Making in crypto\sha2 - $(MAKE) -$(MFLAGS) - cd ..\hash_provider - @echo Making in crypto\hash_provider - $(MAKE) -$(MFLAGS) - cd ..\enc_provider - @echo Making in crypto\enc_provider - $(MAKE) -$(MFLAGS) - cd ..\aes - @echo Making in crypto\aes - $(MAKE) -$(MFLAGS) - cd .. - -clean-windows:: - cd ..\des - @echo Making clean in crypto\des - $(MAKE) -$(MFLAGS) clean - cd ..\md4 - @echo Making clean in crypto\md4 - $(MAKE) -$(MFLAGS) clean - cd ..\md5 - @echo Making clean in crypto\md5 - $(MAKE) -$(MFLAGS) clean - cd ..\sha1 - @echo Making clean in crypto\sha1 - $(MAKE) -$(MFLAGS) clean - cd ..\sha2 - @echo Making clean in crypto\sha2 - $(MAKE) -$(MFLAGS) clean - cd ..\hash_provider - @echo Making clean in crypto\hash_provider - $(MAKE) -$(MFLAGS) clean - cd ..\enc_provider - @echo Making clean in crypto\enc_provider - $(MAKE) -$(MFLAGS) clean - cd ..\aes - @echo Making clean in crypto\aes - $(MAKE) -$(MFLAGS) clean - cd .. - -check-windows:: - cd ..\des - @echo Making check in crypto\des - $(MAKE) -$(MFLAGS) check - cd ..\md4 - @echo Making check in crypto\md4 - $(MAKE) -$(MFLAGS) check - cd ..\md5 - @echo Making check in crypto\md5 - $(MAKE) -$(MFLAGS) check - cd ..\sha1 - @echo Making check in crypto\sha1 - $(MAKE) -$(MFLAGS) check - cd ..\hash_provider - @echo Making check in crypto\hash_provider - $(MAKE) -$(MFLAGS) check - cd ..\enc_provider - @echo Making check in crypto\enc_provider - $(MAKE) -$(MFLAGS) check - cd ..\aes - @echo Making check in crypto\aes - $(MAKE) -$(MFLAGS) check - cd .. - - @lib_frag@ @libobj_frag@ diff --git a/src/lib/crypto/openssl/aes/Makefile.in b/src/lib/crypto/openssl/aes/Makefile.in index 6352c3dc2c..b8a7de924c 100644 --- a/src/lib/crypto/openssl/aes/Makefile.in +++ b/src/lib/crypto/openssl/aes/Makefile.in @@ -2,15 +2,11 @@ # system currently assumes that all modules have the same directory # structure. -mydir=lib/crypto/openssl/aes +mydir=lib$(S)crypto$(S)openssl$(S)aes BUILDTOP=$(REL)..$(S)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk -I$(srcdir)/../../../../include DEFS= -##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=aes -##DOS##OBJFILE=..\$(OUTPRE)aes.lst - PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) @@ -20,21 +16,13 @@ OBJS= SRCS= - -##DOS##LIBOBJS = $(OBJS) - all-unix:: all-libobjs includes:: depend depend:: $(SRCS) -check:: - - clean-unix:: clean-libobjs -clean:: - @libobj_frag@ diff --git a/src/lib/crypto/openssl/camellia/Makefile.in b/src/lib/crypto/openssl/camellia/Makefile.in index 5e36d50702..c300cd4550 100644 --- a/src/lib/crypto/openssl/camellia/Makefile.in +++ b/src/lib/crypto/openssl/camellia/Makefile.in @@ -2,15 +2,11 @@ # system currently assumes that all modules have the same directory # structure. -mydir=lib/crypto/openssl/camellia +mydir=lib$(S)crypto$(S)openssl$(S)camellia BUILDTOP=$(REL)..$(S)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk -I$(srcdir)/../../../../include DEFS= -##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=camellia -##DOS##OBJFILE=..\$(OUTPRE)camellia.lst - PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) @@ -21,20 +17,13 @@ OBJS= SRCS= -##DOS##LIBOBJS = $(OBJS) - all-unix:: all-libobjs includes:: depend depend:: $(SRCS) -check:: - - clean-unix:: clean-libobjs -clean:: - @libobj_frag@ diff --git a/src/lib/crypto/openssl/des/Makefile.in b/src/lib/crypto/openssl/des/Makefile.in index 627b5cc7f2..335c7e53cb 100644 --- a/src/lib/crypto/openssl/des/Makefile.in +++ b/src/lib/crypto/openssl/des/Makefile.in @@ -1,12 +1,8 @@ -mydir=lib/crypto/openssl/des +mydir=lib$(S)crypto$(S)openssl$(S)des BUILDTOP=$(REL)..$(S)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. -I$(srcdir)/../../krb DEFS= -##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=des -##DOS##OBJFILE=..\$(OUTPRE)des.lst - RUN_SETUP = @KRB5_RUN_ENV@ PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) @@ -28,20 +24,12 @@ SRCS= $(srcdir)/f_parity.c \ $(srcdir)/string2key.c -##DOS##LIBOBJS = $(OBJS) - all-unix:: all-libobjs -check-unix:: - includes:: depend depend:: $(SRCS) -check-windows:: - -clean:: - clean-unix:: clean-libobjs @libobj_frag@ diff --git a/src/lib/crypto/openssl/enc_provider/Makefile.in b/src/lib/crypto/openssl/enc_provider/Makefile.in index e974da406f..24f6b30459 100644 --- a/src/lib/crypto/openssl/enc_provider/Makefile.in +++ b/src/lib/crypto/openssl/enc_provider/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/crypto/openssl/enc_provider +mydir=lib$(S)crypto$(S)openssl$(S)enc_provider BUILDTOP=$(REL)..$(S)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/../des \ -I$(srcdir)/../arcfour \ @@ -9,10 +9,6 @@ LOCALINCLUDES = -I$(srcdir)/../des \ -I$(srcdir)/.. -I$(srcdir)/. DEFS= -##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=enc_provider -##DOS##OBJFILE=..\$(OUTPRE)enc_prov.lst - PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) @@ -39,8 +35,6 @@ SRCS= \ $(srcdir)/camellia.c \ $(srcdir)/rc4.c -##DOS##LIBOBJS = $(OBJS) - all-unix:: all-libobjs includes:: depend @@ -50,4 +44,3 @@ depend:: $(SRCS) clean-unix:: clean-libobjs @libobj_frag@ - diff --git a/src/lib/crypto/openssl/hash_provider/Makefile.in b/src/lib/crypto/openssl/hash_provider/Makefile.in index b5a7dcfebf..472dbd3935 100644 --- a/src/lib/crypto/openssl/hash_provider/Makefile.in +++ b/src/lib/crypto/openssl/hash_provider/Makefile.in @@ -1,13 +1,9 @@ -mydir=lib/crypto/openssl/hash_provider +mydir=lib$(S)crypto$(S)openssl$(S)hash_provider BUILDTOP=$(REL)..$(S)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir)/../../krb/crc32 -I$(srcdir)/../md4 \ -I$(srcdir)/../md5 -I$(srcdir)/../sha1 -I$(srcdir)/../../krb DEFS= -##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=hash_provider -##DOS##OBJFILE=..\$(OUTPRE)hash_pro.lst - PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) @@ -27,8 +23,6 @@ SRCS= $(srcdir)/hash_crc32.c \ $(srcdir)/hash_md5.c \ $(srcdir)/hash_sha1.c -##DOS##LIBOBJS = $(OBJS) - all-unix:: all-libobjs includes:: depend diff --git a/src/lib/crypto/openssl/md4/Makefile.in b/src/lib/crypto/openssl/md4/Makefile.in index f212c6d513..550d7df60c 100644 --- a/src/lib/crypto/openssl/md4/Makefile.in +++ b/src/lib/crypto/openssl/md4/Makefile.in @@ -1,12 +1,8 @@ -mydir=lib/crypto/openssl/md4 +mydir=lib$(S)crypto$(S)openssl$(S)md4 BUILDTOP=$(REL)..$(S)..$(S)..$(S).. LOCALINCLUDES = -I$(srcdir) DEFS= -##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=md4 -##DOS##OBJFILE=..\$(OUTPRE)md4.lst - PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) @@ -16,21 +12,12 @@ OBJS= $(OUTPRE)md4.$(OBJEXT) SRCS= $(srcdir)/md4.c -##DOS##LIBOBJS = $(OBJS) - all-unix:: all-libobjs includes:: depend depend:: $(SRCS) - -check-unix:: - -check-windows:: - -clean:: - clean-unix:: clean-libobjs @libobj_frag@ diff --git a/src/lib/crypto/openssl/md5/Makefile.in b/src/lib/crypto/openssl/md5/Makefile.in index 1b693c4202..9c3d340912 100644 --- a/src/lib/crypto/openssl/md5/Makefile.in +++ b/src/lib/crypto/openssl/md5/Makefile.in @@ -1,11 +1,7 @@ -mydir=lib/crypto/openssl/md5 +mydir=lib$(S)crypto$(S)openssl$(S)md5 BUILDTOP=$(REL)..$(S)..$(S)..$(S).. DEFS= -##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=md5 -##DOS##OBJFILE=..\$(OUTPRE)md5.lst - PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) @@ -15,20 +11,12 @@ OBJS= $(OUTPRE)md5.$(OBJEXT) SRCS= $(srcdir)/md5.c -##DOS##LIBOBJS = $(OBJS) - all-unix:: all-libobjs includes:: depend depend:: $(SRCS) -check-unix:: - -check-windows:: - -clean:: - clean-unix:: clean-libobjs @libobj_frag@ diff --git a/src/lib/crypto/openssl/sha1/Makefile.in b/src/lib/crypto/openssl/sha1/Makefile.in index 0ec25872eb..b2dcec6b9d 100644 --- a/src/lib/crypto/openssl/sha1/Makefile.in +++ b/src/lib/crypto/openssl/sha1/Makefile.in @@ -1,11 +1,7 @@ -mydir=lib/crypto/openssl/sha1 +mydir=lib$(S)crypto$(S)openssl$(S)sha1 BUILDTOP=$(REL)..$(S)..$(S)..$(S).. DEFS= -##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=sha1 -##DOS##OBJFILE=..\$(OUTPRE)sha1.lst - PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) @@ -15,16 +11,12 @@ OBJS= $(OUTPRE)shs.$(OBJEXT) SRCS= $(srcdir)/shs.c -##DOS##LIBOBJS = $(OBJS) - all-unix:: all-libobjs includes:: depend depend:: $(SRCS) -clean:: - clean-unix:: clean-libobjs @libobj_frag@ diff --git a/src/lib/crypto/openssl/sha2/Makefile.in b/src/lib/crypto/openssl/sha2/Makefile.in index 6a4a276485..edb93bd27b 100644 --- a/src/lib/crypto/openssl/sha2/Makefile.in +++ b/src/lib/crypto/openssl/sha2/Makefile.in @@ -1,11 +1,7 @@ -mydir=lib/crypto/openssl/sha2 +mydir=lib$(S)crypto$(S)openssl$(S)sha2 BUILDTOP=$(REL)..$(S)..$(S)..$(S).. DEFS= -##DOS##BUILDTOP = ..\..\..\.. -##DOS##PREFIXDIR=sha2 -##DOS##OBJFILE=..\$(OUTPRE)sha256.lst - PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) @@ -15,16 +11,12 @@ OBJS= $(OUTPRE)sha256.$(OBJEXT) SRCS= $(srcdir)/sha256.c -##DOS##LIBOBJS = $(OBJS) - all-unix:: all-libobjs includes:: depend depend:: $(SRCS) -clean:: - clean-unix:: clean-libobjs @libobj_frag@ diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in index 1316c29fe2..4a742ecc66 100644 --- a/src/lib/gssapi/Makefile.in +++ b/src/lib/gssapi/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/gssapi +mydir=lib$(S)gssapi BUILDTOP=$(REL)..$(S).. SUBDIRS= generic krb5 spnego mechglue DEFS=-D_GSS_STATIC_LINK=1 @@ -56,37 +56,6 @@ merged-gssapi-header.h: $(EXPORTED_HEADERS) verify-calling-conventions-gssapi: merged-gssapi-header.h $(PERL) -w $(top_srcdir)/util/def-check.pl merged-gssapi-header.h $(srcdir)/../gssapi32.def -all-windows:: - cd generic - @echo Making in gssapi\generic - $(MAKE) -$(MFLAGS) - cd ..\krb5 - @echo Making in gssapi\krb5 - $(MAKE) -$(MFLAGS) - cd ..\mechglue - @echo Making in gssapi\mechglue - $(MAKE) -$(MFLAGS) - cd ..\spnego - @echo Making in gssapi\spnego - $(MAKE) -$(MFLAGS) - cd .. - -clean-windows:: - cd generic - @echo Making clean in gssapi\generic - $(MAKE) -$(MFLAGS) clean - cd ..\krb5 - @echo Making clean in gssapi\krb5 - $(MAKE) -$(MFLAGS) clean - cd ..\mechglue - @echo Making clean in gssapi\mechglue - $(MAKE) -$(MFLAGS) clean - cd ..\spnego - @echo Making clean in gssapi\spnego - $(MAKE) -$(MFLAGS) clean - cd .. - @echo Making clean in gssapi - # These rules are an attempt to handle several different problems: # # Certain files in subdirectories must be made current by the diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in index d68e5f56bc..9221d0b9a2 100644 --- a/src/lib/gssapi/generic/Makefile.in +++ b/src/lib/gssapi/generic/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/gssapi/generic +mydir=lib$(S)gssapi$(S)generic BUILDTOP=$(REL)..$(S)..$(S).. LOCALINCLUDES = -I. -I$(srcdir) -I$(srcdir)/.. DEFS= diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in index a439bef7c1..0ff0d39b2c 100644 --- a/src/lib/gssapi/krb5/Makefile.in +++ b/src/lib/gssapi/krb5/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/gssapi/krb5 +mydir=lib$(S)gssapi$(S)krb5 BUILDTOP=$(REL)..$(S)..$(S).. LOCALINCLUDES = -I. -I$(srcdir) -I$(srcdir)/.. -I../generic -I$(srcdir)/../generic -I../mechglue -I$(srcdir)/../mechglue DEFS=-D_GSS_STATIC_LINK=1 @@ -237,7 +237,8 @@ error_map.h: $(top_srcdir)/util/gen-map.pl \ VALUE="char *" \ COMPARE=compare_OM_uint32 \ FREEVALUE=free_string - $(MV) error_map.new error_map.h + $(RM) $@ + $(MV) error_map.new $@ clean-unix:: $(RM) $(BUILDTOP)/include/gssapi/gssapi_krb5.h diff --git a/src/lib/gssapi/mechglue/Makefile.in b/src/lib/gssapi/mechglue/Makefile.in index d2dccb46be..7bb2069da6 100644 --- a/src/lib/gssapi/mechglue/Makefile.in +++ b/src/lib/gssapi/mechglue/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/gssapi/mechglue +mydir=lib$(S)gssapi$(S)mechglue BUILDTOP=$(REL)..$(S)..$(S).. LOCALINCLUDES = -I. -I$(srcdir) -I$(srcdir)/.. -I../generic -I$(srcdir)/../generic -I../krb5 -I$(srcdir)/../krb5 -I../spnego -I$(srcdir)/../spnego DEFS=-D_GSS_STATIC_LINK=1 diff --git a/src/lib/gssapi/spnego/Makefile.in b/src/lib/gssapi/spnego/Makefile.in index 16741eba44..49f67abc5f 100644 --- a/src/lib/gssapi/spnego/Makefile.in +++ b/src/lib/gssapi/spnego/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/gssapi/spnego +mydir=lib$(S)gssapi$(S)spnego BUILDTOP=$(REL)..$(S)..$(S).. LOCALINCLUDES = -I. -I$(srcdir) -I$(srcdir)/.. -I../generic -I$(srcdir)/../generic -I../mechglue -I$(srcdir)/../mechglue DEFS=-D_GSS_STATIC_LINK=1 diff --git a/src/lib/kadm5/Makefile.in b/src/lib/kadm5/Makefile.in index 24da565509..92085175fe 100644 --- a/src/lib/kadm5/Makefile.in +++ b/src/lib/kadm5/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/kadm5 +mydir=lib$(S)kadm5 BUILDTOP=$(REL)..$(S).. SUBDIRS = clnt srv unit-test DEFS= diff --git a/src/lib/kadm5/clnt/Makefile.in b/src/lib/kadm5/clnt/Makefile.in index 81aeb2027a..beda5da556 100644 --- a/src/lib/kadm5/clnt/Makefile.in +++ b/src/lib/kadm5/clnt/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/kadm5/clnt +mydir=lib$(S)kadm5$(S)clnt BUILDTOP=$(REL)..$(S)..$(S).. LOCALINCLUDES = -I$(BUILDTOP)/include/kadm5 DEFS= diff --git a/src/lib/kadm5/srv/Makefile.in b/src/lib/kadm5/srv/Makefile.in index 378e03c768..d57d6f08f3 100644 --- a/src/lib/kadm5/srv/Makefile.in +++ b/src/lib/kadm5/srv/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/kadm5/srv +mydir=lib$(S)kadm5$(S)srv BUILDTOP=$(REL)..$(S)..$(S).. LOCALINCLUDES = -I$(BUILDTOP)/include/kadm5 \ -I$(top_srcdir)/lib/gssapi/krb5 -I$(top_srcdir)/lib/gssapi/generic \ diff --git a/src/lib/kadm5/unit-test/Makefile.in b/src/lib/kadm5/unit-test/Makefile.in index ecd64c124a..f8d7b78479 100644 --- a/src/lib/kadm5/unit-test/Makefile.in +++ b/src/lib/kadm5/unit-test/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/kadm5/unit-test +mydir=lib$(S)kadm5$(S)unit-test BUILDTOP=$(REL)..$(S)..$(S).. DEFINES = PROG_LIBPATH=-L$(TOPLIBD) diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in index 3781dfb9ac..c49e1b56c3 100644 --- a/src/lib/kdb/Makefile.in +++ b/src/lib/kdb/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/kdb +mydir=lib$(S)kdb BUILDTOP=$(REL)..$(S).. KRB5_RUN_ENV = @KRB5_RUN_ENV@ KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ; diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in index adaba32aa1..9b95c02bae 100644 --- a/src/lib/krb5/Makefile.in +++ b/src/lib/krb5/Makefile.in @@ -1,7 +1,8 @@ -mydir=lib/krb5 +mydir=lib$(S)krb5 BUILDTOP=$(REL)..$(S).. LOCALINCLUDES = -I$(srcdir)/ccache -I$(srcdir)/keytab -I$(srcdir)/rcache -I$(srcdir)/os -I$(srcdir)/unicode SUBDIRS= error_tables asn.1 ccache keytab krb os rcache unicode +WINSUBDIRS= $(SUBDIRS) posix DEFS= ##DOSBUILDTOP = ..\.. @@ -68,67 +69,6 @@ clean-unix:: clean-liblinks clean-libs clean-libobjs clean-windows:: $(RM) $(OUTPRE)krb5.lib krb5.bak -all-windows:: - cd asn.1 - @echo Making in krb5\asn.1 - $(MAKE) -$(MFLAGS) - cd ..\ccache - @echo Making in krb5\ccache - $(MAKE) -$(MFLAGS) - cd ..\error_tables - @echo Making in krb5\error_tables - $(MAKE) -$(MFLAGS) - cd ..\keytab - @echo Making in krb5\keytab - $(MAKE) -$(MFLAGS) - cd ..\krb - @echo Making in krb5\krb - $(MAKE) -$(MFLAGS) - cd ..\os - @echo Making in krb5\os - $(MAKE) -$(MFLAGS) - cd ..\posix - @echo Making in krb5\posix - $(MAKE) -$(MFLAGS) - cd ..\rcache - @echo Making in krb5\rcache - $(MAKE) -$(MFLAGS) - cd ..\unicode - @echo Making in krb5\unicode - $(MAKE) -$(MFLAGS) - cd .. - -clean-windows:: - cd asn.1 - @echo Making clean in krb5\asn.1 - $(MAKE) -$(MFLAGS) clean - cd ..\ccache - @echo Making clean in krb5\ccache - $(MAKE) -$(MFLAGS) clean - cd ..\error_tables - @echo Making clean in krb5\error_tables - $(MAKE) -$(MFLAGS) clean - cd ..\keytab - @echo Making clean in krb5\keytab - $(MAKE) -$(MFLAGS) clean - cd ..\krb - @echo Making clean in krb5\krb - $(MAKE) -$(MFLAGS) clean - cd ..\os - @echo Making clean in krb5\os - $(MAKE) -$(MFLAGS) clean - cd ..\posix - @echo Making clean in krb5\posix - $(MAKE) -$(MFLAGS) clean - cd ..\rcache - @echo Making clean in krb5\rcache - $(MAKE) -$(MFLAGS) clean - cd ..\unicode - @echo Making clean in krb5\unicode - $(MAKE) -$(MFLAGS) clean - cd .. - @echo Making clean locally - install-unix:: install-libs @lib_frag@ diff --git a/src/lib/krb5/asn.1/Makefile.in b/src/lib/krb5/asn.1/Makefile.in index d0566c1209..ec8455ca64 100644 --- a/src/lib/krb5/asn.1/Makefile.in +++ b/src/lib/krb5/asn.1/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/krb5/asn.1 +mydir=lib$(S)krb5$(S)asn.1 BUILDTOP=$(REL)..$(S)..$(S).. DEFS= diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in index b421c031f9..021bd76023 100644 --- a/src/lib/krb5/ccache/Makefile.in +++ b/src/lib/krb5/ccache/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/krb5/ccache +mydir=lib$(S)krb5$(S)ccache BUILDTOP=$(REL)..$(S)..$(S).. SUBDIRS = # ccapi DEFS= diff --git a/src/lib/krb5/ccache/ccapi/Makefile.in b/src/lib/krb5/ccache/ccapi/Makefile.in index 135672b0cd..7adfb208e0 100644 --- a/src/lib/krb5/ccache/ccapi/Makefile.in +++ b/src/lib/krb5/ccache/ccapi/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/krb5/ccache/ccapi +mydir=lib$(S)krb5$(S)ccache$(S)ccapi BUILDTOP=$(REL)..$(S)..$(S)..$(S).. LOCALINCLUDES = $(WIN_INCLUDES) DEFS= -DUSE_CCAPI -DUSE_CCAPI_V3 diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in index d340b7b150..eb890d196a 100644 --- a/src/lib/krb5/error_tables/Makefile.in +++ b/src/lib/krb5/error_tables/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/krb5/error_tables +mydir=lib$(S)krb5$(S)error_tables BUILDTOP=$(REL)..$(S)..$(S).. DEFS= diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in index 258eac7d36..ccb4a6a2a6 100644 --- a/src/lib/krb5/keytab/Makefile.in +++ b/src/lib/krb5/keytab/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/krb5/keytab +mydir=lib$(S)krb5$(S)keytab BUILDTOP=$(REL)..$(S)..$(S).. DEFS= diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in index d4db454d4b..b96229986b 100644 --- a/src/lib/krb5/krb/Makefile.in +++ b/src/lib/krb5/krb/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/krb5/krb +mydir=lib$(S)krb5$(S)krb BUILDTOP=$(REL)..$(S)..$(S).. RUN_SETUP = @KRB5_RUN_ENV@ PROG_LIBPATH=-L$(TOPLIBD) diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in index dc9d09b1eb..903d86af1f 100644 --- a/src/lib/krb5/os/Makefile.in +++ b/src/lib/krb5/os/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/krb5/os +mydir=lib$(S)krb5$(S)os BUILDTOP=$(REL)..$(S)..$(S).. KRB5_RUN_ENV = @KRB5_RUN_ENV@ PROG_LIBPATH=-L$(TOPLIBD) diff --git a/src/lib/krb5/rcache/Makefile.in b/src/lib/krb5/rcache/Makefile.in index fec270bc72..83e7096705 100644 --- a/src/lib/krb5/rcache/Makefile.in +++ b/src/lib/krb5/rcache/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/krb5/rcache +mydir=lib$(S)krb5$(S)rcache BUILDTOP=$(REL)..$(S)..$(S).. PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/lib/krb5/unicode/Makefile.in b/src/lib/krb5/unicode/Makefile.in index 5ae89fbe7b..63e08c9dfe 100644 --- a/src/lib/krb5/unicode/Makefile.in +++ b/src/lib/krb5/unicode/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/krb5/unicode +mydir=lib$(S)krb5$(S)unicode BUILDTOP=$(REL)..$(S)..$(S).. KRB5_RUN_ENV = @KRB5_RUN_ENV@ PROG_LIBPATH=-L$(TOPLIBD) diff --git a/src/lib/rpc/Makefile.in b/src/lib/rpc/Makefile.in index 578a2d1904..58de423bd7 100644 --- a/src/lib/rpc/Makefile.in +++ b/src/lib/rpc/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/rpc +mydir=lib$(S)rpc BUILDTOP=$(REL)..$(S).. DEFINES = -DGSSAPI_KRB5 -DDEBUG_GSSAPI=0 -DGSSRPC__IMPL DEFS= diff --git a/src/lib/rpc/unit-test/Makefile.in b/src/lib/rpc/unit-test/Makefile.in index 71ddef8e00..0642e53def 100644 --- a/src/lib/rpc/unit-test/Makefile.in +++ b/src/lib/rpc/unit-test/Makefile.in @@ -1,4 +1,4 @@ -mydir=lib/rpc/unit-test +mydir=lib$(S)rpc$(S)unit-test BUILDTOP=$(REL)..$(S)..$(S).. LOCALINCLUDES = -I. PROG_LIBPATH=-L$(TOPLIBD) |