Use for loops for recursion in the Windows build, cutting down on the
authorGreg Hudson <ghudson@mit.edu>
Sun, 28 Nov 2010 01:36:42 +0000 (01:36 +0000)
committerGreg Hudson <ghudson@mit.edu>
Sun, 28 Nov 2010 01:36:42 +0000 (01:36 +0000)
verbiage in Makefile.in files.  For correctness of output, every
Makefile.in mydir= definition is changed to use $(S) instead of /.

ticket: 6826

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

145 files changed:
src/Makefile.in
src/appl/Makefile.in
src/appl/gss-sample/Makefile.in
src/appl/sample/Makefile.in
src/appl/sample/sclient/Makefile.in
src/appl/sample/sserver/Makefile.in
src/appl/simple/Makefile.in
src/appl/simple/client/Makefile.in
src/appl/simple/server/Makefile.in
src/appl/user_user/Makefile.in
src/ccapi/Makefile.in
src/ccapi/common/Makefile.in
src/ccapi/common/unix/Makefile.in
src/ccapi/lib/Makefile.in
src/ccapi/lib/unix/Makefile.in
src/ccapi/server/Makefile.in
src/ccapi/server/unix/Makefile.in
src/ccapi/server/win/Makefile.in
src/clients/Makefile.in
src/clients/kdestroy/Makefile.in
src/clients/kinit/Makefile.in
src/clients/klist/Makefile.in
src/clients/kpasswd/Makefile.in
src/clients/ksu/Makefile.in
src/clients/kvno/Makefile.in
src/config/win-post.in
src/include/Makefile.in
src/kadmin/cli/Makefile.in
src/kadmin/dbutil/Makefile.in
src/kadmin/ktutil/Makefile.in
src/kadmin/server/Makefile.in
src/kadmin/testing/Makefile.in
src/kadmin/testing/scripts/Makefile.in
src/kadmin/testing/util/Makefile.in
src/lib/Makefile.in
src/lib/apputils/Makefile.in
src/lib/crypto/Makefile.in
src/lib/crypto/builtin/Makefile.in
src/lib/crypto/builtin/aes/Makefile.in
src/lib/crypto/builtin/camellia/Makefile.in
src/lib/crypto/builtin/des/Makefile.in
src/lib/crypto/builtin/enc_provider/Makefile.in
src/lib/crypto/builtin/hash_provider/Makefile.in
src/lib/crypto/builtin/md4/Makefile.in
src/lib/crypto/builtin/md5/Makefile.in
src/lib/crypto/builtin/sha1/Makefile.in
src/lib/crypto/builtin/sha2/Makefile.in
src/lib/crypto/crypto_tests/Makefile.in
src/lib/crypto/krb/Makefile.in
src/lib/crypto/krb/arcfour/Makefile.in
src/lib/crypto/krb/checksum/Makefile.in
src/lib/crypto/krb/crc32/Makefile.in
src/lib/crypto/krb/dk/Makefile.in
src/lib/crypto/krb/old/Makefile.in
src/lib/crypto/krb/prf/Makefile.in
src/lib/crypto/krb/prng/Makefile.in
src/lib/crypto/krb/prng/fortuna/Makefile.in
src/lib/crypto/krb/prng/nss/Makefile.in
src/lib/crypto/krb/prng/yarrow/Makefile.in
src/lib/crypto/krb/rand2key/Makefile.in
src/lib/crypto/krb/raw/Makefile.in
src/lib/crypto/nss/Makefile.in
src/lib/crypto/nss/aes/Makefile.in
src/lib/crypto/nss/camellia/Makefile.in
src/lib/crypto/nss/des/Makefile.in
src/lib/crypto/nss/enc_provider/Makefile.in
src/lib/crypto/nss/hash_provider/Makefile.in
src/lib/crypto/nss/md4/Makefile.in
src/lib/crypto/nss/md5/Makefile.in
src/lib/crypto/nss/sha1/Makefile.in
src/lib/crypto/nss/sha2/Makefile.in
src/lib/crypto/openssl/Makefile.in
src/lib/crypto/openssl/aes/Makefile.in
src/lib/crypto/openssl/camellia/Makefile.in
src/lib/crypto/openssl/des/Makefile.in
src/lib/crypto/openssl/enc_provider/Makefile.in
src/lib/crypto/openssl/hash_provider/Makefile.in
src/lib/crypto/openssl/md4/Makefile.in
src/lib/crypto/openssl/md5/Makefile.in
src/lib/crypto/openssl/sha1/Makefile.in
src/lib/crypto/openssl/sha2/Makefile.in
src/lib/gssapi/Makefile.in
src/lib/gssapi/generic/Makefile.in
src/lib/gssapi/krb5/Makefile.in
src/lib/gssapi/mechglue/Makefile.in
src/lib/gssapi/spnego/Makefile.in
src/lib/kadm5/Makefile.in
src/lib/kadm5/clnt/Makefile.in
src/lib/kadm5/srv/Makefile.in
src/lib/kadm5/unit-test/Makefile.in
src/lib/kdb/Makefile.in
src/lib/krb5/Makefile.in
src/lib/krb5/asn.1/Makefile.in
src/lib/krb5/ccache/Makefile.in
src/lib/krb5/ccache/ccapi/Makefile.in
src/lib/krb5/error_tables/Makefile.in
src/lib/krb5/keytab/Makefile.in
src/lib/krb5/krb/Makefile.in
src/lib/krb5/os/Makefile.in
src/lib/krb5/rcache/Makefile.in
src/lib/krb5/unicode/Makefile.in
src/lib/rpc/Makefile.in
src/lib/rpc/unit-test/Makefile.in
src/plugins/authdata/greet/Makefile.in
src/plugins/authdata/greet_client/Makefile.in
src/plugins/authdata/greet_server/Makefile.in
src/plugins/kadm5_hook/test/Makefile.in
src/plugins/kdb/db2/Makefile.in
src/plugins/kdb/db2/libdb2/Makefile.in
src/plugins/kdb/db2/libdb2/btree/Makefile.in
src/plugins/kdb/db2/libdb2/db/Makefile.in
src/plugins/kdb/db2/libdb2/hash/Makefile.in
src/plugins/kdb/db2/libdb2/mpool/Makefile.in
src/plugins/kdb/db2/libdb2/recno/Makefile.in
src/plugins/kdb/db2/libdb2/test/Makefile.in
src/plugins/kdb/hdb/Makefile.in
src/plugins/kdb/ldap/Makefile.in
src/plugins/kdb/ldap/ldap_util/Makefile.in
src/plugins/kdb/ldap/libkdb_ldap/Makefile.in
src/plugins/locate/python/Makefile.in
src/plugins/preauth/cksum_body/Makefile.in
src/plugins/preauth/encrypted_challenge/Makefile.in
src/plugins/preauth/pkinit/Makefile.in
src/plugins/preauth/securid_sam2/Makefile.in
src/plugins/preauth/wpse/Makefile.in
src/tests/asn.1/Makefile.in
src/tests/create/Makefile.in
src/tests/dejagnu/Makefile.in
src/tests/gss-threads/Makefile.in
src/tests/gssapi/Makefile.in
src/tests/hammer/Makefile.in
src/tests/misc/Makefile.in
src/tests/mkeystash_compat/Makefile.in
src/tests/resolve/Makefile.in
src/tests/shlib/Makefile.in
src/tests/threads/Makefile.in
src/tests/verify/Makefile.in
src/util/Makefile.in
src/util/collected-client-lib/Makefile.in
src/util/et/Makefile.in
src/util/profile/Makefile.in
src/util/send-pr/Makefile.in
src/util/ss/Makefile.in
src/util/support/Makefile.in
src/windows/Makefile.in

index 5a78c77bbfcb68ad68f3904a38164e07dbf6a0ac..deb5410149fb28cb2bc26f61eb7e129fc8b3a6d0 100644 (file)
@@ -16,6 +16,7 @@ SUBDIRS=util include lib \
        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 @@ config.status: $(top_srcdir)/config/shlib.conf
 ##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 @@ WINMAKEFILES=Makefile \
 ##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.
index 015961110d655411453fd1022c12f1ccfa0bb868..32fe175c317d08ee42a165145a2eee6860ea81fe 100644 (file)
@@ -2,15 +2,4 @@ mydir=appl
 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
index 301f05cc9d71d2246a5fea135050afa60fe197df..87931b94d173591b52bca978f729b32cd2774f80 100644 (file)
@@ -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)
index dde058f553e7cdcf3f74b2770b0fad2277340525..63ac42e4727c7456bff5a7f464a490d93a4a76c2 100644 (file)
@@ -1,3 +1,3 @@
-mydir=appl/sample
+mydir=appl$(S)sample
 SUBDIRS = sclient sserver
 BUILDTOP=$(REL)..$(S)..
index 481d81e8537a418b3d07f018174b5b9952bdab0f..59d897446cf8c4065f33c8c40399b2ea62c17d92 100644 (file)
@@ -1,4 +1,4 @@
-mydir=appl/sample/sclient
+mydir=appl$(S)sample$(S)sclient
 
 BUILDTOP=$(REL)..$(S)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
index 01265331b1ff8030ae76c538ae647f5044a9dc0e..096dc7a63a5fec41d0571a8e5a279025b7bdfcd7 100644 (file)
@@ -1,4 +1,4 @@
-mydir=appl/sample/sserver
+mydir=appl$(S)sample$(S)sserver
 
 BUILDTOP=$(REL)..$(S)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
index 7681efb685d23a733bcb2384950ac02cf069c728..a6056167f4487557a51eb3646ac94c5f7f184bf3 100644 (file)
@@ -1,3 +1,3 @@
-mydir=appl/simple
+mydir=appl$(S)simple
 SUBDIRS = client server
 BUILDTOP=$(REL)..$(S)..
index 3e53f5e138395e677be484d2cda643a0ba65e88f..c357c1253c3c26f2d5276039165512380bca5be6 100644 (file)
@@ -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)
index ef64bed6d8e461c30a817b27ce812a04ac73886e..1795bc8960418801d7c744402fa7b13bf85644db 100644 (file)
@@ -1,4 +1,4 @@
-mydir=appl/simple/server
+mydir=appl$(S)simple$(S)server
 BUILDTOP=$(REL)..$(S)..$(S)..
 
 LOCALINCLUDES= -I.. -I$(srcdir)/..
