svn rev #24536: trunk/src/ appl/ appl/gss-sample/ appl/sample/ appl/sample/sclient/ ...
ghudson@MIT.EDU
ghudson at MIT.EDU
Sat Nov 27 20:36:42 EST 2010
http://src.mit.edu/fisheye/changelog/krb5/?cs=24536
Commit By: ghudson
Log Message:
ticket: 6826
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 /.
Changed Files:
U trunk/src/Makefile.in
U trunk/src/appl/Makefile.in
U trunk/src/appl/gss-sample/Makefile.in
U trunk/src/appl/sample/Makefile.in
U trunk/src/appl/sample/sclient/Makefile.in
U trunk/src/appl/sample/sserver/Makefile.in
U trunk/src/appl/simple/Makefile.in
U trunk/src/appl/simple/client/Makefile.in
U trunk/src/appl/simple/server/Makefile.in
U trunk/src/appl/user_user/Makefile.in
U trunk/src/ccapi/Makefile.in
U trunk/src/ccapi/common/Makefile.in
U trunk/src/ccapi/common/unix/Makefile.in
U trunk/src/ccapi/lib/Makefile.in
U trunk/src/ccapi/lib/unix/Makefile.in
U trunk/src/ccapi/server/Makefile.in
U trunk/src/ccapi/server/unix/Makefile.in
U trunk/src/ccapi/server/win/Makefile.in
U trunk/src/clients/Makefile.in
U trunk/src/clients/kdestroy/Makefile.in
U trunk/src/clients/kinit/Makefile.in
U trunk/src/clients/klist/Makefile.in
U trunk/src/clients/kpasswd/Makefile.in
U trunk/src/clients/ksu/Makefile.in
U trunk/src/clients/kvno/Makefile.in
U trunk/src/config/win-post.in
U trunk/src/include/Makefile.in
U trunk/src/kadmin/cli/Makefile.in
U trunk/src/kadmin/dbutil/Makefile.in
U trunk/src/kadmin/ktutil/Makefile.in
U trunk/src/kadmin/server/Makefile.in
U trunk/src/kadmin/testing/Makefile.in
U trunk/src/kadmin/testing/scripts/Makefile.in
U trunk/src/kadmin/testing/util/Makefile.in
U trunk/src/lib/Makefile.in
U trunk/src/lib/apputils/Makefile.in
U trunk/src/lib/crypto/Makefile.in
U trunk/src/lib/crypto/builtin/Makefile.in
U trunk/src/lib/crypto/builtin/aes/Makefile.in
U trunk/src/lib/crypto/builtin/camellia/Makefile.in
U trunk/src/lib/crypto/builtin/des/Makefile.in
U trunk/src/lib/crypto/builtin/enc_provider/Makefile.in
U trunk/src/lib/crypto/builtin/hash_provider/Makefile.in
U trunk/src/lib/crypto/builtin/md4/Makefile.in
U trunk/src/lib/crypto/builtin/md5/Makefile.in
U trunk/src/lib/crypto/builtin/sha1/Makefile.in
U trunk/src/lib/crypto/builtin/sha2/Makefile.in
U trunk/src/lib/crypto/crypto_tests/Makefile.in
U trunk/src/lib/crypto/krb/Makefile.in
U trunk/src/lib/crypto/krb/arcfour/Makefile.in
U trunk/src/lib/crypto/krb/checksum/Makefile.in
U trunk/src/lib/crypto/krb/crc32/Makefile.in
U trunk/src/lib/crypto/krb/dk/Makefile.in
U trunk/src/lib/crypto/krb/old/Makefile.in
U trunk/src/lib/crypto/krb/prf/Makefile.in
U trunk/src/lib/crypto/krb/prng/Makefile.in
U trunk/src/lib/crypto/krb/prng/fortuna/Makefile.in
U trunk/src/lib/crypto/krb/prng/nss/Makefile.in
U trunk/src/lib/crypto/krb/prng/yarrow/Makefile.in
U trunk/src/lib/crypto/krb/rand2key/Makefile.in
U trunk/src/lib/crypto/krb/raw/Makefile.in
U trunk/src/lib/crypto/nss/Makefile.in
U trunk/src/lib/crypto/nss/aes/Makefile.in
U trunk/src/lib/crypto/nss/camellia/Makefile.in
U trunk/src/lib/crypto/nss/des/Makefile.in
U trunk/src/lib/crypto/nss/enc_provider/Makefile.in
U trunk/src/lib/crypto/nss/hash_provider/Makefile.in
U trunk/src/lib/crypto/nss/md4/Makefile.in
U trunk/src/lib/crypto/nss/md5/Makefile.in
U trunk/src/lib/crypto/nss/sha1/Makefile.in
U trunk/src/lib/crypto/nss/sha2/Makefile.in
U trunk/src/lib/crypto/openssl/Makefile.in
U trunk/src/lib/crypto/openssl/aes/Makefile.in
U trunk/src/lib/crypto/openssl/camellia/Makefile.in
U trunk/src/lib/crypto/openssl/des/Makefile.in
U trunk/src/lib/crypto/openssl/enc_provider/Makefile.in
U trunk/src/lib/crypto/openssl/hash_provider/Makefile.in
U trunk/src/lib/crypto/openssl/md4/Makefile.in
U trunk/src/lib/crypto/openssl/md5/Makefile.in
U trunk/src/lib/crypto/openssl/sha1/Makefile.in
U trunk/src/lib/crypto/openssl/sha2/Makefile.in
U trunk/src/lib/gssapi/Makefile.in
U trunk/src/lib/gssapi/generic/Makefile.in
U trunk/src/lib/gssapi/krb5/Makefile.in
U trunk/src/lib/gssapi/mechglue/Makefile.in
U trunk/src/lib/gssapi/spnego/Makefile.in
U trunk/src/lib/kadm5/Makefile.in
U trunk/src/lib/kadm5/clnt/Makefile.in
U trunk/src/lib/kadm5/srv/Makefile.in
U trunk/src/lib/kadm5/unit-test/Makefile.in
U trunk/src/lib/kdb/Makefile.in
U trunk/src/lib/krb5/Makefile.in
U trunk/src/lib/krb5/asn.1/Makefile.in
U trunk/src/lib/krb5/ccache/Makefile.in
U trunk/src/lib/krb5/ccache/ccapi/Makefile.in
U trunk/src/lib/krb5/error_tables/Makefile.in
U trunk/src/lib/krb5/keytab/Makefile.in
U trunk/src/lib/krb5/krb/Makefile.in
U trunk/src/lib/krb5/os/Makefile.in
U trunk/src/lib/krb5/rcache/Makefile.in
U trunk/src/lib/krb5/unicode/Makefile.in
U trunk/src/lib/rpc/Makefile.in
U trunk/src/lib/rpc/unit-test/Makefile.in
U trunk/src/plugins/authdata/greet/Makefile.in
U trunk/src/plugins/authdata/greet_client/Makefile.in
U trunk/src/plugins/authdata/greet_server/Makefile.in
U trunk/src/plugins/kadm5_hook/test/Makefile.in
U trunk/src/plugins/kdb/db2/Makefile.in
U trunk/src/plugins/kdb/db2/libdb2/Makefile.in
U trunk/src/plugins/kdb/db2/libdb2/btree/Makefile.in
U trunk/src/plugins/kdb/db2/libdb2/db/Makefile.in
U trunk/src/plugins/kdb/db2/libdb2/hash/Makefile.in
U trunk/src/plugins/kdb/db2/libdb2/mpool/Makefile.in
U trunk/src/plugins/kdb/db2/libdb2/recno/Makefile.in
U trunk/src/plugins/kdb/db2/libdb2/test/Makefile.in
U trunk/src/plugins/kdb/hdb/Makefile.in
U trunk/src/plugins/kdb/ldap/Makefile.in
U trunk/src/plugins/kdb/ldap/ldap_util/Makefile.in
U trunk/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in
U trunk/src/plugins/locate/python/Makefile.in
U trunk/src/plugins/preauth/cksum_body/Makefile.in
U trunk/src/plugins/preauth/encrypted_challenge/Makefile.in
U trunk/src/plugins/preauth/pkinit/Makefile.in
U trunk/src/plugins/preauth/securid_sam2/Makefile.in
U trunk/src/plugins/preauth/wpse/Makefile.in
U trunk/src/tests/asn.1/Makefile.in
U trunk/src/tests/create/Makefile.in
U trunk/src/tests/dejagnu/Makefile.in
U trunk/src/tests/gss-threads/Makefile.in
U trunk/src/tests/gssapi/Makefile.in
U trunk/src/tests/hammer/Makefile.in
U trunk/src/tests/misc/Makefile.in
U trunk/src/tests/mkeystash_compat/Makefile.in
U trunk/src/tests/resolve/Makefile.in
U trunk/src/tests/shlib/Makefile.in
U trunk/src/tests/threads/Makefile.in
U trunk/src/tests/verify/Makefile.in
U trunk/src/util/Makefile.in
U trunk/src/util/collected-client-lib/Makefile.in
U trunk/src/util/et/Makefile.in
U trunk/src/util/profile/Makefile.in
U trunk/src/util/send-pr/Makefile.in
U trunk/src/util/ss/Makefile.in
U trunk/src/util/support/Makefile.in
U trunk/src/windows/Makefile.in
Modified: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -16,6 +16,7 @@
plugins/preauth/encrypted_challenge \
kdc kadmin slave clients appl tests \
config-files gen-manpages
+WINSUBDIRS=include util lib ccapi windows clients appl
BUILDTOP=$(REL).
LOCALINCLUDES = -I$(srcdir)
PROG_LIBPATH=-L$(TOPLIBD)
@@ -45,31 +46,6 @@
##DOS##!endif
all-windows:: maybe-awk Makefile-windows
- @echo Making autoconf.h in include
- cd include
- $(MAKE) -$(MFLAGS) autoconf.h
- @echo Making in util
- cd ..\util
- $(MAKE) -$(MFLAGS)
- @echo Making in include
- cd ..\include
- $(MAKE) -$(MFLAGS)
- @echo Making in lib
- cd ..\lib
- $(MAKE) -$(MFLAGS)
- @echo Making in ccapi
- cd ..\ccapi
- $(MAKE) -$(MFLAGS)
- @echo Making in windows
- cd ..\windows
- $(MAKE) -$(MFLAGS)
- @echo Making in clients
- cd ..\clients
- $(MAKE) -$(MFLAGS)
- @echo Making in appl
- cd ..\appl
- $(MAKE) -$(MFLAGS)
- cd ..
world::
date
@@ -370,26 +346,6 @@
##DOS## $(WCONFIG) config < $@.in > $@
clean-windows:: Makefile-windows
- @echo Making clean in util
- cd util
- $(MAKE) -$(MFLAGS) clean
- @echo Making clean in include
- cd ..\include
- $(MAKE) -$(MFLAGS) clean
- @echo Making clean in lib
- cd ..\lib
- $(MAKE) -$(MFLAGS) clean
- @echo Making clean in windows
- cd ..\windows
- $(MAKE) -$(MFLAGS) clean
- @echo Making clean in clients
- cd ..\clients
- $(MAKE) -$(MFLAGS) clean
- @echo Making clean in appl
- cd ..\appl
- $(MAKE) -$(MFLAGS) clean
- cd ..
- @echo Making clean in root
#
# Renames DOS 8.3 filenames back to their proper, longer names.
Modified: trunk/src/appl/Makefile.in
===================================================================
--- trunk/src/appl/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/appl/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -2,15 +2,4 @@
BUILDTOP=$(REL)..
SUBDIRS= sample simple user_user gss-sample
-
-all-windows::
- @echo Making in gss-sample
- cd gss-sample
- $(MAKE) -$(MFLAGS)
- cd ..
-
-clean-windows::
- @echo Making clean in lib\crypto
- cd gss-sample
- $(MAKE) -$(MFLAGS) clean
- cd ..
+WINSUBDIRS= gss-sample
Modified: trunk/src/appl/gss-sample/Makefile.in
===================================================================
--- trunk/src/appl/gss-sample/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/appl/gss-sample/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=appl/gss-sample
+mydir=appl$(S)gss-sample
BUILDTOP=$(REL)..$(S)..
DEFINES = -DUSE_AUTOCONF_H -DGSSAPI_V2
PROG_LIBPATH=-L$(TOPLIBD)
Modified: trunk/src/appl/sample/Makefile.in
===================================================================
--- trunk/src/appl/sample/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/appl/sample/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,3 +1,3 @@
-mydir=appl/sample
+mydir=appl$(S)sample
SUBDIRS = sclient sserver
BUILDTOP=$(REL)..$(S)..
Modified: trunk/src/appl/sample/sclient/Makefile.in
===================================================================
--- trunk/src/appl/sample/sclient/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/appl/sample/sclient/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=appl/sample/sclient
+mydir=appl$(S)sample$(S)sclient
BUILDTOP=$(REL)..$(S)..$(S)..
PROG_LIBPATH=-L$(TOPLIBD)
Modified: trunk/src/appl/sample/sserver/Makefile.in
===================================================================
--- trunk/src/appl/sample/sserver/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/appl/sample/sserver/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=appl/sample/sserver
+mydir=appl$(S)sample$(S)sserver
BUILDTOP=$(REL)..$(S)..$(S)..
PROG_LIBPATH=-L$(TOPLIBD)
Modified: trunk/src/appl/simple/Makefile.in
===================================================================
--- trunk/src/appl/simple/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/appl/simple/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,3 +1,3 @@
-mydir=appl/simple
+mydir=appl$(S)simple
SUBDIRS = client server
BUILDTOP=$(REL)..$(S)..
Modified: trunk/src/appl/simple/client/Makefile.in
===================================================================
--- trunk/src/appl/simple/client/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/appl/simple/client/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=appl/simple/client
+mydir=appl$(S)simple$(S)client
BUILDTOP=$(REL)..$(S)..$(S)..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
Modified: trunk/src/appl/simple/server/Makefile.in
===================================================================
--- trunk/src/appl/simple/server/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/appl/simple/server/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=appl/simple/server
+mydir=appl$(S)simple$(S)server
BUILDTOP=$(REL)..$(S)..$(S)..
LOCALINCLUDES= -I.. -I$(srcdir)/..
Modified: trunk/src/appl/user_user/Makefile.in
===================================================================
--- trunk/src/appl/user_user/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/appl/user_user/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=appl/user_user
+mydir=appl$(S)user_user
BUILDTOP=$(REL)..$(S)..
DEFINES = -DDEBUG
PROG_LIBPATH=-L$(TOPLIBD)
Modified: trunk/src/ccapi/Makefile.in
===================================================================
--- trunk/src/ccapi/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/ccapi/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -2,32 +2,4 @@
BUILDTOP=$(REL)..
SUBDIRS= lib server test
-
-all-windows::
- @echo Making in ccapi\lib\win
- cd lib\win
- cd
- $(MAKE) -$(MFLAGS)
- @echo Making in ccapi\server\win
- cd ..\..\server\win
- cd
- $(MAKE) -$(MFLAGS)
- @echo Making in ccapi\test
- cd ..\..\test
- cd
- $(MAKE) -$(MFLAGS)
-
-clean-windows::
- @echo Making clean in ccapi\lib\win
- cd lib\win
- cd
- $(MAKE) -$(MFLAGS) clean
- @echo Making clean in ccapi\server\win
- cd ..\..\server\win
- cd
- $(MAKE) -$(MFLAGS) clean
- @echo Making clean in ccapi\test
- cd ..\..\test
- cd
- $(MAKE) -$(MFLAGS) clean
-
+WINSUBDIRS= lib\win server\win test
Modified: trunk/src/ccapi/common/Makefile.in
===================================================================
--- trunk/src/ccapi/common/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/ccapi/common/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=ccapi/common
+mydir=ccapi$(S)common
BUILDTOP=$(REL)..$(S)..
SUBDIRS=unix
Modified: trunk/src/ccapi/common/unix/Makefile.in
===================================================================
--- trunk/src/ccapi/common/unix/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/ccapi/common/unix/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=ccapi/common/unix
+mydir=ccapi$(S)common$(S)unix
BUILDTOP=$(REL)..$(S)..$(S)..
STLIBOBJS=
Modified: trunk/src/ccapi/lib/Makefile.in
===================================================================
--- trunk/src/ccapi/lib/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/ccapi/lib/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=ccapi/lib
+mydir=ccapi$(S)lib
BUILDTOP=$(REL)..$(S)..
SUBDIRS=unix
LOCALINCLUDES=-I$(srcdir)/../common -I.
Modified: trunk/src/ccapi/lib/unix/Makefile.in
===================================================================
--- trunk/src/ccapi/lib/unix/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/ccapi/lib/unix/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=ccapi/lib/unix
+mydir=ccapi$(S)lib$(S)unix
BUILDTOP=$(REL)..$(S)..$(S)..
LOCALINCLUDES= -I$(srcdir)/.. -I$(srcdir)/../../common
Modified: trunk/src/ccapi/server/Makefile.in
===================================================================
--- trunk/src/ccapi/server/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/ccapi/server/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=ccapi/server
+mydir=ccapi$(S)server
BUILDTOP=$(REL)..$(S)..
SUBDIRS=unix
Modified: trunk/src/ccapi/server/unix/Makefile.in
===================================================================
--- trunk/src/ccapi/server/unix/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/ccapi/server/unix/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=ccapi/server/unix
+mydir=ccapi$(S)server$(S)unix
BUILDTOP=$(REL)..$(S)..$(S)..
STLIBOBJS=
Modified: trunk/src/ccapi/server/win/Makefile.in
===================================================================
--- trunk/src/ccapi/server/win/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/ccapi/server/win/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -106,4 +106,4 @@
if exist $(OUTPRE)*.map del $(OUTPRE)*.map
if exist $(OUTPRE)*.pdb del $(OUTPRE)*.pdb
if exist *.err del *.err
- if exist $(SRCTMP) rm -rf $(SRCTMP)
+ if exist $(SRCTMP) rmdir /s /q $(SRCTMP)
Modified: trunk/src/clients/Makefile.in
===================================================================
--- trunk/src/clients/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/clients/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -2,52 +2,6 @@
BUILDTOP=$(REL)..
SUBDIRS= klist kinit kdestroy kpasswd ksu kvno kcpytkt kdeltkt
+WINSUBDIRS= klist kinit kdestroy kpasswd kvno kcpytkt kdeltkt
NO_OUTPRE=1
-all-windows::
- @echo Making all in clients\klist
- cd klist
- $(MAKE) -$(MFLAGS)
- @echo Making all in clients\kdestroy
- cd ..\kdestroy
- $(MAKE) -$(MFLAGS)
- @echo Making all in clients\kinit
- cd ..\kinit
- $(MAKE) -$(MFLAGS)
- @echo Making all in clients\kpasswd
- cd ..\kpasswd
- $(MAKE) -$(MFLAGS)
- @echo Making all in clients\kvno
- cd ..\kvno
- $(MAKE) -$(MFLAGS)
- @echo Making all in clients\kcpytkt
- cd ..\kcpytkt
- $(MAKE) -$(MFLAGS)
- @echo Making all in clients\kdeltkt
- cd ..\kdeltkt
- $(MAKE) -$(MFLAGS)
- cd ..
-
-clean-windows::
- @echo Making clean in clients\klist
- cd klist
- $(MAKE) -$(MFLAGS) clean
- @echo Making clean in clients\kdestroy
- cd ..\kdestroy
- $(MAKE) -$(MFLAGS) clean
- @echo Making clean in clients\kinit
- cd ..\kinit
- $(MAKE) -$(MFLAGS) clean
- @echo Making clean in clients\kpasswd
- cd ..\kpasswd
- $(MAKE) -$(MFLAGS) clean
- @echo Making clean in clients\kvno
- cd ..\kvno
- $(MAKE) -$(MFLAGS) clean
- @echo Making clean in clients\kcpytkt
- cd ..\kcpytkt
- $(MAKE) -$(MFLAGS) clean
- @echo Making clean in clients\kdeltkt
- cd ..\kdeltkt
- $(MAKE) -$(MFLAGS) clean
- cd ..
Modified: trunk/src/clients/kdestroy/Makefile.in
===================================================================
--- trunk/src/clients/kdestroy/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/clients/kdestroy/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=clients/kdestroy
+mydir=clients$(S)kdestroy
BUILDTOP=$(REL)..$(S)..
DEFS=
Modified: trunk/src/clients/kinit/Makefile.in
===================================================================
--- trunk/src/clients/kinit/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/clients/kinit/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=clients/kinit
+mydir=clients$(S)kinit
BUILDTOP=$(REL)..$(S)..
DEFS=
Modified: trunk/src/clients/klist/Makefile.in
===================================================================
--- trunk/src/clients/klist/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/clients/klist/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=clients/klist
+mydir=clients$(S)klist
BUILDTOP=$(REL)..$(S)..
DEFS=
Modified: trunk/src/clients/kpasswd/Makefile.in
===================================================================
--- trunk/src/clients/kpasswd/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/clients/kpasswd/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=clients/kpasswd
+mydir=clients$(S)kpasswd
BUILDTOP=$(REL)..$(S)..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
Modified: trunk/src/clients/ksu/Makefile.in
===================================================================
--- trunk/src/clients/ksu/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/clients/ksu/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=clients/ksu
+mydir=clients$(S)ksu
BUILDTOP=$(REL)..$(S)..
DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"'
DEFS=
Modified: trunk/src/clients/kvno/Makefile.in
===================================================================
--- trunk/src/clients/kvno/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/clients/kvno/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=clients/kvno
+mydir=clients$(S)kvno
BUILDTOP=$(REL)..$(S)..
DEFS=
Modified: trunk/src/config/win-post.in
===================================================================
--- trunk/src/config/win-post.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/config/win-post.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -34,7 +34,36 @@
$(WCONFIG) $(BUILDTOP)\config < Makefile.in > Makefile
!endif
-!if ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" )
+# Recurse into subdirs if WINSUBDIRS or SUBDIRS is defined. Makefiles
+# can depend on all-recurse, clean-recurse, or check-recurse to perform
+# actions after recursion.
+!if defined(SUBDIRS) && !defined(WINSUBDIRS)
+WINSUBDIRS=$(SUBDIRS)
+!endif
+!ifdef WINSUBDIRS
+
+all-recurse:
+ @for %d in ($(WINSUBDIRS)) do @(echo Making in $(mydir)\%d && \
+ pushd %d && $(MAKE) -$(MFLAGS) && popd) || exit 1
+ @echo Making in $(mydir)
+all-windows:: all-recurse
+
+clean-recurse::
+ @for %d in ($(WINSUBDIRS)) do @(echo Making clean in $(mydir)\%d && \
+ pushd %d && $(MAKE) -$(MFLAGS) clean && popd) || exit 1
+ @echo Making clean in $(mydir)
+clean-windows:: clean-recurse
+
+check-recurse::
+ @for %d in ($(WINSUBDIRS)) do @(echo Making check in $(mydir)\%d && \
+ pushd %d && $(MAKE) -$(MFLAGS) check && popd) || exit 1
+ @echo Making check in $(mydir)
+check-windows:: check-recurse
+
+!endif # WINSUBDIRS
+
+# Use 64-bit LIBNAME and OBJFILE on 64-bit platforms, if defined.
+!if ("$(CPU)" == "IA64") || ("$(CPU)" == "AMD64") || ("$(CPU)" == "ALPHA64")
!if defined(WIN64LIBNAME)
LIBNAME=$(WIN64LIBNAME)
!endif
@@ -43,6 +72,7 @@
!endif
!endif
+# Build a library if LIBNAME is defined.
!if defined(LIBNAME)
!if !defined(OBJFILELIST)
@@ -59,6 +89,7 @@
!endif # LIBNAME
+# Build an object file list if OBJFILE is defined.
!if defined(OBJFILE)
all-windows:: $(OBJFILE)
!if defined(LIBOBJS)
@@ -76,17 +107,6 @@
check::
check-windows::
-!if defined(LIBNAME)
-clean-windows::
-# NO LONGER NEEDED BECAUSE WE CLEAN OUT THE DIR...
-# if exist $(LIBNAME) del $(LIBNAME)
-!endif
-!if defined(OBJFILE)
-clean-windows::
-# NO LONGER NEEDED BECAUSE WE CLEAN OUT THE DIR...
-# if exist $(OBJFILE) del $(OBJFILE)
-!endif
-
clean-windows:: clean-windows-files clean-windows-dir
Modified: trunk/src/include/Makefile.in
===================================================================
--- trunk/src/include/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/include/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -121,8 +121,9 @@
clean-windows::
$(RM) com_err.h profile.h
- $(RM) gssapi\gssapi.h gssapi\gssapi_generic.h gssapi\gssapi_krb5.h gssapi\timestamp
- if exist gssapi\nul rmdir gssapi
+ $(RM) gssapi\gssapi.h gssapi\gssapi_generic.h gssapi\gssapi_krb5.h
+ $(RM) gssapi\gssapi_ext.h gssapi\timestamp
+ if exist gssapi\nul rmdir /s /q gssapi
$(RM) osconf.h autoconf.h autoconf.stamp
@echo Making clean in include
Modified: trunk/src/kadmin/cli/Makefile.in
===================================================================
--- trunk/src/kadmin/cli/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/kadmin/cli/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=kadmin/cli
+mydir=kadmin$(S)cli
BUILDTOP=$(REL)..$(S)..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
Modified: trunk/src/kadmin/dbutil/Makefile.in
===================================================================
--- trunk/src/kadmin/dbutil/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/kadmin/dbutil/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=kadmin/dbutil
+mydir=kadmin$(S)dbutil
BUILDTOP=$(REL)..$(S)..
DEFS=
LOCALINCLUDES = -I.
Modified: trunk/src/kadmin/ktutil/Makefile.in
===================================================================
--- trunk/src/kadmin/ktutil/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/kadmin/ktutil/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=kadmin/ktutil
+mydir=kadmin$(S)ktutil
BUILDTOP=$(REL)..$(S)..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
Modified: trunk/src/kadmin/server/Makefile.in
===================================================================
--- trunk/src/kadmin/server/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/kadmin/server/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=kadmin/server
+mydir=kadmin$(S)server
BUILDTOP=$(REL)..$(S)..
KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS)
DEFS=
Modified: trunk/src/kadmin/testing/Makefile.in
===================================================================
--- trunk/src/kadmin/testing/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/kadmin/testing/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=kadmin/testing
+mydir=kadmin$(S)testing
BUILDTOP=$(REL)..$(S)..
SUBDIRS = scripts util
Modified: trunk/src/kadmin/testing/scripts/Makefile.in
===================================================================
--- trunk/src/kadmin/testing/scripts/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/kadmin/testing/scripts/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=kadmin/testing/scripts
+mydir=kadmin$(S)testing$(S)scripts
BUILDTOP=$(REL)..$(S)..$(S)..
PERL_PATH=@PERL_PATH@
Modified: trunk/src/kadmin/testing/util/Makefile.in
===================================================================
--- trunk/src/kadmin/testing/util/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/kadmin/testing/util/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=kadmin/testing/util
+mydir=kadmin$(S)testing$(S)util
BUILDTOP=$(REL)..$(S)..$(S)..
LOCALINCLUDES = $(TCL_INCLUDES) -I$(BUILDTOP)/lib/kdb/
# Force Tcl headers to use stdarg.h, because krb5 does too, and if
Modified: trunk/src/lib/Makefile.in
===================================================================
--- trunk/src/lib/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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 @@
##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 ..
Modified: trunk/src/lib/apputils/Makefile.in
===================================================================
--- trunk/src/lib/apputils/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/apputils/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -2,7 +2,7 @@
bindir=@bindir@
datadir=@datadir@
mydatadir=$(datadir)/apputils
-mydir=lib/apputils
+mydir=lib$(S)apputils
BUILDTOP=$(REL)..$(S)..
RELDIR=../lib/apputils
SED = sed
Modified: trunk/src/lib/crypto/Makefile.in
===================================================================
--- trunk/src/lib/crypto/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=lib/crypto
+mydir=lib$(S)crypto
BUILDTOP=$(REL)..$(S)..
SUBDIRS= krb $(CRYPTO_IMPL) crypto_tests
@@ -74,30 +74,6 @@
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@
Modified: trunk/src/lib/crypto/builtin/Makefile.in
===================================================================
--- trunk/src/lib/crypto/builtin/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/builtin/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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 @@
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@
Modified: trunk/src/lib/crypto/builtin/aes/Makefile.in
===================================================================
--- trunk/src/lib/crypto/builtin/aes/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/builtin/aes/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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=
Modified: trunk/src/lib/crypto/builtin/camellia/Makefile.in
===================================================================
--- trunk/src/lib/crypto/builtin/camellia/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/builtin/camellia/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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
Modified: trunk/src/lib/crypto/builtin/des/Makefile.in
===================================================================
--- trunk/src/lib/crypto/builtin/des/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/builtin/des/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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=
Modified: trunk/src/lib/crypto/builtin/enc_provider/Makefile.in
===================================================================
--- trunk/src/lib/crypto/builtin/enc_provider/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/builtin/enc_provider/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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 \
Modified: trunk/src/lib/crypto/builtin/hash_provider/Makefile.in
===================================================================
--- trunk/src/lib/crypto/builtin/hash_provider/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/builtin/hash_provider/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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
Modified: trunk/src/lib/crypto/builtin/md4/Makefile.in
===================================================================
--- trunk/src/lib/crypto/builtin/md4/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/builtin/md4/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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=
Modified: trunk/src/lib/crypto/builtin/md5/Makefile.in
===================================================================
--- trunk/src/lib/crypto/builtin/md5/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/builtin/md5/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=lib/crypto/builtin/md5
+mydir=lib$(S)crypto$(S)builtin$(S)md5
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
DEFS=
Modified: trunk/src/lib/crypto/builtin/sha1/Makefile.in
===================================================================
--- trunk/src/lib/crypto/builtin/sha1/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/builtin/sha1/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=lib/crypto/builtin/sha1
+mydir=lib$(S)crypto$(S)builtin$(S)sha1
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
DEFS=
Modified: trunk/src/lib/crypto/builtin/sha2/Makefile.in
===================================================================
--- trunk/src/lib/crypto/builtin/sha2/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/builtin/sha2/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=lib/crypto/builtin/sha2
+mydir=lib$(S)crypto$(S)builtin$(S)sha2
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
DEFS=
Modified: trunk/src/lib/crypto/crypto_tests/Makefile.in
===================================================================
--- trunk/src/lib/crypto/crypto_tests/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/crypto_tests/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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 \
Modified: trunk/src/lib/crypto/krb/Makefile.in
===================================================================
--- trunk/src/lib/crypto/krb/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/krb/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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 @@
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@
Modified: trunk/src/lib/crypto/krb/arcfour/Makefile.in
===================================================================
--- trunk/src/lib/crypto/krb/arcfour/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/krb/arcfour/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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
Modified: trunk/src/lib/crypto/krb/checksum/Makefile.in
===================================================================
--- trunk/src/lib/crypto/krb/checksum/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/krb/checksum/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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=
Modified: trunk/src/lib/crypto/krb/crc32/Makefile.in
===================================================================
--- trunk/src/lib/crypto/krb/crc32/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/krb/crc32/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=lib/crypto/krb/crc32
+mydir=lib$(S)crypto$(S)krb$(S)crc32
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
DEFS=
Modified: trunk/src/lib/crypto/krb/dk/Makefile.in
===================================================================
--- trunk/src/lib/crypto/krb/dk/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/krb/dk/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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=
Modified: trunk/src/lib/crypto/krb/old/Makefile.in
===================================================================
--- trunk/src/lib/crypto/krb/old/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/krb/old/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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=
Modified: trunk/src/lib/crypto/krb/prf/Makefile.in
===================================================================
--- trunk/src/lib/crypto/krb/prf/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/krb/prf/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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 \
Modified: trunk/src/lib/crypto/krb/prng/Makefile.in
===================================================================
--- trunk/src/lib/crypto/krb/prng/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/krb/prng/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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 @@
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@
Modified: trunk/src/lib/crypto/krb/prng/fortuna/Makefile.in
===================================================================
--- trunk/src/lib/crypto/krb/prng/fortuna/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/krb/prng/fortuna/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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) \
Modified: trunk/src/lib/crypto/krb/prng/nss/Makefile.in
===================================================================
--- trunk/src/lib/crypto/krb/prng/nss/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/krb/prng/nss/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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)/../.. \
Modified: trunk/src/lib/crypto/krb/prng/yarrow/Makefile.in
===================================================================
--- trunk/src/lib/crypto/krb/prng/yarrow/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/krb/prng/yarrow/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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) \
Modified: trunk/src/lib/crypto/krb/rand2key/Makefile.in
===================================================================
--- trunk/src/lib/crypto/krb/rand2key/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/krb/rand2key/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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=
Modified: trunk/src/lib/crypto/krb/raw/Makefile.in
===================================================================
--- trunk/src/lib/crypto/krb/raw/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/krb/raw/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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=
Modified: trunk/src/lib/crypto/nss/Makefile.in
===================================================================
--- trunk/src/lib/crypto/nss/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/nss/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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_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 @@
aes/OBJS.ST \
camellia/OBJS.ST
-##DOS##LIBOBJS = $(OBJS)
-
all-unix:: all-libobjs
includes:: depend
@@ -60,97 +52,6 @@
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@
Modified: trunk/src/lib/crypto/nss/aes/Makefile.in
===================================================================
--- trunk/src/lib/crypto/nss/aes/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/nss/aes/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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 @@
SRCS=
-##DOS##LIBOBJS = $(OBJS)
-
all-unix:: all-libobjs
includes:: depend
depend:: $(SRCS)
-check::
-
-
clean-unix:: clean-libobjs
-clean::
-
@libobj_frag@
Modified: trunk/src/lib/crypto/nss/camellia/Makefile.in
===================================================================
--- trunk/src/lib/crypto/nss/camellia/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/nss/camellia/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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 @@
SRCS=
-##DOS##LIBOBJS = $(OBJS)
-
all-unix:: all-libobjs
includes:: depend
depend:: $(SRCS)
-check::
-
-
clean-unix:: clean-libobjs
-clean::
-
@libobj_frag@
Modified: trunk/src/lib/crypto/nss/des/Makefile.in
===================================================================
--- trunk/src/lib/crypto/nss/des/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/nss/des/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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 @@
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 @@
$(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@
Modified: trunk/src/lib/crypto/nss/enc_provider/Makefile.in
===================================================================
--- trunk/src/lib/crypto/nss/enc_provider/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/nss/enc_provider/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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 @@
$(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 @@
$(srcdir)/camellia.c \
$(srcdir)/rc4.c
-##DOS##LIBOBJS = $(OBJS)
-
all-unix:: all-libobjs
includes:: depend
Modified: trunk/src/lib/crypto/nss/hash_provider/Makefile.in
===================================================================
--- trunk/src/lib/crypto/nss/hash_provider/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/nss/hash_provider/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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 @@
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 @@
$(srcdir)/hash_md5.c \
$(srcdir)/hash_sha1.c
-##DOS##LIBOBJS = $(OBJS)
-
all-unix:: all-libobjs
includes:: depend
Modified: trunk/src/lib/crypto/nss/md4/Makefile.in
===================================================================
--- trunk/src/lib/crypto/nss/md4/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/nss/md4/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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 @@
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@
Modified: trunk/src/lib/crypto/nss/md5/Makefile.in
===================================================================
--- trunk/src/lib/crypto/nss/md5/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/nss/md5/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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 @@
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@
Modified: trunk/src/lib/crypto/nss/sha1/Makefile.in
===================================================================
--- trunk/src/lib/crypto/nss/sha1/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/nss/sha1/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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 @@
SRCS= $(srcdir)/shs.c
-##DOS##LIBOBJS = $(OBJS)
-
all-unix:: all-libobjs
includes:: depend
depend:: $(SRCS)
-clean::
-
clean-unix:: clean-libobjs
@libobj_frag@
Modified: trunk/src/lib/crypto/nss/sha2/Makefile.in
===================================================================
--- trunk/src/lib/crypto/nss/sha2/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/nss/sha2/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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 @@
SRCS= $(srcdir)/sha2.c
-##DOS##LIBOBJS = $(OBJS)
-
all-unix:: all-libobjs
includes:: depend
depend:: $(SRCS)
-clean::
-
clean-unix:: clean-libobjs
@libobj_frag@
Modified: trunk/src/lib/crypto/openssl/Makefile.in
===================================================================
--- trunk/src/lib/crypto/openssl/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/openssl/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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_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 @@
hash_provider/OBJS.ST \
aes/OBJS.ST
-##DOS##LIBOBJS = $(OBJS)
-
all-unix:: all-libobjs
includes:: depend
@@ -58,85 +50,6 @@
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@
Modified: trunk/src/lib/crypto/openssl/aes/Makefile.in
===================================================================
--- trunk/src/lib/crypto/openssl/aes/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/openssl/aes/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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 @@
SRCS=
-
-##DOS##LIBOBJS = $(OBJS)
-
all-unix:: all-libobjs
includes:: depend
depend:: $(SRCS)
-check::
-
-
clean-unix:: clean-libobjs
-clean::
-
@libobj_frag@
Modified: trunk/src/lib/crypto/openssl/camellia/Makefile.in
===================================================================
--- trunk/src/lib/crypto/openssl/camellia/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/openssl/camellia/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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 @@
SRCS=
-##DOS##LIBOBJS = $(OBJS)
-
all-unix:: all-libobjs
includes:: depend
depend:: $(SRCS)
-check::
-
-
clean-unix:: clean-libobjs
-clean::
-
@libobj_frag@
Modified: trunk/src/lib/crypto/openssl/des/Makefile.in
===================================================================
--- trunk/src/lib/crypto/openssl/des/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/openssl/des/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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 @@
$(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@
Modified: trunk/src/lib/crypto/openssl/enc_provider/Makefile.in
===================================================================
--- trunk/src/lib/crypto/openssl/enc_provider/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/openssl/enc_provider/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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 @@
-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 @@
$(srcdir)/camellia.c \
$(srcdir)/rc4.c
-##DOS##LIBOBJS = $(OBJS)
-
all-unix:: all-libobjs
includes:: depend
@@ -50,4 +44,3 @@
clean-unix:: clean-libobjs
@libobj_frag@
-
Modified: trunk/src/lib/crypto/openssl/hash_provider/Makefile.in
===================================================================
--- trunk/src/lib/crypto/openssl/hash_provider/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/openssl/hash_provider/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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 @@
$(srcdir)/hash_md5.c \
$(srcdir)/hash_sha1.c
-##DOS##LIBOBJS = $(OBJS)
-
all-unix:: all-libobjs
includes:: depend
Modified: trunk/src/lib/crypto/openssl/md4/Makefile.in
===================================================================
--- trunk/src/lib/crypto/openssl/md4/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/openssl/md4/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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 @@
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@
Modified: trunk/src/lib/crypto/openssl/md5/Makefile.in
===================================================================
--- trunk/src/lib/crypto/openssl/md5/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/openssl/md5/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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 @@
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@
Modified: trunk/src/lib/crypto/openssl/sha1/Makefile.in
===================================================================
--- trunk/src/lib/crypto/openssl/sha1/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/openssl/sha1/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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 @@
SRCS= $(srcdir)/shs.c
-##DOS##LIBOBJS = $(OBJS)
-
all-unix:: all-libobjs
includes:: depend
depend:: $(SRCS)
-clean::
-
clean-unix:: clean-libobjs
@libobj_frag@
Modified: trunk/src/lib/crypto/openssl/sha2/Makefile.in
===================================================================
--- trunk/src/lib/crypto/openssl/sha2/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/crypto/openssl/sha2/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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 @@
SRCS= $(srcdir)/sha256.c
-##DOS##LIBOBJS = $(OBJS)
-
all-unix:: all-libobjs
includes:: depend
depend:: $(SRCS)
-clean::
-
clean-unix:: clean-libobjs
@libobj_frag@
Modified: trunk/src/lib/gssapi/Makefile.in
===================================================================
--- trunk/src/lib/gssapi/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/gssapi/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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 @@
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
Modified: trunk/src/lib/gssapi/generic/Makefile.in
===================================================================
--- trunk/src/lib/gssapi/generic/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/gssapi/generic/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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=
Modified: trunk/src/lib/gssapi/krb5/Makefile.in
===================================================================
--- trunk/src/lib/gssapi/krb5/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/gssapi/krb5/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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 @@
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
Modified: trunk/src/lib/gssapi/mechglue/Makefile.in
===================================================================
--- trunk/src/lib/gssapi/mechglue/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/gssapi/mechglue/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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
Modified: trunk/src/lib/gssapi/spnego/Makefile.in
===================================================================
--- trunk/src/lib/gssapi/spnego/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/gssapi/spnego/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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
Modified: trunk/src/lib/kadm5/Makefile.in
===================================================================
--- trunk/src/lib/kadm5/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/kadm5/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=lib/kadm5
+mydir=lib$(S)kadm5
BUILDTOP=$(REL)..$(S)..
SUBDIRS = clnt srv unit-test
DEFS=
Modified: trunk/src/lib/kadm5/clnt/Makefile.in
===================================================================
--- trunk/src/lib/kadm5/clnt/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/kadm5/clnt/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=lib/kadm5/clnt
+mydir=lib$(S)kadm5$(S)clnt
BUILDTOP=$(REL)..$(S)..$(S)..
LOCALINCLUDES = -I$(BUILDTOP)/include/kadm5
DEFS=
Modified: trunk/src/lib/kadm5/srv/Makefile.in
===================================================================
--- trunk/src/lib/kadm5/srv/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/kadm5/srv/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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 \
Modified: trunk/src/lib/kadm5/unit-test/Makefile.in
===================================================================
--- trunk/src/lib/kadm5/unit-test/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/kadm5/unit-test/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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)
Modified: trunk/src/lib/kdb/Makefile.in
===================================================================
--- trunk/src/lib/kdb/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/kdb/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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 ;
Modified: trunk/src/lib/krb5/Makefile.in
===================================================================
--- trunk/src/lib/krb5/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/krb5/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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-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@
Modified: trunk/src/lib/krb5/asn.1/Makefile.in
===================================================================
--- trunk/src/lib/krb5/asn.1/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/krb5/asn.1/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=lib/krb5/asn.1
+mydir=lib$(S)krb5$(S)asn.1
BUILDTOP=$(REL)..$(S)..$(S)..
DEFS=
Modified: trunk/src/lib/krb5/ccache/Makefile.in
===================================================================
--- trunk/src/lib/krb5/ccache/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/krb5/ccache/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=lib/krb5/ccache
+mydir=lib$(S)krb5$(S)ccache
BUILDTOP=$(REL)..$(S)..$(S)..
SUBDIRS = # ccapi
DEFS=
Modified: trunk/src/lib/krb5/ccache/ccapi/Makefile.in
===================================================================
--- trunk/src/lib/krb5/ccache/ccapi/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/krb5/ccache/ccapi/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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
Modified: trunk/src/lib/krb5/error_tables/Makefile.in
===================================================================
--- trunk/src/lib/krb5/error_tables/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/krb5/error_tables/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=lib/krb5/error_tables
+mydir=lib$(S)krb5$(S)error_tables
BUILDTOP=$(REL)..$(S)..$(S)..
DEFS=
Modified: trunk/src/lib/krb5/keytab/Makefile.in
===================================================================
--- trunk/src/lib/krb5/keytab/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/krb5/keytab/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=lib/krb5/keytab
+mydir=lib$(S)krb5$(S)keytab
BUILDTOP=$(REL)..$(S)..$(S)..
DEFS=
Modified: trunk/src/lib/krb5/krb/Makefile.in
===================================================================
--- trunk/src/lib/krb5/krb/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/krb5/krb/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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)
Modified: trunk/src/lib/krb5/os/Makefile.in
===================================================================
--- trunk/src/lib/krb5/os/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/krb5/os/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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)
Modified: trunk/src/lib/krb5/rcache/Makefile.in
===================================================================
--- trunk/src/lib/krb5/rcache/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/krb5/rcache/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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)
Modified: trunk/src/lib/krb5/unicode/Makefile.in
===================================================================
--- trunk/src/lib/krb5/unicode/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/krb5/unicode/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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)
Modified: trunk/src/lib/rpc/Makefile.in
===================================================================
--- trunk/src/lib/rpc/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/rpc/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=lib/rpc
+mydir=lib$(S)rpc
BUILDTOP=$(REL)..$(S)..
DEFINES = -DGSSAPI_KRB5 -DDEBUG_GSSAPI=0 -DGSSRPC__IMPL
DEFS=
Modified: trunk/src/lib/rpc/unit-test/Makefile.in
===================================================================
--- trunk/src/lib/rpc/unit-test/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/lib/rpc/unit-test/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -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)
Modified: trunk/src/plugins/authdata/greet/Makefile.in
===================================================================
--- trunk/src/plugins/authdata/greet/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/plugins/authdata/greet/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=plugins/authdata/greet
+mydir=plugins$(S)authdata$(S)greet
BUILDTOP=$(REL)..$(S)..$(S)..
KRB5_RUN_ENV = @KRB5_RUN_ENV@
KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
Modified: trunk/src/plugins/authdata/greet_client/Makefile.in
===================================================================
--- trunk/src/plugins/authdata/greet_client/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/plugins/authdata/greet_client/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=plugins/authdata/greet_client
+mydir=plugins$(S)authdata$(S)greet_client
BUILDTOP=$(REL)..$(S)..$(S)..
KRB5_RUN_ENV = @KRB5_RUN_ENV@
KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
Modified: trunk/src/plugins/authdata/greet_server/Makefile.in
===================================================================
--- trunk/src/plugins/authdata/greet_server/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/plugins/authdata/greet_server/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=plugins/authdata/greet_server
+mydir=plugins$(S)authdata$(S)greet_server
BUILDTOP=$(REL)..$(S)..$(S)..
KRB5_RUN_ENV = @KRB5_RUN_ENV@
KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
Modified: trunk/src/plugins/kadm5_hook/test/Makefile.in
===================================================================
--- trunk/src/plugins/kadm5_hook/test/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/plugins/kadm5_hook/test/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=plugins/kadm5_hook/test
+mydir=plugins$(S)kadm5_hook$(S)test
BUILDTOP=$(REL)..$(S)..$(S)..
KRB5_RUN_ENV = @KRB5_RUN_ENV@
KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
Modified: trunk/src/plugins/kdb/db2/Makefile.in
===================================================================
--- trunk/src/plugins/kdb/db2/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/plugins/kdb/db2/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=plugins/kdb/db2
+mydir=plugins$(S)kdb$(S)db2
BUILDTOP=$(REL)..$(S)..$(S)..
KRB5_RUN_ENV = @KRB5_RUN_ENV@
KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
Modified: trunk/src/plugins/kdb/db2/libdb2/Makefile.in
===================================================================
--- trunk/src/plugins/kdb/db2/libdb2/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/plugins/kdb/db2/libdb2/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=plugins/kdb/db2/libdb2
+mydir=plugins$(S)kdb$(S)db2$(S)libdb2
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
SUBDIRS=hash btree db mpool recno test
Modified: trunk/src/plugins/kdb/db2/libdb2/btree/Makefile.in
===================================================================
--- trunk/src/plugins/kdb/db2/libdb2/btree/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/plugins/kdb/db2/libdb2/btree/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=plugins/kdb/db2/libdb2/btree
+mydir=plugins$(S)kdb$(S)db2$(S)libdb2$(S)btree
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
STLIBOBJS= bt_close.o bt_conv.o bt_debug.o bt_delete.o bt_get.o \
bt_open.o bt_overflow.o bt_page.o bt_put.o bt_search.o \
Modified: trunk/src/plugins/kdb/db2/libdb2/db/Makefile.in
===================================================================
--- trunk/src/plugins/kdb/db2/libdb2/db/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/plugins/kdb/db2/libdb2/db/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=plugins/kdb/db2/libdb2/db
+mydir=plugins$(S)kdb$(S)db2$(S)libdb2$(S)db
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
STLIBOBJS=db.o
Modified: trunk/src/plugins/kdb/db2/libdb2/hash/Makefile.in
===================================================================
--- trunk/src/plugins/kdb/db2/libdb2/hash/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/plugins/kdb/db2/libdb2/hash/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=plugins/kdb/db2/libdb2/hash
+mydir=plugins$(S)kdb$(S)db2$(S)libdb2$(S)hash
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
STLIBOBJS= hash.o hash_bigkey.o hash_debug.o hash_func.o hash_log2.o \
hash_page.o hsearch.o dbm.o
Modified: trunk/src/plugins/kdb/db2/libdb2/mpool/Makefile.in
===================================================================
--- trunk/src/plugins/kdb/db2/libdb2/mpool/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/plugins/kdb/db2/libdb2/mpool/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=plugins/kdb/db2/libdb2/mpool
+mydir=plugins$(S)kdb$(S)db2$(S)libdb2$(S)mpool
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
STLIBOBJS=mpool.o
Modified: trunk/src/plugins/kdb/db2/libdb2/recno/Makefile.in
===================================================================
--- trunk/src/plugins/kdb/db2/libdb2/recno/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/plugins/kdb/db2/libdb2/recno/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=plugins/kdb/db2/libdb2/recno
+mydir=plugins$(S)kdb$(S)db2$(S)libdb2$(S)recno
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
STLIBOBJS= rec_close.o rec_delete.o rec_get.o rec_open.o rec_put.o \
rec_search.o rec_seq.o rec_utils.o
Modified: trunk/src/plugins/kdb/db2/libdb2/test/Makefile.in
===================================================================
--- trunk/src/plugins/kdb/db2/libdb2/test/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/plugins/kdb/db2/libdb2/test/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=plugins/kdb/db2/libdb2/test
+mydir=plugins$(S)kdb$(S)db2$(S)libdb2$(S)test
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
FCTSH = @FCTSH@
Modified: trunk/src/plugins/kdb/hdb/Makefile.in
===================================================================
--- trunk/src/plugins/kdb/hdb/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/plugins/kdb/hdb/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=plugins/kdb/hdb
+mydir=plugins$(S)kdb$(S)hdb
BUILDTOP=$(REL)..$(S)..$(S)..
KRB5_RUN_ENV = @KRB5_RUN_ENV@
KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
Modified: trunk/src/plugins/kdb/ldap/Makefile.in
===================================================================
--- trunk/src/plugins/kdb/ldap/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/plugins/kdb/ldap/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=plugins/kdb/ldap
+mydir=plugins$(S)kdb$(S)ldap
BUILDTOP=$(REL)..$(S)..$(S)..
KRB5_RUN_ENV = @KRB5_RUN_ENV@
KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
Modified: trunk/src/plugins/kdb/ldap/ldap_util/Makefile.in
===================================================================
--- trunk/src/plugins/kdb/ldap/ldap_util/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/plugins/kdb/ldap/ldap_util/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=plugins/kdb/ldap/ldap_util
+mydir=plugins$(S)kdb$(S)ldap$(S)ldap_util
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
DEFINES = -DKDB4_DISABLE
DEFS=
Modified: trunk/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in
===================================================================
--- trunk/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=plugins/kdb/ldap/libkdb_ldap
+mydir=plugins$(S)kdb$(S)ldap$(S)libkdb_ldap
BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
KRB5_RUN_ENV = @KRB5_RUN_ENV@
KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
Modified: trunk/src/plugins/locate/python/Makefile.in
===================================================================
--- trunk/src/plugins/locate/python/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/plugins/locate/python/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=plugins/locate/python
+mydir=plugins$(S)locate$(S)python
BUILDTOP=$(REL)..$(S)..$(S)..
LIBBASE=python
Modified: trunk/src/plugins/preauth/cksum_body/Makefile.in
===================================================================
--- trunk/src/plugins/preauth/cksum_body/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/plugins/preauth/cksum_body/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=plugins/preauth/cksum_body
+mydir=plugins$(S)preauth$(S)cksum_body
BUILDTOP=$(REL)..$(S)..$(S)..
KRB5_RUN_ENV = @KRB5_RUN_ENV@
KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
Modified: trunk/src/plugins/preauth/encrypted_challenge/Makefile.in
===================================================================
--- trunk/src/plugins/preauth/encrypted_challenge/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/plugins/preauth/encrypted_challenge/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=plugins/preauth/encrypted_challenge
+mydir=plugins$(S)preauth$(S)encrypted_challenge
BUILDTOP=$(REL)..$(S)..$(S)..
KRB5_RUN_ENV = @KRB5_RUN_ENV@
KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
Modified: trunk/src/plugins/preauth/pkinit/Makefile.in
===================================================================
--- trunk/src/plugins/preauth/pkinit/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/plugins/preauth/pkinit/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=plugins/preauth/pkinit
+mydir=plugins$(S)preauth$(S)pkinit
BUILDTOP=$(REL)..$(S)..$(S)..
KRB5_RUN_ENV = @KRB5_RUN_ENV@
KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
Modified: trunk/src/plugins/preauth/securid_sam2/Makefile.in
===================================================================
--- trunk/src/plugins/preauth/securid_sam2/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/plugins/preauth/securid_sam2/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=plugins/preauth/securid_sam2
+mydir=plugins$(S)preauth$(S)securid_sam2
BUILDTOP=$(REL)..$(S)..$(S)..
KRB5_RUN_ENV = @KRB5_RUN_ENV@
KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
Modified: trunk/src/plugins/preauth/wpse/Makefile.in
===================================================================
--- trunk/src/plugins/preauth/wpse/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/plugins/preauth/wpse/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=plugins/preauth/wpse
+mydir=plugins$(S)preauth$(S)wpse
BUILDTOP=$(REL)..$(S)..$(S)..
KRB5_RUN_ENV = @KRB5_RUN_ENV@
KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
Modified: trunk/src/tests/asn.1/Makefile.in
===================================================================
--- trunk/src/tests/asn.1/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/tests/asn.1/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=tests/asn.1
+mydir=tests$(S)asn.1
BUILDTOP=$(REL)..$(S)..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
Modified: trunk/src/tests/create/Makefile.in
===================================================================
--- trunk/src/tests/create/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/tests/create/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=tests/create
+mydir=tests$(S)create
BUILDTOP=$(REL)..$(S)..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
Modified: trunk/src/tests/dejagnu/Makefile.in
===================================================================
--- trunk/src/tests/dejagnu/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/tests/dejagnu/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=tests/dejagnu
+mydir=tests$(S)dejagnu
BUILDTOP=$(REL)..$(S)..
RUNTEST = @RUNTEST@ $(DEJAFLAGS)
RUNTESTFLAGS =
Modified: trunk/src/tests/gss-threads/Makefile.in
===================================================================
--- trunk/src/tests/gss-threads/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/tests/gss-threads/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,6 +1,6 @@
# Derived from appl/gss-sample, January 2005.
-mydir=tests/gss-threads
+mydir=tests$(S)gss-threads
BUILDTOP=$(REL)..$(S)..
DEFINES = -DUSE_AUTOCONF_H -DGSSAPI_V2
PROG_LIBPATH=-L$(TOPLIBD)
Modified: trunk/src/tests/gssapi/Makefile.in
===================================================================
--- trunk/src/tests/gssapi/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/tests/gssapi/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=tests/gssapi
+mydir=tests$(S)gssapi
BUILDTOP=$(REL)..$(S)..
DEFINES = -DUSE_AUTOCONF_H
PROG_LIBPATH=-L$(TOPLIBD)
Modified: trunk/src/tests/hammer/Makefile.in
===================================================================
--- trunk/src/tests/hammer/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/tests/hammer/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=tests/hammer
+mydir=tests$(S)hammer
BUILDTOP=$(REL)..$(S)..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
Modified: trunk/src/tests/misc/Makefile.in
===================================================================
--- trunk/src/tests/misc/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/tests/misc/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=tests/misc
+mydir=tests$(S)misc
BUILDTOP=$(REL)..$(S)..
RUN_SETUP = @KRB5_RUN_ENV@
PROG_LIBPATH=-L$(TOPLIBD)
Modified: trunk/src/tests/mkeystash_compat/Makefile.in
===================================================================
--- trunk/src/tests/mkeystash_compat/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/tests/mkeystash_compat/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=tests/mkeystash_compat
+mydir=tests$(S)mkeystash_compat
BUILDTOP=$(REL)..$(S)..
RUN_SETUP = @KRB5_RUN_ENV@ KRB5_KDC_PROFILE=kdc.conf KRB5_CONFIG=krb5.conf
Modified: trunk/src/tests/resolve/Makefile.in
===================================================================
--- trunk/src/tests/resolve/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/tests/resolve/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=tests/resolve
+mydir=tests$(S)resolve
BUILDTOP=$(REL)..$(S)..
RUN_SETUP = @KRB5_RUN_ENV@
PROG_LIBPATH=-L$(TOPLIBD)
Modified: trunk/src/tests/shlib/Makefile.in
===================================================================
--- trunk/src/tests/shlib/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/tests/shlib/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=tests/shlib
+mydir=tests$(S)shlib
BUILDTOP=$(REL)..$(S)..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
Modified: trunk/src/tests/threads/Makefile.in
===================================================================
--- trunk/src/tests/threads/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/tests/threads/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=tests/threads
+mydir=tests$(S)threads
BUILDTOP=$(REL)..$(S)..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
Modified: trunk/src/tests/verify/Makefile.in
===================================================================
--- trunk/src/tests/verify/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/tests/verify/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=tests/verify
+mydir=tests$(S)verify
BUILDTOP=$(REL)..$(S)..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
Modified: trunk/src/util/Makefile.in
===================================================================
--- trunk/src/util/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/util/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,12 +1,12 @@
mydir=util
-##WIN32###Windows NMAKE doesn't like @ in make variable names, and on
-##WIN32### Windows we don't do the @FOO@ substitutions we do with UNIX
-##WIN32### configure scripts. The set of subdirs to use is hard-coded
-##WIN32### below in the 'all-windows' target anyways, so just hide this.
+# Windows NMAKE doesn't like @ in make variable names, and on
+# Windows we don't do the @FOO@ substitutions we do with UNIX
+# configure scripts, so hide this.
##WIN32##!if 0
SUBDIRS=support $(MAYBE_ET_ at COM_ERR_VERSION@) $(MAYBE_SS_ at SS_VERSION@) \
profile send-pr
##WIN32##!endif
+WINSUBDIRS=windows support et profile
BUILDTOP=$(REL)..
MAYBE_ET_k5 = et
@@ -20,32 +20,6 @@
$(RM) -r $(FAKEPREFIX)
NO_OUTDIR=1
-all-windows::
- @echo Making in util\windows
- cd windows
- $(MAKE) -$(MFLAGS)
- @echo Making in util\support
- cd ..\support
- $(MAKE) -$(MFLAGS)
- @echo Making in util\et
- cd ..\et
- $(MAKE) -$(MFLAGS)
- @echo Making in util\profile
- cd ..\profile
- $(MAKE) -$(MFLAGS)
- cd ..
-clean-windows::
- @echo Making clean in util\windows
- cd windows
- $(MAKE) -$(MFLAGS) clean
- @echo Making clean in util\et
- cd ..\et
- $(MAKE) -$(MFLAGS) clean
- @echo Making clean in util\profile
- cd ..\profile
- $(MAKE) -$(MFLAGS) clean
- cd ..
-
install::
@echo nothing to install in util
Modified: trunk/src/util/collected-client-lib/Makefile.in
===================================================================
--- trunk/src/util/collected-client-lib/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/util/collected-client-lib/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=util/collected-client-lib
+mydir=util$(S)collected-client-lib
BUILDTOP=$(REL)..$(S)..
RELDIR=../util/collected-client-lib
DEFS=
Modified: trunk/src/util/et/Makefile.in
===================================================================
--- trunk/src/util/et/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/util/et/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -2,7 +2,7 @@
bindir=@bindir@
datadir=@datadir@
mydatadir=$(datadir)/et
-mydir=util/et
+mydir=util$(S)et
BUILDTOP=$(REL)..$(S)..
RELDIR=../util/et
SED = sed
Modified: trunk/src/util/profile/Makefile.in
===================================================================
--- trunk/src/util/profile/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/util/profile/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=util/profile
+mydir=util$(S)profile
BUILDTOP=$(REL)..$(S)..
PROG_LIBPATH=-L$(TOPLIBD) $(TCL_LIBPATH) -L.
PROG_RPATH=$(KRB5_LIBDIR)$(TCL_RPATH)
Modified: trunk/src/util/send-pr/Makefile.in
===================================================================
--- trunk/src/util/send-pr/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/util/send-pr/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=util/send-pr
+mydir=util$(S)send-pr
BUILDTOP=$(REL)..$(S)..
#
# Makefile for building a standalone send-pr.
Modified: trunk/src/util/ss/Makefile.in
===================================================================
--- trunk/src/util/ss/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/util/ss/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=util/ss
+mydir=util$(S)ss
BUILDTOP=$(REL)..$(S)..
SED = sed
DEFS=
Modified: trunk/src/util/support/Makefile.in
===================================================================
--- trunk/src/util/support/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/util/support/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,4 +1,4 @@
-mydir=util/support
+mydir=util$(S)support
BUILDTOP=$(REL)..$(S)..
RELDIR=../util/support
DEFS=
Modified: trunk/src/windows/Makefile.in
===================================================================
--- trunk/src/windows/Makefile.in 2010-11-26 16:37:14 UTC (rev 24535)
+++ trunk/src/windows/Makefile.in 2010-11-28 01:36:42 UTC (rev 24536)
@@ -1,51 +1,6 @@
BUILDTOP=..
NO_OUTPRE=1
-
-#
-# Makefile that recurses into cns subdirectory.
-#
-all-windows::
- @echo Making in windows\lib
- cd lib
- $(MAKE) -$(MFLAGS)
- @echo Making in windows\cns
- cd ..\cns
- $(MAKE) -$(MFLAGS)
- @echo Making in windows\gss
- cd ..\gss
- $(MAKE) -$(MFLAGS)
- @echo Making in windows\gina
- cd ..\gina
- $(MAKE) -$(MFLAGS)
- @echo Making in windows\ms2mit
- cd ..\ms2mit
- $(MAKE) -$(MFLAGS)
-!if "$(KRB5_KFW_COMPILE)"=="1"
- @echo Making in windows\kfwlogon
- cd ..\kfwlogon
- $(MAKE) -$(MFLAGS)
-!endif
- cd ..
-
-clean-windows::
- @echo Making clean in windows\lib
- cd lib
- $(MAKE) -$(MFLAGS) clean
- @echo Making clean in windows\cns
- cd ..\cns
- $(MAKE) -$(MFLAGS) clean
- @echo Making clean in windows\gss
- cd ..\gss
- $(MAKE) -$(MFLAGS) clean
- @echo Making clean in windows\gina
- cd ..\gina
- $(MAKE) -$(MFLAGS) clean
- @echo Making clean in windows\ms2mit
- cd ..\ms2mit
- $(MAKE) -$(MFLAGS) clean
-!if "$(KRB5_KFW_COMPILE)"=="1"
- @echo Making clean in windows\kfwlogon
- cd ..\kfwlogon
- $(MAKE) -$(MFLAGS) clean
-!endif
- cd ..
+!if "$(KRB5_KFW_COMPILE)"=="1"
+KFWLOGON= kfwlogon
+!endif
+SUBDIRS= lib cns gss gina ms2mit $(KFWLOGON)
More information about the cvs-krb5
mailing list