Windows: Change when assemblies and shims are built

The assemblies should be built when the lib directory is build because
the generated application manifest should be used with all the tools
and executables that use the libraries.

diff --git a/lib/NTMakefile b/lib/NTMakefile
index 4bdc2c46aa9f2d49521b71a44c57753b22011188..a5527e63639cf2aded2616c0e6c6b7b6ac5d01c2 100644 (file)
--- a/lib/NTMakefile
+++ b/lib/NTMakefile
@@ -45,7 +45,7 @@ dir_hcrypto = hcrypto
 
 SUBDIRS = roken vers editline com_err sl wind asn1 sqlite \
        $(dir_hcrypto) hx509 krb5 heimdal ntlm kafs gssapi hdb \
-       kadm5 auth $(dir_45) $(dir_otp) $(dir_dce)
+       kadm5 auth $(dir_45) $(dir_otp) $(dir_dce) ..\packages\windows\assembly
 
 !include ../windows/NTMakefile.w32
 

diff --git a/packages/windows/NTMakefile b/packages/windows/NTMakefile
index d4ed8d2d5b0bdf40cf9413a9ecc03c786ae4467e..cb2fec6d8b911d0ca12acda344fb3a75dbcbc9fd 100644 (file)
--- a/packages/windows/NTMakefile
+++ b/packages/windows/NTMakefile
@@ -30,7 +30,9 @@
 #
 
 RELDIR=packages\windows
-SUBDIRS=assembly
+SUBDIRS=kfw_shim
 
 !include ../../windows/NTMakefile.w32
 
+# Note: the assembly directory is built as a child of the \lib
+# directory since the application manifest is required at that point.