index 0d45a18648a0842712e8d4d5bd0df596fed2312f..381ece63c8793c2886b50a8c920b144de1e0d2da 100644 (file)
@@ -1,4 +1,4 @@
-mydir=appl/user_user
+mydir=appl$(S)user_user
 BUILDTOP=$(REL)..$(S)..
 DEFINES = -DDEBUG
 PROG_LIBPATH=-L$(TOPLIBD)
index 43d5fc081043ac65a308d1fc47f2ae460a863059..3f80d87e1aba06ab494e03bfe8303fa76a499a37 100644 (file)
@@ -2,32 +2,4 @@ mydir=ccapi
 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
index 7693485e3de01fa3ea3ddc2d1269e17e906d1236..5a6e5fdd5d717c22dcf26784a621466afc6eed61 100644 (file)
@@ -1,4 +1,4 @@
-mydir=ccapi/common
+mydir=ccapi$(S)common
 BUILDTOP=$(REL)..$(S)..
 SUBDIRS=unix
 
index 4b176fc8090a38509cd85d908a3e35633f189291..b2ebc9049b002a98d69a0cc2383514b8f09e3447 100644 (file)
@@ -1,4 +1,4 @@
-mydir=ccapi/common/unix
+mydir=ccapi$(S)common$(S)unix
 BUILDTOP=$(REL)..$(S)..$(S)..
 
 STLIBOBJS=
index 1e2e13d369b22e202b84ab8d075a944f21968a39..f2655488e6484fd6c7920c2ae7f142f7bdca3b4c 100644 (file)
@@ -1,4 +1,4 @@
-mydir=ccapi/lib
+mydir=ccapi$(S)lib
 BUILDTOP=$(REL)..$(S)..
 SUBDIRS=unix
 LOCALINCLUDES=-I$(srcdir)/../common -I.
index 8a043c92a0e01e9a128eb7fbe701ed56347961b3..455b6b7b1e92cdbc99180e1e64130dd803d870ea 100644 (file)
@@ -1,4 +1,4 @@
-mydir=ccapi/lib/unix
+mydir=ccapi$(S)lib$(S)unix
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES= -I$(srcdir)/.. -I$(srcdir)/../../common
 
index 0ca140ba6f01aa52ce071e5c11fd9f4646e9437c..0cfa43a3acea5a3dad88e9c5daf99243bacfc8ba 100644 (file)
@@ -1,4 +1,4 @@
-mydir=ccapi/server
+mydir=ccapi$(S)server
 BUILDTOP=$(REL)..$(S)..
 SUBDIRS=unix
 
index 526826030eb70c3234874894a4cfe58f3ebced5b..1d45a5fc1ebcc764ca538e508064ba119b61d8e0 100644 (file)
@@ -1,4 +1,4 @@
-mydir=ccapi/server/unix
+mydir=ccapi$(S)server$(S)unix
 BUILDTOP=$(REL)..$(S)..$(S)..
 
 STLIBOBJS=
index 36909b85ebae76179b8f5a3f83265bcf2f1263ac..d5da00136b99590b5af8f61554d34a2ea2db291c 100644 (file)
@@ -106,4 +106,4 @@ clean::
        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)
index 891da9e20aacdfbb22580269341aff2feb492b2b..4ae8361946bca219f58e0579942ef64a2c56359a 100644 (file)
@@ -2,52 +2,6 @@ mydir=clients
 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 ..
index 64a2dff5650370e5895e051f6c4b0d89380710c7..b3bb0b28120a8ec306cc1483d3b700b3557208da 100644 (file)
@@ -1,4 +1,4 @@
-mydir=clients/kdestroy
+mydir=clients$(S)kdestroy
 BUILDTOP=$(REL)..$(S)..
 DEFS=
 
index d60b1c7ae53002030cfc02bd1066fa378fc40030..aeaba560fb70ca75c31d3a6774a0bbb7c7e4426f 100644 (file)
@@ -1,4 +1,4 @@
-mydir=clients/kinit
+mydir=clients$(S)kinit
 BUILDTOP=$(REL)..$(S)..
 DEFS=
 
index af437506301e6e73eabf9ea8ff25e70fe3f3eeb3..c2b4d412a37d771779096c1df339fd0ff8393476 100644 (file)
@@ -1,4 +1,4 @@
-mydir=clients/klist
+mydir=clients$(S)klist
 BUILDTOP=$(REL)..$(S)..
 DEFS=
 
index d53b9221687e1671afe40493c73db5444e0f7989..50abc89c60565e1a52abd7fbf7b237b115fc03de 100644 (file)
@@ -1,4 +1,4 @@
-mydir=clients/kpasswd
+mydir=clients$(S)kpasswd
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
index daf9059e9dce25c96c7412b103483f8b6429849d..9309b97ac6d6b5f1c4ede7351700219a1190cc2a 100644 (file)
@@ -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=
index bbbb79c7af68e347ea930fadf020b13daf32c515..741c738442992969905ce45fbb09949fb6ac5082 100644 (file)
@@ -1,4 +1,4 @@
-mydir=clients/kvno
+mydir=clients$(S)kvno
 BUILDTOP=$(REL)..$(S)..
 DEFS=
 
index 151fac6873b01584722a49557c5e4946929eaea7..6046e627e34587034ec93b15b03955e325273c15 100644 (file)
@@ -34,7 +34,36 @@ Makefile: Makefile.in $(BUILDTOP)\config\win-pre.in $(BUILDTOP)\config\win-post.
        $(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 @@ OBJFILE=$(WIN64OBJFILE)
 !endif
 !endif
 
+# Build a library if LIBNAME is defined.
 !if defined(LIBNAME)
 
 !if !defined(OBJFILELIST)
@@ -59,6 +89,7 @@ $(LIBNAME): $(OBJFILEDEP)
 !endif # LIBNAME
 
 
+# Build an object file list if OBJFILE is defined.
 !if defined(OBJFILE)
 all-windows:: $(OBJFILE)
 !if defined(LIBOBJS)
@@ -76,17 +107,6 @@ $(OBJFILE): $(LIBOBJS)
 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
 
 
index 5c178a24af9cdaf05f2594b849f2f8f606f29bca..547fac31baed1f826341dff9858cb8f4692b1179 100644 (file)
@@ -121,8 +121,9 @@ clean-unix::
 
 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
 
index b5f54287e9318e956c9658d45bf370875c201fc4..c7ba8312e6e3892e29c228e8230347b24ad7c030 100644 (file)
@@ -1,4 +1,4 @@
-mydir=kadmin/cli
+mydir=kadmin$(S)cli
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
index 454077069035e305a26850148b7c092686820a76..2c13827e1358151d419ed7e3396fbf1e3bbb806e 100644 (file)
@@ -1,4 +1,4 @@
-mydir=kadmin/dbutil
+mydir=kadmin$(S)dbutil
 BUILDTOP=$(REL)..$(S)..
 DEFS=
 LOCALINCLUDES = -I.
index 607e58a536883e04a9c5ee60d868e6cddfb890e7..930b1efc820974ddc0dd7d3e2aa4953d6cba35bf 100644 (file)
@@ -1,4 +1,4 @@
-mydir=kadmin/ktutil
+mydir=kadmin$(S)ktutil
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
index d3111da4a119407e911a9a75acba968c297469c9..7872872d573254aa3849fe268c03d0eeae3f8844 100644 (file)
@@ -1,4 +1,4 @@
-mydir=kadmin/server
+mydir=kadmin$(S)server
 BUILDTOP=$(REL)..$(S)..
 KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS)
 DEFS=
index 1f154ec55be88f87e8296da40afe59ce3d4aa33a..0681e8eca7f79d0444d21256bb7a3d32aa8d9f87 100644 (file)
@@ -1,4 +1,4 @@
-mydir=kadmin/testing
+mydir=kadmin$(S)testing
 BUILDTOP=$(REL)..$(S)..
 SUBDIRS = scripts util
 
index 36ae3b490b43fbd85b4ae2df057c0b7d6bbeb9eb..1e14d6117d24122492f804b83b34c6c1c5fd8512 100644 (file)
@@ -1,4 +1,4 @@
-mydir=kadmin/testing/scripts
+mydir=kadmin$(S)testing$(S)scripts
 BUILDTOP=$(REL)..$(S)..$(S)..
 PERL_PATH=@PERL_PATH@
 
index 3993c90a0dab6178540db2efdb58932f65428a83..745a73ddd56eba1d47cea5d64f1f9ea95bf60382 100644 (file)
@@ -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
index 07954f89b96243e124b60c4cb69bfb95f34027bd..4256f058674474c7045faaf0a99aad90a6a0b6fd 100644 (file)
@@ -1,5 +1,6 @@
 mydir=lib
 SUBDIRS=crypto krb5 gssapi rpc kdb kadm5 apputils
+WINSUBDIRS=crypto krb5 gssapi
 BUILDTOP=$(REL)..
 
 all-unix::
@@ -134,31 +135,5 @@ clean-windows::
 ##WIN32##gssapi.lib: $(GLIB)
 ##WIN32##profile.lib: $(PLIB)
 
-##WIN32##all-windows:: 
-##WIN32##      @echo Making in lib\crypto
-##WIN32##      cd crypto
-##WIN32##      $(MAKE) -$(MFLAGS)
-##WIN32##      @echo Making in lib\krb5
-##WIN32##      cd ..\krb5
-##WIN32##      $(MAKE) -$(MFLAGS)
-##WIN32##      @echo Making in lib\gssapi
-##WIN32##      cd ..\gssapi
-##WIN32##      $(MAKE) -$(MFLAGS) 
-##WIN32##      @echo Making in lib
-##WIN32##      cd ..
-
-##WIN32##all-windows:: lib-windows
+##WIN32##all-windows:: all-recurse lib-windows
 ##WIN32##lib-windows:: krb5.lib gssapi.lib
