From f56c77103d32e3c7a1600457107d7ca2829b13df Mon Sep 17 00:00:00 2001 From: Asanka Herath Date: Wed, 14 Jul 2010 01:37:38 -0400 Subject: [PATCH] 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. --- lib/NTMakefile | 2 +- packages/windows/NTMakefile | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/NTMakefile b/lib/NTMakefile index 4bdc2c46a..a5527e636 100644 --- 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 d4ed8d2d5..cb2fec6d8 100644 --- 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. -- 2.34.1