-
-##WIN32##clean-windows::
-##WIN32##      @echo Making clean in lib\crypto
-##WIN32##      cd crypto
-##WIN32##      $(MAKE) -$(MFLAGS) clean
-##WIN32##      @echo Making clean in lib\krb5
-##WIN32##      cd ..\krb5
-##WIN32##      $(MAKE) -$(MFLAGS) clean
-##WIN32##      @echo Making clean in lib\gssapi
-##WIN32##      cd ..\gssapi
-##WIN32##      $(MAKE) -$(MFLAGS) clean
-##WIN32##      @echo Making clean in lib
-##WIN32##      cd ..
index 58273248b26d7c21844d39060d1f77bd92f8e13a..75dd613dc00cadccca6851b015dcdee08399f51d 100644 (file)
@@ -2,7 +2,7 @@ prefix=@prefix@
 bindir=@bindir@
 datadir=@datadir@
 mydatadir=$(datadir)/apputils
-mydir=lib/apputils
+mydir=lib$(S)apputils
 BUILDTOP=$(REL)..$(S)..
 RELDIR=../lib/apputils
 SED = sed
index 12098d60caf0749d5ef695d6b7f3703bd1ece769..464db261b0a68bb6bf84bac2dad591025e6e21e8 100644 (file)
@@ -1,4 +1,4 @@
-mydir=lib/crypto
+mydir=lib$(S)crypto
 BUILDTOP=$(REL)..$(S)..
 SUBDIRS= krb $(CRYPTO_IMPL) crypto_tests
 
@@ -74,30 +74,6 @@ libcrypto.lib:
 
 clean-unix:: clean-liblinks clean-libs clean-libobjs
 
-all-windows::
-       cd krb
-       @echo Making in crypto\krb
-       $(MAKE) -$(MFLAGS)
-       cd ..\$(CRYPTO_IMPL)
-       @echo Making in crypto\$(CRYPTO_IMPL)
-       $(MAKE) -$(MFLAGS)
-       cd ..\crypto_tests
-       @echo Making in crypto\crypto_tests
-       $(MAKE) -$(MFLAGS)
-       cd ..
-
-clean-windows::
-       cd krb
-       @echo Making in clean crypto\krb
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\$(CRYPTO_IMPL)
-       @echo Making clean in crypto\$(CRYPTO_IMPL)
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\crypto_tests
-       @echo Making clean in crypto\crypto_tests
-       $(MAKE) -$(MFLAGS) clean
-       cd ..
-
 @lib_frag@
 @libobj_frag@
 
index 603c57cd07d065df56b97fc4d191b48492ed3930..66e16ce69e896b271f38c3312722cf4b7853a014 100644 (file)
@@ -1,4 +1,4 @@
-mydir=lib/crypto/builtin
+mydir=lib$(S)crypto$(S)builtin
 BUILDTOP=$(REL)..$(S)..$(S)..
 SUBDIRS=camellia des aes md4 md5 sha1 sha2 enc_provider hash_provider
 LOCALINCLUDES = -I$(srcdir)/../krb                     \
@@ -72,103 +72,6 @@ t_cf2$(EXEEXT): t_cf2.$(OBJEXT) $(SUPPORT_DEPLIB)
 clean::
        $(RM)  t_cf2 t_cf2.o  t_cf2.output
 
-
-
-
-all-windows::
-       cd des
-       @echo Making in crypto\builtin\des
-       $(MAKE) -$(MFLAGS)
-       cd ..\md4
-       @echo Making in crypto\builtin\md4
-       $(MAKE) -$(MFLAGS)
-       cd ..\md5
-       @echo Making in crypto\builtin\md5
-       $(MAKE) -$(MFLAGS)
-       cd ..\sha1
-       @echo Making in crypto\builtin\sha1
-       $(MAKE) -$(MFLAGS)
-       cd ..\sha2
-       @echo Making in crypto\builtin\sha2
-       $(MAKE) -$(MFLAGS)
-       cd ..\hash_provider
-       @echo Making in crypto\builtin\hash_provider
-       $(MAKE) -$(MFLAGS)
-       cd ..\enc_provider
-       @echo Making in crypto\builtin\enc_provider
-       $(MAKE) -$(MFLAGS)
-       cd ..\aes
-       @echo Making in crypto\builtin\aes
-       $(MAKE) -$(MFLAGS)
-       cd ..\camellia
-       @echo Making in crypto\builtin\camellia
-       $(MAKE) -$(MFLAGS)
-       cd ..
-       @echo Making in crypto\builtin
-
-clean-windows::
-       cd des
-       @echo Making clean in crypto\builtin\des
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\md4
-       @echo Making clean in crypto\builtin\md4
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\md5
-       @echo Making clean in crypto\builtin\md5
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\sha1
-       @echo Making clean in crypto\builtin\sha1
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\sha2
-       @echo Making clean in crypto\builtin\sha2
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\hash_provider
-       @echo Making clean in crypto\builtin\hash_provider
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\enc_provider
-       @echo Making clean in crypto\builtin\enc_provider
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\aes
-       @echo Making clean in crypto\builtin\aes
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\camellia
-       @echo Making clean in crypto\builtin\camellia
-       $(MAKE) -$(MFLAGS) clean
-       cd ..
-       @echo Making clean in crypto\builtin
-
-check-windows::
-       cd des
-       @echo Making check in crypto\builtin\des
-       $(MAKE) -$(MFLAGS) check
-       cd ..\md4
-       @echo Making check in crypto\builtin\md4
-       $(MAKE) -$(MFLAGS) check
-       cd ..\md5
-       @echo Making check in crypto\builtin\md5
-       $(MAKE) -$(MFLAGS) check
-       cd ..\sha1
-       @echo Making check in crypto\builtin\sha1
-       $(MAKE) -$(MFLAGS) check
-       cd ..\sha2
-       @echo Making check in crypto\builtin\sha2
-       $(MAKE) -$(MFLAGS) check
-       cd ..\hash_provider
-       @echo Making check in crypto\builtin\hash_provider
-       $(MAKE) -$(MFLAGS) check
-       cd ..\enc_provider
-       @echo Making check in crypto\builtin\enc_provider
-       $(MAKE) -$(MFLAGS) check
-       cd ..\aes
-       @echo Making check in crypto\builtin\aes
-       $(MAKE) -$(MFLAGS) check
-       cd ..\camellia
-       @echo Making check in crypto\builtin\camellia
-       $(MAKE) -$(MFLAGS) check
-       cd ..
-       @echo Making check in crypto\builtin
-
-
 @lib_frag@
 @libobj_frag@
 
index 64f73a379b635ef363139c234cdf893c6d374e1d..9a242cc45a46035f3c729f2738f15c70e203ff1e 100644 (file)
@@ -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=
index 2ad3e73f66bce0525df3f62e4478500874cda31e..b11716ecc903712d8b576a8b94223e1f7fbcf0b3 100644 (file)
@@ -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
index 5001d48bfc1c4ca172b208c5af2b499d9247f1d8..9b5d81402914333c34dab85fb06f180c6ad5d41d 100644 (file)
@@ -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=
index 80bfc60bd313fe6312e18cebfbb3c7e74333f419..e843d602a9ba9604c7f72e4bad212c4c9bc72a58 100644 (file)
@@ -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 \
index e91901ee5b85704cded609b680f394475f117f4d..f008e7118bf7d9a1ee26dfe0746b0d625386f415 100644 (file)
@@ -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
index 00ec64315ab84bc890a9f2a7c73399579a424004..3dbeb5bd70bc59096eec7eb850c6a67bbaadfc2e 100644 (file)
@@ -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=
index 840bb62b949fd3eb560b45d65458586c11dba96f..1ab1ce96fabb10fce27d71c8cc6efa3d83426f42 100644 (file)
@@ -1,4 +1,4 @@
-mydir=lib/crypto/builtin/md5
+mydir=lib$(S)crypto$(S)builtin$(S)md5
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 
index 719f633702a5e78098cf08468c9d1089ac15fa44..00e6cb6d4ab57bf837acc1fde2d6b4c7b6aa1d38 100644 (file)
@@ -1,4 +1,4 @@
-mydir=lib/crypto/builtin/sha1
+mydir=lib$(S)crypto$(S)builtin$(S)sha1
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 
index 3b854ec29ed11a65f50a506faeb6b9060376f4cf..da176e66d2fd29ddc1fc879771f33dd3d8a08885 100644 (file)
@@ -1,4 +1,4 @@
-mydir=lib/crypto/builtin/sha2
+mydir=lib$(S)crypto$(S)builtin$(S)sha2
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 
index 17e1683d618164b7f008ecb1bed7056db115c7e0..50700fd6cd6555e11686ecc5488be0473d1e9c05 100644 (file)
@@ -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 \
index 7536bf80beb10b5875b6163d32954a3904493db4..29c8897a960f6ada6751efd1e41ab402bb2d1341 100644 (file)
@@ -1,7 +1,6 @@
-mydir=lib/crypto/krb
+mydir=lib$(S)crypto$(S)krb
 BUILDTOP=$(REL)..$(S)..$(S)..
-SUBDIRS= arcfour checksum crc32 dk \
-       prf rand2key old raw prng 
+SUBDIRS= arcfour checksum crc32 dk prf rand2key old raw prng 
 LOCALINCLUDES = -I$(srcdir) -I$(srcdir)/../$(CRYPTO_IMPL)/enc_provider \
                -I$(srcdir)/dk -I$(srcdir)/../$(CRYPTO_IMPL)/hash_provider \
                -I$(srcdir)/prf -I$(srcdir)/rand2key \
@@ -159,100 +158,6 @@ depend:: $(SRCS)
 
 clean-unix:: clean-libobjs
 
-all-windows::
-       cd arcfour
-       @echo Making in crypto\krb\arcfour
-       $(MAKE) -$(MFLAGS)
-       cd ..\crc32
-       @echo Making in crypto\krb\crc32
-       $(MAKE) -$(MFLAGS)
-       cd ..\checksum
-       @echo Making in crypto\krb\checksum
-       $(MAKE) -$(MFLAGS)
-       cd ..\dk
-       @echo Making in crypto\krb\dk
-       $(MAKE) -$(MFLAGS)
-       cd ..\prf
-       @echo Making in crypto\krb\prf
-       $(MAKE) -$(MFLAGS)
-       cd ..\rand2key
-       @echo Making in crypto\krb\rand2key
-       $(MAKE) -$(MFLAGS)
-       cd ..\old
-       @echo Making in crypto\krb\old
-       $(MAKE) -$(MFLAGS)
-       cd ..\raw
-       @echo Making in crypto\krb\raw
-       $(MAKE) -$(MFLAGS)
-       cd ..\prng
-       @echo Making in crypto\krb\prng
-       $(MAKE) -$(MFLAGS)
-       cd ..
-       @echo Making in crypto\krb
-
-clean-windows::
-       cd arcfour
-       @echo Making in clean crypto\krb\arcfour
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\crc32
-       @echo Making in clean crypto\krb\crc32
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\checksum
-       @echo Making clean in crypto\krb\checksum
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\dk
-       @echo Making clean in crypto\krb\dk
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\prf
-       @echo Making clean in crypto\krb\prf
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\rand2key
-       @echo Making clean in crypto\krb\rand2key
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\old
-       @echo Making clean in crypto\krb\old
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\raw
-       @echo Making clean in crypto\krb\raw
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\prng
-       @echo Making clean in crypto\krb\prng
-       $(MAKE) -$(MFLAGS) clean
-       cd ..
-       @echo Making clean in crypto\krb
-
-check-windows::
-       cd arcfour
-       @echo Making in check crypto\krb\arcfour
-       $(MAKE) -$(MFLAGS) check
-       cd ..\crc32
-       @echo Making in check crypto\krb\crc32
-       $(MAKE) -$(MFLAGS) check
-       cd ..\checksum
-       @echo Making check in crypto\krb\checksum
-       $(MAKE) -$(MFLAGS) check
-       cd ..\dk
-       @echo Making check in crypto\krb\dk
-       $(MAKE) -$(MFLAGS) check
-       cd ..\prf
-       @echo Making check in crypto\krb\prf
-       $(MAKE) -$(MFLAGS) check
-       cd ..\rand2key
-       @echo Making check in crypto\krb\rand2key
-       $(MAKE) -$(MFLAGS) check
-       cd ..\old
-       @echo Making check in crypto\krb\old
-       $(MAKE) -$(MFLAGS) check
-       cd ..\raw
-       @echo Making check in crypto\krb\raw
-       $(MAKE) -$(MFLAGS) check
-       cd ..\prng
-       @echo Making check in crypto\krb\prng
-       $(MAKE) -$(MFLAGS) check
-       cd ..
-       @echo Making check in crypto\krb
-
-
 @lib_frag@
 @libobj_frag@
 
index f3f0a9bb02c3846f27d2dc2f2b0f1e2c02f85806..93af66273ce0226d29b4de99298b0b190c77857b 100644 (file)
@@ -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
index 65a8cbcf4d8eacebec33cff825df5450dfb8af02..2d4148168fe397b1e34c252a900eeb69b22fb15c 100644 (file)
@@ -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=
index d46c739626e4ddf98c6b6fc42169c0f8c9ed743d..5360339e731e6097af312abbfee74b3671f14f1b 100644 (file)
@@ -1,4 +1,4 @@
-mydir=lib/crypto/krb/crc32
+mydir=lib$(S)crypto$(S)krb$(S)crc32
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 
index 0a710110c1a6de0b967be46ffcccbd02f7e23676..63e55b6ffe77ed7089d7262e6e5537eba3f16670 100644 (file)
@@ -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=
index 0f21070cf5fa2709d424e2cf10c0e65075516964..8cbd7fc0bdb1fba492b0b7d52674bb30d74ce36a 100644 (file)
@@ -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=
index c2f412d8eafbe683966e3e6d9ee466319dd2e261..b57029fa05012052fb8091bfe0393783dbebb4ed 100644 (file)
@@ -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                       \
index cef3710cfc6350ebb199271cd2c9755d172c5726..843fdd2f2fbb8db9a66a072e281e8e39b505122b 100644 (file)
@@ -1,4 +1,4 @@
-mydir=lib/crypto/krb/prng
+mydir=lib$(S)crypto$(S)krb$(S)prng
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 SUBDIRS= $(PRNG_ALG)
 LOCALINCLUDES = -I$(srcdir) -I$(srcdir)/../../$(CRYPTO_IMPL)/enc_provider \
@@ -41,27 +41,6 @@ depend:: $(SRCS)
 
 clean-unix:: clean-libobjs
 
-all-windows::
-       cd yarrow
-       @echo Making in crypto\krb\prng\yarrow
-       $(MAKE) -$(MFLAGS)
-       cd ..
-       @echo Making in crypto\krb\prng
-
-clean-windows::
-       cd yarrow
-       @echo Making clean in crypto\krb\prng\yarrow
-       $(MAKE) -$(MFLAGS) clean
-       cd ..
-       @echo Making clean in crypto\krb\prng
-
-check-windows::
-       cd yarrow
-       @echo Making check in crypto\krb\prng\yarrow
-       $(MAKE) -$(MFLAGS) check
-       cd ..
-       @echo Making check in crypto\krb\prng
-
 @lib_frag@
 @libobj_frag@
 
index 367eb017424e95d2b1ca411a526c2495009fc60f..544f4a15408b1ed712587f03a15f85a3cc3b11a6 100644 (file)
@@ -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)             \
index d6d29b932978295f200ce055477c6552bcb6e446..a0260767242985874308386d5c9ee197c8da28e7 100644 (file)
@@ -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)/../.. \
index 93d6bc44c0ac61509b5365df9c4ee4f1649cc013..3ecb64a4fdf748972f1ced66f8fb204061274ac8 100644 (file)
@@ -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)             \
index f6975d7d9ee3befb1b90940bc49c8ea3137b144e..7d1fb0705ab5e1c4f2a32fc2d7e217e14c2e8087 100644 (file)
@@ -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=
index a9c3b09d83690313cf72fb10815f230fdaa64d96..f0b32b5369c3e41754b905d9fbce97492a86c7ce 100644 (file)
@@ -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=
index 7ce3cc8a9f625968d9b817ecfcf1256fba9e7da9..7016e924b271833bc3fb741cde2d80623e0ccca5 100644 (file)
@@ -1,4 +1,4 @@
-mydir=lib/crypto/nss
+mydir=lib$(S)crypto$(S)nss
 BUILDTOP=$(REL)..$(S)..$(S)..
 SUBDIRS=des aes        camellia md4 md5  sha1 sha2 enc_provider hash_provider
 CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
@@ -18,12 +18,6 @@ PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 DEFS=
 
-##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=$(OUTPRE)crypto.lib
-##DOSOBJFILE=$(OUTPRE)crypto.lst
-##DOSOBJFILELIST=@$(OUTPRE)crypto.lst @$(OUTPRE)des.lst @$(OUTPRE)md4.lst @$(OUTPRE)md5.lst @$(OUTPRE)sha1.lst @$(OUTPRE)crc32.lst @$(OUTPRE)dk.lst @$(OUTPRE)old.lst @$(OUTPRE)raw.lst @$(OUTPRE)enc_prov.lst @$(OUTPRE)hash_pro.lst @$(OUTPRE)kh_pro.lst @$(OUTPRE)yarrow.lst @$(OUTPRE)aes.lst
-##DOSOBJFILEDEP =$(OUTPRE)crypto.lst $(OUTPRE)des.lst $(OUTPRE)md4.lst $(OUTPRE)md5.lst $(OUTPRE)sha1.lst $(OUTPRE)crc32.lst $(OUTPRE)dk.lst $(OUTPRE)old.lst $(OUTPRE)raw.lst $(OUTPRE)enc_prov.lst $(OUTPRE)hash_pro.lst $(OUTPRE)kh_pro.lst $(OUTPRE)aes.lst
-
 STLIBOBJS=\
        hmac.o  \
        pbkdf2.o                
@@ -51,8 +45,6 @@ SUBDIROBJLISTS= des/OBJS.ST md4/OBJS.ST       \
                aes/OBJS.ST                     \
                camellia/OBJS.ST
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 includes:: depend
 
@@ -60,97 +52,6 @@ depend:: $(SRCS)
 
 clean-unix:: clean-libobjs
 
-all-windows::
-       cd ..\des
-       @echo Making in crypto\des
-       $(MAKE) -$(MFLAGS)
-       cd ..\md4
-       @echo Making in crypto\md4
-       $(MAKE) -$(MFLAGS)
-       cd ..\md5
-       @echo Making in crypto\md5
-       $(MAKE) -$(MFLAGS)
-       cd ..\sha1
-       @echo Making in crypto\sha1
-       $(MAKE) -$(MFLAGS)
-       cd ..\sha2
-       @echo Making in crypto\sh2a
-       $(MAKE) -$(MFLAGS)
-       cd ..\hash_provider
-       @echo Making in crypto\hash_provider
-       $(MAKE) -$(MFLAGS)
-       cd ..\enc_provider
-       @echo Making in crypto\enc_provider
-       $(MAKE) -$(MFLAGS)
-       cd ..\aes
-       @echo Making in crypto\aes
-       $(MAKE) -$(MFLAGS)
-       cd ..\camellia
-       @echo Making in crypto\aes
-       $(MAKE) -$(MFLAGS)
-       cd ..
-
-clean-windows::
-       cd ..\des
-       @echo Making clean in crypto\des
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\md4
-       @echo Making clean in crypto\md4
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\md5
-       @echo Making clean in crypto\md5
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\sha2
-       @echo Making clean in crypto\sha2
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\sha1
-       @echo Making clean in crypto\sha1
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\hash_provider
-       @echo Making clean in crypto\hash_provider
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\enc_provider
-       @echo Making clean in crypto\enc_provider
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\aes
-       @echo Making clean in crypto\aes
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\camellia
-       @echo Making clean in crypto\aes
-       $(MAKE) -$(MFLAGS) clean
-       cd ..
-
-check-windows::
-       cd ..\des
-       @echo Making check in crypto\des
-       $(MAKE) -$(MFLAGS) check
-       cd ..\md4
-       @echo Making check in crypto\md4
-       $(MAKE) -$(MFLAGS) check
-       cd ..\md5
-       @echo Making check in crypto\md5
-       $(MAKE) -$(MFLAGS) check
-       cd ..\sha1
-       @echo Making check in crypto\sha1
-       $(MAKE) -$(MFLAGS) check
-       cd ..\sha2
-       @echo Making check in crypto\sha2
-       $(MAKE) -$(MFLAGS) check
-       cd ..\hash_provider
-       @echo Making check in crypto\hash_provider
-       $(MAKE) -$(MFLAGS) check
-       cd ..\enc_provider
-       @echo Making check in crypto\enc_provider
-       $(MAKE) -$(MFLAGS) check
-       cd ..\aes
-       @echo Making check in crypto\aes
-       $(MAKE) -$(MFLAGS) check
-       cd ..\camellia
-       @echo Making check in crypto\aes
-       $(MAKE) -$(MFLAGS) check
-       cd ..
-
-
 @lib_frag@
 @libobj_frag@
 
index 9855eafb027995a5c3fa183208cfb7561c8665db..ffbd4ba50ca2db104f20eeeea68747811bacbb22 100644 (file)
@@ -2,15 +2,11 @@
 # system currently assumes that all modules have the same directory
 # structure.
 
-mydir=lib/crypto/nss/aes
+mydir=lib$(S)crypto$(S)nss$(S)aes
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk  -I$(srcdir)/../../../../include
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=aes
-##DOS##OBJFILE=..\$(OUTPRE)aes.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -21,20 +17,13 @@ OBJS=
 SRCS=
 
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs 
 
 includes:: depend
 
 depend:: $(SRCS)
 
-check:: 
-
-
 clean-unix:: clean-libobjs
 
-clean::
-
 @libobj_frag@
 
index c937f21974012dc0651c11acd0b45c1a9b265365..b8feffc5d78c7e11115833e65506985419fe5092 100644 (file)
@@ -2,15 +2,11 @@
 # system currently assumes that all modules have the same directory
 # structure.
 
-mydir=lib/crypto/nss/camellia
+mydir=lib$(S)crypto$(S)nss$(S)camellia
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk  -I$(srcdir)/../../../../include
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=camellia
-##DOS##OBJFILE=..\$(OUTPRE)camellia.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -21,20 +17,13 @@ OBJS=
 SRCS=
 
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs 
 
 includes:: depend
 
 depend:: $(SRCS)
 
-check:: 
-
-
 clean-unix:: clean-libobjs
 
-clean::
-
 @libobj_frag@
 
index dc0e5e8eed6c23402afc56d9d437f8bdd0e74412..c8ab6e4297a56d0f38f0e77ee206c1d5d321d16c 100644 (file)
@@ -1,4 +1,4 @@
-mydir=lib/crypto/nss/des
+mydir=lib$(S)crypto$(S)nss$(S)des
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. -I$(srcdir)/../../krb \
@@ -6,10 +6,6 @@ LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. -I$(srcdir)/../../krb \
 
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=des
-##DOS##OBJFILE=..\$(OUTPRE)des.lst
-
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
@@ -31,20 +27,12 @@ SRCS=       $(srcdir)/f_parity.c    \
        $(srcdir)/string2key.c
 
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
-check-unix:: 
-
 includes:: depend
 
 depend:: $(SRCS)
 
-check-windows::
-
-clean::
-
 clean-unix:: clean-libobjs
 
 @libobj_frag@
index f1ed5fb06ad9bb25c210a96a353709c652c8eca1..579072df3a6655ed789787f079d031bba2cc55cf 100644 (file)
@@ -1,4 +1,4 @@
-mydir=lib/crypto/nss/enc_provider
+mydir=lib$(S)crypto$(S)nss$(S)enc_provider
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
 LOCALINCLUDES = -I$(srcdir)/../des     \
@@ -10,10 +10,6 @@ LOCALINCLUDES = -I$(srcdir)/../des   \
                $(CRYPTO_IMPL_CFLAGS)
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=enc_provider
-##DOS##OBJFILE=..\$(OUTPRE)enc_prov.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -41,8 +37,6 @@ SRCS= \
        $(srcdir)/camellia.c    \
        $(srcdir)/rc4.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
index 36ba7b2df32a087753c184166557d20c10a65547..719b50079dd2d1cb754562a5c6635b41d446d040 100644 (file)
@@ -1,4 +1,4 @@
-mydir=lib/crypto/nss/hash_provider
+mydir=lib$(S)crypto$(S)nss$(S)hash_provider
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
 LOCALINCLUDES = -I$(srcdir)/../../krb/crc32 -I$(srcdir)/../md4 \
@@ -7,10 +7,6 @@ LOCALINCLUDES = -I$(srcdir)/../../krb/crc32 -I$(srcdir)/../md4 \
 
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=hash_provider
-##DOS##OBJFILE=..\$(OUTPRE)hash_pro.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -33,8 +29,6 @@ SRCS= $(srcdir)/hash_gen.c    \
        $(srcdir)/hash_md5.c    \
        $(srcdir)/hash_sha1.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
index f7cb028355c974ecb298b2c5308490d9dba4365a..dfb0182fa2ee1c43746b80a068dff4bd3bf1b301 100644 (file)
@@ -1,12 +1,8 @@
-mydir=lib/crypto/nss/md4
+mydir=lib$(S)crypto$(S)nss$(S)md4
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=md4
-##DOS##OBJFILE=..\$(OUTPRE)md4.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -16,21 +12,12 @@ OBJS= $(OUTPRE)md4.$(OBJEXT)
 
 SRCS= $(srcdir)/md4.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
 
 depend:: $(SRCS)
 
-
-check-unix:: 
-
-check-windows::
-
-clean:: 
-
 clean-unix:: clean-libobjs
 
 @libobj_frag@
index 83699a3f1a588d3f4b8f9b988ccd3f15e65ffea0..b0cde50e9617f4345d0aca3bc5943e4995dec28f 100644 (file)
@@ -1,11 +1,7 @@
-mydir=lib/crypto/nss/md5
+mydir=lib$(S)crypto$(S)nss$(S)md5
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=md5
-##DOS##OBJFILE=..\$(OUTPRE)md5.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
@@ -18,20 +14,12 @@ OBJS= $(OUTPRE)md5.$(OBJEXT)
 
 SRCS= $(srcdir)/md5.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
 
 depend:: $(SRCS)
 
-check-unix:: 
-
-check-windows::
-
-clean:: 
-
 clean-unix:: clean-libobjs
 
 @libobj_frag@
index 7afeb3813a60af1f57b77db695964607c7492257..82d6d9b91ddd417a33df41f2c0ad9a1d7eb957a9 100644 (file)
@@ -1,13 +1,9 @@
-mydir=lib/crypto/nss/sha1
+mydir=lib$(S)crypto$(S)nss$(S)sha1
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
 LOCALINCLUDES = -I$(srcdir)/.. $(CRYPTO_IMPL_CFLAGS)
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=sha1
-##DOS##OBJFILE=..\$(OUTPRE)sha1.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -17,16 +13,12 @@ OBJS= $(OUTPRE)shs.$(OBJEXT)
 
 SRCS= $(srcdir)/shs.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
 
 depend:: $(SRCS)
 
-clean::
-
 clean-unix:: clean-libobjs
 
 @libobj_frag@
index c0605e8de0c3d5a8e95875fddc59523d1dbf011b..a8edb60d9e26e4ddbeeda80e4bc53a44d577d9b8 100644 (file)
@@ -1,13 +1,9 @@
-mydir=lib/crypto/nss/sha2
+mydir=lib$(S)crypto$(S)nss$(S)sha2
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
 LOCALINCLUDES = -I$(srcdir)/.. $(CRYPTO_IMPL_CFLAGS)
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=sha1
-##DOS##OBJFILE=..\$(OUTPRE)sha2.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -17,16 +13,12 @@ OBJS= $(OUTPRE)sha2.$(OBJEXT)
 
 SRCS= $(srcdir)/sha2.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
 
 depend:: $(SRCS)
 
-clean::
-
 clean-unix:: clean-libobjs
 
 @libobj_frag@
index f333c17abbf3814efde3e468f6e52ab7aa7ab33d..ff43d56d82a658ae8858df012972fd0b57fe4d08 100644 (file)
@@ -1,4 +1,4 @@
-mydir=lib/crypto/openssl
+mydir=lib$(S)crypto$(S)openssl
 BUILDTOP=$(REL)..$(S)..$(S)..
 SUBDIRS=camellia des aes md4 md5  sha1 sha2 enc_provider hash_provider
 LOCALINCLUDES = -I$(srcdir)/../krb                     \
@@ -15,12 +15,6 @@ PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 DEFS=
 
-##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=$(OUTPRE)crypto.lib
-##DOSOBJFILE=$(OUTPRE)crypto.lst
-##DOSOBJFILELIST=@$(OUTPRE)crypto.lst @$(OUTPRE)des.lst @$(OUTPRE)md4.lst @$(OUTPRE)md5.lst @$(OUTPRE)sha1.lst @$(OUTPRE)crc32.lst @$(OUTPRE)dk.lst @$(OUTPRE)old.lst @$(OUTPRE)raw.lst @$(OUTPRE)enc_prov.lst @$(OUTPRE)hash_pro.lst @$(OUTPRE)kh_pro.lst @$(OUTPRE)yarrow.lst @$(OUTPRE)aes.lst
-##DOSOBJFILEDEP =$(OUTPRE)crypto.lst $(OUTPRE)des.lst $(OUTPRE)md4.lst $(OUTPRE)md5.lst $(OUTPRE)sha1.lst $(OUTPRE)crc32.lst $(OUTPRE)dk.lst $(OUTPRE)old.lst $(OUTPRE)raw.lst $(OUTPRE)enc_prov.lst $(OUTPRE)hash_pro.lst $(OUTPRE)kh_pro.lst $(OUTPRE)aes.lst
-
 STLIBOBJS=\
        hmac.o  \
        init.o  \
@@ -49,8 +43,6 @@ SUBDIROBJLISTS= des/OBJS.ST md4/OBJS.ST       \
                hash_provider/OBJS.ST           \
                aes/OBJS.ST 
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 includes:: depend
 
@@ -58,85 +50,6 @@ depend:: $(SRCS)
 
 clean-unix:: clean-libobjs
 
-all-windows::
-       cd ..\des
-       @echo Making in crypto\des
-       $(MAKE) -$(MFLAGS)
-       cd ..\md4
-       @echo Making in crypto\md4
-       $(MAKE) -$(MFLAGS)
-       cd ..\md5
-       @echo Making in crypto\md5
-       $(MAKE) -$(MFLAGS)
-       cd ..\sha1
-       @echo Making in crypto\sha1
-       $(MAKE) -$(MFLAGS)
-       cd ..\sha2
-       @echo Making in crypto\sha2
-       $(MAKE) -$(MFLAGS)
-       cd ..\hash_provider
-       @echo Making in crypto\hash_provider
-       $(MAKE) -$(MFLAGS)
-       cd ..\enc_provider
-       @echo Making in crypto\enc_provider
-       $(MAKE) -$(MFLAGS)
-       cd ..\aes
-       @echo Making in crypto\aes
-       $(MAKE) -$(MFLAGS)
-       cd ..
-
-clean-windows::
-       cd ..\des
-       @echo Making clean in crypto\des
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\md4
-       @echo Making clean in crypto\md4
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\md5
-       @echo Making clean in crypto\md5
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\sha1
-       @echo Making clean in crypto\sha1
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\sha2
-       @echo Making clean in crypto\sha2
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\hash_provider
-       @echo Making clean in crypto\hash_provider
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\enc_provider
-       @echo Making clean in crypto\enc_provider
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\aes
-       @echo Making clean in crypto\aes
-       $(MAKE) -$(MFLAGS) clean
-       cd ..
-
-check-windows::
-       cd ..\des
-       @echo Making check in crypto\des
-       $(MAKE) -$(MFLAGS) check
-       cd ..\md4
-       @echo Making check in crypto\md4
-       $(MAKE) -$(MFLAGS) check
-       cd ..\md5
-       @echo Making check in crypto\md5
-       $(MAKE) -$(MFLAGS) check
-       cd ..\sha1
-       @echo Making check in crypto\sha1
-       $(MAKE) -$(MFLAGS) check
-       cd ..\hash_provider
-       @echo Making check in crypto\hash_provider
-       $(MAKE) -$(MFLAGS) check
-       cd ..\enc_provider
-       @echo Making check in crypto\enc_provider
-       $(MAKE) -$(MFLAGS) check
-       cd ..\aes
-       @echo Making check in crypto\aes
-       $(MAKE) -$(MFLAGS) check
-       cd ..
-
-
 @lib_frag@
 @libobj_frag@
 
index 6352c3dc2c2a9fb68cfd868a177f179523cfa932..b8a7de924c207a15f8ac509ff563dce0815e6f07 100644 (file)
@@ -2,15 +2,11 @@
 # system currently assumes that all modules have the same directory
 # structure.
 
-mydir=lib/crypto/openssl/aes
+mydir=lib$(S)crypto$(S)openssl$(S)aes
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk  -I$(srcdir)/../../../../include
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=aes
-##DOS##OBJFILE=..\$(OUTPRE)aes.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -20,21 +16,13 @@ OBJS=
 
 SRCS=
 
-
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs 
 
 includes:: depend
 
 depend:: $(SRCS)
 
-check:: 
-
-
 clean-unix:: clean-libobjs
 
-clean::
-
 @libobj_frag@
 
index 5e36d50702c893e5a54c53ec4d069c3023735573..c300cd45502f6fc46bda771aa299a6ec6258ba3c 100644 (file)
@@ -2,15 +2,11 @@
 # system currently assumes that all modules have the same directory
 # structure.
 
-mydir=lib/crypto/openssl/camellia
+mydir=lib$(S)crypto$(S)openssl$(S)camellia
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk  -I$(srcdir)/../../../../include
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=camellia
-##DOS##OBJFILE=..\$(OUTPRE)camellia.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -21,20 +17,13 @@ OBJS=
 SRCS=
 
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs 
 
 includes:: depend
 
 depend:: $(SRCS)
 
-check:: 
-
-
 clean-unix:: clean-libobjs
 
-clean::
-
 @libobj_frag@
 
index 627b5cc7f2eff179c81d00022805b02448b5b1ec..335c7e53cbd8de5f9f399ab361b7a01bc66dd67a 100644 (file)
@@ -1,12 +1,8 @@
-mydir=lib/crypto/openssl/des
+mydir=lib$(S)crypto$(S)openssl$(S)des
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. -I$(srcdir)/../../krb
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=des
-##DOS##OBJFILE=..\$(OUTPRE)des.lst
-
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
@@ -28,20 +24,12 @@ SRCS=       $(srcdir)/f_parity.c    \
        $(srcdir)/string2key.c
 
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
-check-unix:: 
-
 includes:: depend
 
 depend:: $(SRCS)
 
-check-windows::
-
-clean::
-
 clean-unix:: clean-libobjs
 
 @libobj_frag@
index e974da406ff8da02d96d14273782e154733800bc..24f6b30459e66462e78cbe65562faeb7ef214b52 100644 (file)
@@ -1,4 +1,4 @@
-mydir=lib/crypto/openssl/enc_provider
+mydir=lib$(S)crypto$(S)openssl$(S)enc_provider
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/../des     \
                -I$(srcdir)/../arcfour \
@@ -9,10 +9,6 @@ LOCALINCLUDES = -I$(srcdir)/../des     \
                -I$(srcdir)/.. -I$(srcdir)/.
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=enc_provider
-##DOS##OBJFILE=..\$(OUTPRE)enc_prov.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -39,8 +35,6 @@ SRCS= \
        $(srcdir)/camellia.c    \
        $(srcdir)/rc4.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
@@ -50,4 +44,3 @@ depend:: $(SRCS)
 clean-unix:: clean-libobjs
 
 @libobj_frag@
-
index b5a7dcfebf415768c0065c3013b72dcf9e0669b4..472dbd39353707e6141046de41a950bacf8e95a1 100644 (file)
@@ -1,13 +1,9 @@
-mydir=lib/crypto/openssl/hash_provider
+mydir=lib$(S)crypto$(S)openssl$(S)hash_provider
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/../../krb/crc32 -I$(srcdir)/../md4 \
        -I$(srcdir)/../md5 -I$(srcdir)/../sha1 -I$(srcdir)/../../krb
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=hash_provider
-##DOS##OBJFILE=..\$(OUTPRE)hash_pro.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -27,8 +23,6 @@ SRCS= $(srcdir)/hash_crc32.c  \
        $(srcdir)/hash_md5.c    \
        $(srcdir)/hash_sha1.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
index f212c6d51346fa6738e691313469e0fc62dbe84e..550d7df60c43dcef0966ea08b5c624416bec069f 100644 (file)
@@ -1,12 +1,8 @@
-mydir=lib/crypto/openssl/md4
+mydir=lib$(S)crypto$(S)openssl$(S)md4
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=md4
-##DOS##OBJFILE=..\$(OUTPRE)md4.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -16,21 +12,12 @@ OBJS= $(OUTPRE)md4.$(OBJEXT)
 
 SRCS= $(srcdir)/md4.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
 
 depend:: $(SRCS)
 
-
-check-unix:: 
-
-check-windows::
-
-clean:: 
-
 clean-unix:: clean-libobjs
 
 @libobj_frag@
index 1b693c420290c2ea9bf47392494cad85a6e8c25c..9c3d3409122b012ecf47957dec420f53cc9d98ca 100644 (file)
@@ -1,11 +1,7 @@
-mydir=lib/crypto/openssl/md5
+mydir=lib$(S)crypto$(S)openssl$(S)md5
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=md5
-##DOS##OBJFILE=..\$(OUTPRE)md5.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -15,20 +11,12 @@ OBJS= $(OUTPRE)md5.$(OBJEXT)
 
 SRCS= $(srcdir)/md5.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
 
 depend:: $(SRCS)
 
-check-unix:: 
-
-check-windows::
-
-clean:: 
-
 clean-unix:: clean-libobjs
 
 @libobj_frag@
index 0ec25872eb83c155301b422e4dbe3a91e03dd9ff..b2dcec6b9dea672c98de721a2623ffc9575456b9 100644 (file)
@@ -1,11 +1,7 @@
-mydir=lib/crypto/openssl/sha1
+mydir=lib$(S)crypto$(S)openssl$(S)sha1
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=sha1
-##DOS##OBJFILE=..\$(OUTPRE)sha1.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -15,16 +11,12 @@ OBJS= $(OUTPRE)shs.$(OBJEXT)
 
 SRCS= $(srcdir)/shs.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
 
 depend:: $(SRCS)
 
-clean::
-
 clean-unix:: clean-libobjs
 
 @libobj_frag@
index 6a4a2764857a0642b49f1b96c3d774cff54f36bb..edb93bd27bd287f66545f614a919c76b9fb319f6 100644 (file)
@@ -1,11 +1,7 @@
-mydir=lib/crypto/openssl/sha2
+mydir=lib$(S)crypto$(S)openssl$(S)sha2
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=sha2
-##DOS##OBJFILE=..\$(OUTPRE)sha256.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -15,16 +11,12 @@ OBJS= $(OUTPRE)sha256.$(OBJEXT)
 
 SRCS= $(srcdir)/sha256.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
 
 depend:: $(SRCS)
 
-clean::
-
 clean-unix:: clean-libobjs
 
 @libobj_frag@
index 1316c29fe28c5614f601e6b2963aa888170fb732..4a742ecc6600de78b7d5b137182d3937b6c3d32b 100644 (file)
@@ -1,4 +1,4 @@
-mydir=lib/gssapi
+mydir=lib$(S)gssapi
 BUILDTOP=$(REL)..$(S)..
 SUBDIRS= generic krb5 spnego mechglue
 DEFS=-D_GSS_STATIC_LINK=1
@@ -56,37 +56,6 @@ merged-gssapi-header.h: $(EXPORTED_HEADERS)
 verify-calling-conventions-gssapi: merged-gssapi-header.h
        $(PERL) -w $(top_srcdir)/util/def-check.pl merged-gssapi-header.h $(srcdir)/../gssapi32.def
 
-all-windows::
-       cd generic
-       @echo Making in gssapi\generic
-       $(MAKE) -$(MFLAGS)
-       cd ..\krb5
-       @echo Making in gssapi\krb5
-       $(MAKE) -$(MFLAGS)
-       cd ..\mechglue
-       @echo Making in gssapi\mechglue
-       $(MAKE) -$(MFLAGS)
-       cd ..\spnego
-       @echo Making in gssapi\spnego
-       $(MAKE) -$(MFLAGS)
-       cd ..
-
-clean-windows::
-       cd generic
-       @echo Making clean in gssapi\generic
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\krb5
-       @echo Making clean in gssapi\krb5
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\mechglue
-       @echo Making clean in gssapi\mechglue
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\spnego
-       @echo Making clean in gssapi\spnego
-       $(MAKE) -$(MFLAGS) clean
-       cd ..
-       @echo Making clean in gssapi
-
 # These rules are an attempt to handle several different problems:
 #
 # Certain files in subdirectories must be made current by the
index d68e5f56bc9222f039389232c1b966e44822038d..9221d0b9a29f97367dff2f241e3c83d461662105 100644 (file)
@@ -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=
index a439bef7c14a3a155a095399ee9dd38137e30414..0ff0d39b2c464554492520629b32f8c682897744 100644 (file)
@@ -1,4 +1,4 @@
-mydir=lib/gssapi/krb5
+mydir=lib$(S)gssapi$(S)krb5
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I. -I$(srcdir) -I$(srcdir)/.. -I../generic -I$(srcdir)/../generic -I../mechglue -I$(srcdir)/../mechglue
 DEFS=-D_GSS_STATIC_LINK=1
@@ -237,7 +237,8 @@ error_map.h: $(top_srcdir)/util/gen-map.pl \
                VALUE="char *" \
                COMPARE=compare_OM_uint32 \
                FREEVALUE=free_string
-       $(MV) error_map.new error_map.h
+       $(RM) $@
+       $(MV) error_map.new $@
 
 clean-unix::
        $(RM) $(BUILDTOP)/include/gssapi/gssapi_krb5.h
index d2dccb46be367657a86d40a3ac6f2d878b6b0278..7bb2069da6c41fae8af90dacd64b6be4703a26a6 100644 (file)
@@ -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
index 16741eba447614ed4b9ba3c442230f2d775521bb..49f67abc5f0e8231bce7fcfd5ae16bcb445e1b45 100644 (file)
@@ -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
index 24da5655090618ae0ae7baec5ab750f678da5d37..92085175feef3a9c88e81e4d9537c2ebb97c4ea1 100644 (file)
@@ -1,4 +1,4 @@
-mydir=lib/kadm5
+mydir=lib$(S)kadm5
 BUILDTOP=$(REL)..$(S)..
 SUBDIRS = clnt srv unit-test
 DEFS=
index 81aeb2027acfebb6dd50d441fb3a1242fdf52b05..beda5da5560e7ebc0d226c98e0307f35a8f5ba93 100644 (file)
@@ -1,4 +1,4 @@
-mydir=lib/kadm5/clnt
+mydir=lib$(S)kadm5$(S)clnt
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I$(BUILDTOP)/include/kadm5
 DEFS=
index 378e03c768e44cf37c3c78261daa9097cef66f55..d57d6f08f3875ead77c48fdafe99ce2aac94b6eb 100644 (file)
@@ -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 \
index ecd64c124a5ebaaf696fc5cd8d6745d2f34fe6b0..f8d7b78479354ccb1ad6622aa6bf323229dfb3f3 100644 (file)
@@ -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)
index 3781dfb9acac7748b9cda880ef0cd6dc39be61ee..c49e1b56c3ba1d1ad23278e5821312ca936be59a 100644 (file)
@@ -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 ;
index adaba32aa128875ad901117888941e6f415bcd79..9b95c02bae33289d084cdeb54014b94fa3008119 100644 (file)
@@ -1,7 +1,8 @@
-mydir=lib/krb5
+mydir=lib$(S)krb5
 BUILDTOP=$(REL)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/ccache -I$(srcdir)/keytab -I$(srcdir)/rcache -I$(srcdir)/os -I$(srcdir)/unicode
 SUBDIRS= error_tables asn.1 ccache keytab krb os rcache unicode
+WINSUBDIRS= $(SUBDIRS) posix
 DEFS=
 
 ##DOSBUILDTOP = ..\..
@@ -68,67 +69,6 @@ clean-unix:: clean-liblinks clean-libs clean-libobjs
 clean-windows::
        $(RM) $(OUTPRE)krb5.lib krb5.bak
 
-all-windows::
-       cd asn.1
-       @echo Making in krb5\asn.1
-       $(MAKE) -$(MFLAGS)
-       cd ..\ccache
-       @echo Making in krb5\ccache
-       $(MAKE) -$(MFLAGS)
-       cd ..\error_tables
-       @echo Making in krb5\error_tables
-       $(MAKE) -$(MFLAGS)
-       cd ..\keytab
-       @echo Making in krb5\keytab
-       $(MAKE) -$(MFLAGS)
-       cd ..\krb
-       @echo Making in krb5\krb
-       $(MAKE) -$(MFLAGS)
-       cd ..\os
-       @echo Making in krb5\os
-       $(MAKE) -$(MFLAGS)
-       cd ..\posix
-       @echo Making in krb5\posix
-       $(MAKE) -$(MFLAGS)
-       cd ..\rcache
-       @echo Making in krb5\rcache
-       $(MAKE) -$(MFLAGS)
-       cd ..\unicode
-       @echo Making in krb5\unicode
-       $(MAKE) -$(MFLAGS)
-       cd ..
-
-clean-windows::
-       cd asn.1
-       @echo Making clean in krb5\asn.1
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\ccache
-       @echo Making clean in krb5\ccache
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\error_tables
-       @echo Making clean in krb5\error_tables
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\keytab
-       @echo Making clean in krb5\keytab
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\krb
-       @echo Making clean in krb5\krb
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\os
-       @echo Making clean in krb5\os
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\posix
-       @echo Making clean in krb5\posix
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\rcache
-       @echo Making clean in krb5\rcache
-       $(MAKE) -$(MFLAGS) clean
-       cd ..\unicode
-       @echo Making clean in krb5\unicode
-       $(MAKE) -$(MFLAGS) clean
-       cd ..
-       @echo Making clean locally
-
 install-unix:: install-libs
 
 @lib_frag@
index d0566c12093a977906401e69ad788269a5b093d3..ec8455ca64aa9c7e1cd1696c76e56b5df8af4b46 100644 (file)
@@ -1,4 +1,4 @@
-mydir=lib/krb5/asn.1
+mydir=lib$(S)krb5$(S)asn.1
 BUILDTOP=$(REL)..$(S)..$(S)..
 DEFS=
 
index b421c031f91a031915796cc9bf31c0a26e62194d..021bd760238ae458a111d701f82e84b32fd0f358 100644 (file)
@@ -1,4 +1,4 @@
-mydir=lib/krb5/ccache
+mydir=lib$(S)krb5$(S)ccache
 BUILDTOP=$(REL)..$(S)..$(S)..
 SUBDIRS = # ccapi
 DEFS=
index 135672b0cdd007be6ae2420e6d47e42b76810d6a..7adfb208e0ca97c9991f19c5b028f5c79c10a7b2 100644 (file)
@@ -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
index d340b7b150ee1c5f44d796d2f6e70eabc3003fc6..eb890d196ad4c341cccb11a2fa8e94117ae386f3 100644 (file)
@@ -1,4 +1,4 @@
-mydir=lib/krb5/error_tables
+mydir=lib$(S)krb5$(S)error_tables
 BUILDTOP=$(REL)..$(S)..$(S)..
 DEFS=
 
index 258eac7d367acc3fa81e9e103c671d56a3d7fcad..ccb4a6a2a6fae7ac5c79827ab3cfd5d9c144056a 100644 (file)
@@ -1,4 +1,4 @@
-mydir=lib/krb5/keytab
+mydir=lib$(S)krb5$(S)keytab
 BUILDTOP=$(REL)..$(S)..$(S)..
 DEFS=
 
index d4db454d4babe9e322ade898c4f14700e08b64ee..b96229986baec4734889e3a0db343542d23f8469 100644 (file)
@@ -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)
index dc9d09b1eb9c23004e6859e37520db944cad6040..903d86af1f200437f502756cc08b25897d869816 100644 (file)
@@ -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)
index fec270bc72c6153cf40bb23c9b7550b7bcd68fe0..83e7096705d7232cfbfc570318c76c458d58866d 100644 (file)
@@ -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)
index 5ae89fbe7b6adddf02a80492e38d1c7a89b487f4..63e08c9dfea4011e84c19705efabf413dd0d533e 100644 (file)
@@ -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)
index 578a2d19043941813d5a5f6aa4f6d25ca2b2cf6f..58de423bd73541d66f303d8d5a7a65e90848bb72 100644 (file)
@@ -1,4 +1,4 @@
-mydir=lib/rpc
+mydir=lib$(S)rpc
 BUILDTOP=$(REL)..$(S)..
 DEFINES = -DGSSAPI_KRB5 -DDEBUG_GSSAPI=0 -DGSSRPC__IMPL
 DEFS=
index 71ddef8e00e149dfd563555f331adbc65f373eac..0642e53def37c60e3b971f66f68e0af5965cf0a8 100644 (file)
@@ -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)
index 840ebc22de0e9e92bcbe0d133a36a51db997b375..6e3c0282e7211ae485c411457a1c548005625f39 100644 (file)
@@ -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 ;
index 52f2e7245766da1d75fae853c857b2d7ebfba857..82b10ff0748c803d566795a0d6f2a54fc9040a28 100644 (file)
@@ -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 ;
index 2793aafac53531f1bdce69f8f5219d53ebee8695..54ffe67dc8b1895536df811f0e9828a24e4588dd 100644 (file)
@@ -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 ;
index 883cd14e29bb2fdd9e83bdd4c0aff8db3eac6bbf..0b2a2ef31f2f7bf313410ad4cbee1e4e4083dfc9 100644 (file)
@@ -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 ;
index db570d70621a394d3e73ad0ac7431353e0c37e09..182d802084b24d4e5ff707e575f32d34215fae53 100644 (file)
@@ -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 ;
index 9faf054905433df6a91ecaae68e0ea1cb24c3af5..3cc5da939d8be312b4c0604a8b7ebe27c052e4a7 100644 (file)
@@ -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
 
index 29a3ba88ed199ae784f3ebb446d3f4aaa54af637..aa72ee940e1b232cda2d320f8bdcf6c05afd49e8 100644 (file)
@@ -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 \
index a1c1db4ae9c60da2a55c81540821c69c695241a5..3e1371327af371d62a8e7ac6cfb831665d488b9b 100644 (file)
@@ -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
 
index 9fedc04f351ef203dd3d4f1d6358adb9963b627d..0031b6f95d053dc2323b8e055853607d66739434 100644 (file)
@@ -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
index c8340fc2697bf09fcff69a51ee1710f69c55c88e..c891a73a99663e558a11e64e0efd6876b848c0d1 100644 (file)
@@ -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
 
index 022dca4afc9f2e8dabff3a9b58e6a6195216d029..f13341364d8299c3675831639c2207a2838a31c6 100644 (file)
@@ -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
index 7e3485e407c7bb9641a483504c92172a70fbc6a8..854d50d36a32298e91f3c03c97eecfbc9c0e0d59 100644 (file)
@@ -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@
index fa1485272318a14e95098e67088f79b6f8ee8123..03e1e9902d07d66e118ed31ddd16db04064c4d57 100644 (file)
@@ -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 ;
index 437bcc49a86c9ea6ea14246a811d46fd8eff4186..490c3ecfd39d2c6949d6ad2ddcec311fa2e7024b 100644 (file)
@@ -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 ;
index e269a46a747a949346bf44f8413878dd10c468ee..33f3b157a0b306bfdadfad319eb3ab2e2039c018 100644 (file)
@@ -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=
index 956ab394e4463bf1ee531db05d9656be2ead1f8a..cadc1bfe0fbe5c6057fce282068553f9f042590b 100644 (file)
@@ -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 ;
index 790de8475bfec781747d30dec6095cfd3c277c52..4ac0232e90b2948b9997c3c8d1592a3cc32d40c7 100644 (file)
@@ -1,4 +1,4 @@
-mydir=plugins/locate/python
+mydir=plugins$(S)locate$(S)python
 BUILDTOP=$(REL)..$(S)..$(S)..
 
 LIBBASE=python
index adad2cf85f4607c4da283044e2cd605ed4ebf072..82c5a7b047c6da0e9f8642204f68de1cd17b7d3b 100644 (file)
@@ -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 ;
index 2e2f4161202e2fb800aacfbe341bf91a2ea7107a..963e4d4bb5afd8b28aafc00263545d8d4f17f17e 100644 (file)
@@ -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 ;
index 6f10cea125ad05e79faa5b0f3069575fd3c76417..73bf6c1d091499376f0134deee88122bd6870a03 100644 (file)
@@ -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 ;
index a9f14ced597627fcd976166d79701d3d5237bb5f..642897c9e37eb33c974bb9af792e1ce85086382b 100644 (file)
@@ -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 ;
index 8a9c9ac9dd48c1a664fa886f5a9d9a44ba3520d9..ca6e87d7152a61d99bca425cf9e8396fc3991ca6 100644 (file)
@@ -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 ;
index 14585e3d6b09eb0e4e0ef07fb53e4a1c03351a7a..3bb3858401425b3b37e771bb87e9da5637134fd2 100644 (file)
@@ -1,4 +1,4 @@
-mydir=tests/asn.1
+mydir=tests$(S)asn.1
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
index bacb5d29de931e4fd41c500d6f51565a01ae1eb7..24870e941a030523f8bd97f4411726c3cf6c63a3 100644 (file)
@@ -1,4 +1,4 @@
-mydir=tests/create
+mydir=tests$(S)create
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
index 1cb7509862e1b0b5cf3da1e4e67840204e714841..85c7ab9d1e2923eaf3c359c8087e93d53f6c4233 100644 (file)
@@ -1,4 +1,4 @@
-mydir=tests/dejagnu
+mydir=tests$(S)dejagnu
 BUILDTOP=$(REL)..$(S)..
 RUNTEST = @RUNTEST@ $(DEJAFLAGS)
 RUNTESTFLAGS =
index 917bd1ffb309d2f8a76602ec8b589bc10b5e9e6c..598dcf409331996023d442e0b904c83aa5482d91 100644 (file)
@@ -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)
index 4002d001ef5f9f382bd98343cfb61310a3d232b0..a0e2e47d4ecb9d1d46ae8b006e9fc8e211476ada 100644 (file)
@@ -1,4 +1,4 @@
-mydir=tests/gssapi
+mydir=tests$(S)gssapi
 BUILDTOP=$(REL)..$(S)..
 DEFINES = -DUSE_AUTOCONF_H
 PROG_LIBPATH=-L$(TOPLIBD)
index 2321028ca736dab2e21023bfdf1ba474128a6c7e..c9d551568d6521cd512b1bd8d7b29d3591ca6426 100644 (file)
@@ -1,4 +1,4 @@
-mydir=tests/hammer
+mydir=tests$(S)hammer
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
index 9e52f881192bf9e035d797272b2b4107a2b5a6fb..5a4b329bc2bf2f10a3d1a2ce01f614e87ee0815e 100644 (file)
@@ -1,4 +1,4 @@
-mydir=tests/misc
+mydir=tests$(S)misc
 BUILDTOP=$(REL)..$(S)..
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
index 1785e108f2e9c349ab8762e7dadfa4a7f6d28970..5c53d9e8a430c4e029dd714c4ad78bdbff87ad12 100644 (file)
@@ -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
index 98b87d127a72cbe67f6575ba905aa6e356c70ee5..be761c8d55e905e2829cdd677a85efcdc7e10a38 100644 (file)
@@ -1,4 +1,4 @@
-mydir=tests/resolve
+mydir=tests$(S)resolve
 BUILDTOP=$(REL)..$(S)..
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
index e8a061586dc32bc17042d06fbece567b9e8cfbd0..d569cacd73e54d739386dc5b6116c403c904d5c0 100644 (file)
@@ -1,4 +1,4 @@
-mydir=tests/shlib
+mydir=tests$(S)shlib
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
index 139972a2e293d8ecdffc0787b2b2b6779c0c83ed..0cc4be78ae8262d6e872135ef3036d573057f79f 100644 (file)
@@ -1,4 +1,4 @@
-mydir=tests/threads
+mydir=tests$(S)threads
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
index d46bff035810ae1f65491f4f445a6e58d74e8eb1..0849418024bb74e07939007c508b2bf88c7f2460 100644 (file)
@@ -1,4 +1,4 @@
-mydir=tests/verify
+mydir=tests$(S)verify
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
index ec92828c4456c2b1c3b812c6f63db6fc908cca22..cd9dc0e8d27f348813e97bd04abaf6802a10a87c 100644 (file)
@@ -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_@COM_ERR_VERSION@) $(MAYBE_SS_@SS_VERSION@) \
        profile send-pr
 ##WIN32##!endif
+WINSUBDIRS=windows support et profile
 BUILDTOP=$(REL)..
 
 MAYBE_ET_k5 = et
@@ -20,32 +20,6 @@ clean-unix::
        $(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
index f23f1e5cb61b83014f5089a5b5252f01024da9ec..1f7d3101298d394248f3d610194cd37a73842701 100644 (file)
@@ -1,4 +1,4 @@
-mydir=util/collected-client-lib
+mydir=util$(S)collected-client-lib
 BUILDTOP=$(REL)..$(S)..
 RELDIR=../util/collected-client-lib
 DEFS=
index e585fb3fc2bca9c3ee405b3eece5a8ce986e2296..8a5648c2d44e3ccaed03740811bbdb0e77cf3922 100644 (file)
@@ -2,7 +2,7 @@ prefix=@prefix@
 bindir=@bindir@
 datadir=@datadir@
 mydatadir=$(datadir)/et
-mydir=util/et
+mydir=util$(S)et
 BUILDTOP=$(REL)..$(S)..
 RELDIR=../util/et
 SED = sed
index b857d435ceb5ecc8a9bca7b4ab662923a54beef2..326fd19676ce59883fb4769cf86f72d979ed1ad6 100644 (file)
@@ -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)
index 5ee5ae5d85026902f5a69afc421eeccf132c141b..24d884feb4a1efa68b0598d3d8c0c79a68e6ae4e 100644 (file)
@@ -1,4 +1,4 @@
-mydir=util/send-pr
+mydir=util$(S)send-pr
 BUILDTOP=$(REL)..$(S)..
 #
 # Makefile for building a standalone send-pr.
index d13df4282d3b31ff54e1f90030ed1d455f220d21..3f6fd84f9d198a03a9ea9362a59a4c53f1c93a63 100644 (file)
@@ -1,4 +1,4 @@
-mydir=util/ss
+mydir=util$(S)ss
 BUILDTOP=$(REL)..$(S)..
 SED = sed
 DEFS=
index 6c2be57bbe560156ba65651950f9c0633671c4cd..88520438fa34cc61ab541208917d2dbc72fd90bf 100644 (file)
@@ -1,4 +1,4 @@
-mydir=util/support
+mydir=util$(S)support
 BUILDTOP=$(REL)..$(S)..
 RELDIR=../util/support
 DEFS=
index 6447cf4c60259eabc80a17cea9370c833bea0cac..9cadd576d625cab1299e6932bcc6d7d85666ca0b 100644 (file)
@@ -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)