oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Windows: Use EXEPREP and DLLPREP macros for processing binaries

Browse Source 
Once DLLs and EXEs are built, they need to have their manifests
processed and signed.  These steps are encapsulated in the EXEPREP and
DLLPREP Makefile macros.  Use them instead of invoking each processing
macro individually.
This commit is contained in:
Asanka Herath
2010-06-10 13:15:36 -04:00
parent 0d09c879f3
commit ea4d8dbfdb
15 changed files with 56 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
kdc/NTMakefile
View File

@@ -67,9 +67,7 @@ BIN_LIBS=\
$(LIBEXECDIR)\hprop.exe: $(OBJ)\hprop.obj $(OBJ)\mit_dump.obj $(BIN_LIBS) $(LIBEXECDIR)\hprop.exe: $(OBJ)\hprop.obj $(OBJ)\mit_dump.obj $(BIN_LIBS)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP)
$(_VC_MANIFEST_CLEAN)
$(_CODESIGN)
!ifdef KRB4 !ifdef KRB4
$(LIBEXECDIR)\hprop.exe: $(OBJ)\v4_dump.obj $(LIBEXECDIR)\hprop.exe: $(OBJ)\v4_dump.obj
@@ -78,34 +76,24 @@ $(LIBEXECDIR)\hprop.exe: $(OBJ)\v4_dump.obj
$(LIBEXECDIR)\hpropd.exe: $(OBJ)\hpropd.obj $(BIN_LIBS) $(LIBEXECDIR)\hpropd.exe: $(OBJ)\hpropd.obj $(BIN_LIBS)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP)
$(_VC_MANIFEST_CLEAN)
$(_CODESIGN)
$(SBINDIR)\kstash.exe: $(OBJ)\kstash.obj $(BIN_LIBS) $(SBINDIR)\kstash.exe: $(OBJ)\kstash.obj $(BIN_LIBS)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP)
$(_VC_MANIFEST_CLEAN)
$(_CODESIGN)
$(BINDIR)\string2key.exe: $(OBJ)\string2key.obj $(BIN_LIBS) $(BINDIR)\string2key.exe: $(OBJ)\string2key.obj $(BIN_LIBS)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP)
$(_VC_MANIFEST_CLEAN)
$(_CODESIGN)
$(BINDIR)\digest-service.exe: $(OBJ)\digest-service.obj $(BIN_LIBS) $(BINDIR)\digest-service.exe: $(OBJ)\digest-service.obj $(BIN_LIBS)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP)
$(_VC_MANIFEST_CLEAN)
$(_CODESIGN)
$(LIBEXECDIR)\kdc.exe: \ $(LIBEXECDIR)\kdc.exe: \
$(OBJ)\connect.obj $(OBJ)\config.obj $(OBJ)\announce.obj $(OBJ)\main.obj $(LIBKDC) $(BIN_LIBS) $(OBJ)\connect.obj $(OBJ)\config.obj $(OBJ)\announce.obj $(OBJ)\main.obj $(LIBKDC) $(BIN_LIBS)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP)
$(_VC_MANIFEST_CLEAN)
$(_CODESIGN)
LIBKDC_OBJS=\ LIBKDC_OBJS=\
$(OBJ)\default_config.obj \ $(OBJ)\default_config.obj \
@@ -141,9 +129,7 @@ LIBKDC_LIBS=$(LIBKDC_LIBS) $(LIBHX509)
$(LIBEXECDIR)\libkdc.dll: $(LIBKDC_OBJS) $(LIBKDC_LIBS) $(LIBEXECDIR)\libkdc.dll: $(LIBKDC_OBJS) $(LIBKDC_LIBS)
$(DLLGUILINK) -implib:$(LIBKDC) -def:libkdc-exports.def $(DLLGUILINK) -implib:$(LIBKDC) -def:libkdc-exports.def
$(_VC_MANIFEST_EMBED_DLL) $(DLLPREP)
$(_VC_MANIFEST_CLEAN)
$(_CODESIGN)
$(LIBKDC): $(LIBEXECDIR)\libkdc.dll $(LIBKDC): $(LIBEXECDIR)\libkdc.dll

28
kuser/NTMakefile
View File

@@ -66,43 +66,31 @@ clean::
$(BINDIR)\kinit.exe: $(OBJ)\kinit.obj $(BINLIBS) $(BINDIR)\kinit.exe: $(OBJ)\kinit.obj $(BINLIBS)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP)
$(_VC_MANIFEST_CLEAN)
$(_CODESIGN)
$(BINDIR)\klist.exe: $(OBJ)\klist.obj $(BINLIBS) $(BINDIR)\klist.exe: $(OBJ)\klist.obj $(BINLIBS)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP)
$(_VC_MANIFEST_CLEAN)
$(_CODESIGN)
$(BINDIR)\kdestroy.exe: $(OBJ)\kdestroy.obj $(BINLIBS) $(BINDIR)\kdestroy.exe: $(OBJ)\kdestroy.obj $(BINLIBS)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP)
$(_VC_MANIFEST_CLEAN)
$(_CODESIGN)
$(BINDIR)\kgetcred.exe: $(OBJ)\kgetcred.obj $(BINLIBS) $(BINDIR)\kgetcred.exe: $(OBJ)\kgetcred.obj $(BINLIBS)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP)
$(_VC_MANIFEST_CLEAN)
$(_CODESIGN)
$(BINDIR)\kswitch.exe: $(OBJ)\kswitch.obj $(BINLIBS) $(BINDIR)\kswitch.exe: $(OBJ)\kswitch.obj $(BINLIBS)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP)
$(_VC_MANIFEST_CLEAN)
$(_CODESIGN)
$(LIBEXECDIR)\kdigest.exe: $(OBJ)\kdigest-commands.obj $(OBJ)\kdigest.obj $(BINLIBS) $(LIBSL) $(LIBEXECDIR)\kdigest.exe: $(OBJ)\kdigest-commands.obj $(OBJ)\kdigest.obj $(BINLIBS) $(LIBSL)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP)
$(_VC_MANIFEST_CLEAN)
$(_CODESIGN)
$(OBJ)\kdigest.obj: kdigest.c $(OBJ)\kdigest.obj: kdigest.c
$(C2OBJ) -I$(OBJ) $(C2OBJ) -I$(OBJ)
@@ -116,7 +104,5 @@ $(OBJ)\kdigest-commands.c $(OBJ)\kdigest-commands.h: kdigest-commands.in
$(LIBEXECDIR)\kimpersonate.exe: $(OBJ)\kimpersonate.obj $(BINLIBS) $(LIBEXECDIR)\kimpersonate.exe: $(OBJ)\kimpersonate.obj $(BINLIBS)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP)
$(_VC_MANIFEST_CLEAN)
$(_CODESIGN)

12
lib/asn1/NTMakefile
View File

@@ -514,9 +514,7 @@ $(BINDIR)\asn1_compile.exe: \
$(OBJ)\main.obj \ $(OBJ)\main.obj \
$(OBJ)\symbol.obj $(OBJ)\symbol.obj
$(EXECONLINK) $(LIBROKEN) $(LIBVERS) $(EXECONLINK) $(LIBROKEN) $(LIBVERS)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP)
$(_VC_MANIFEST_CLEAN)
$(_CODESIGN)
$(OBJ)\lex.c: lex.l $(OBJ)\asn1parse.h $(OBJ)\lex.c: lex.l $(OBJ)\asn1parse.h
$(LEX) -o$@ lex.l $(LEX) -o$@ lex.l
@@ -531,15 +529,11 @@ $(OBJ)\asn1_err.c $(OBJ)\asn1_err.h: asn1_err.et
$(BINDIR)\asn1_print.exe: $(OBJ)\asn1_print.obj $(LIBASN1) $(BINDIR)\asn1_print.exe: $(OBJ)\asn1_print.obj $(LIBASN1)
$(EXECONLINK) $(LIBVERS) $(LIBROKEN) $(LIBCOMERR) $(EXECONLINK) $(LIBVERS) $(LIBROKEN) $(LIBCOMERR)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP)
$(_VC_MANIFEST_CLEAN)
$(_CODESIGN)
$(BINDIR)\asn1_gen.exe: $(OBJ)\asn1_gen.obj $(LIBASN1) $(BINDIR)\asn1_gen.exe: $(OBJ)\asn1_gen.obj $(LIBASN1)
$(EXECONLINK) $(LIBVERS) $(LIBROKEN) $(EXECONLINK) $(LIBVERS) $(LIBROKEN)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP)
$(_VC_MANIFEST_CLEAN)
$(_CODESIGN)
LIBASN1_OBJS= \ LIBASN1_OBJS= \
$(OBJ)\der.obj \ $(OBJ)\der.obj \

8
lib/com_err/NTMakefile
View File

@@ -52,17 +52,13 @@ $(COMERRDLL): $(libcomerr_OBJs) $(OBJ)\libcom_err-version.res
$(DLLGUILINK_C) -out:$(COMERRDLL) -implib:$(LIBCOMERR) $** \ $(DLLGUILINK_C) -out:$(COMERRDLL) -implib:$(LIBCOMERR) $** \
$(LIBROKEN) \ $(LIBROKEN) \
-def:libcom_err-exports.def -def:libcom_err-exports.def
$(_VC_MANIFEST_EMBED_DLL) $(DLLPREP)
$(_VC_MANIFEST_CLEAN)
$(_CODESIGN)
!endif !endif
$(BINDIR)\compile_et.exe: $(OBJ)\parse.obj $(OBJ)\lex.obj $(OBJ)\compile_et.obj $(BINDIR)\compile_et.exe: $(OBJ)\parse.obj $(OBJ)\lex.obj $(OBJ)\compile_et.obj
$(EXECONLINK) $(LIBROKEN) $(LIBVERS) $(EXECONLINK) $(LIBROKEN) $(LIBVERS)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP)
$(_VC_MANIFEST_CLEAN)
$(_CODESIGN)
$(OBJ)\parse.obj: $(OBJ)\parse.c $(OBJ)\parse.obj: $(OBJ)\parse.c
$(C2OBJ) -I$(SRC)\$(RELDIR) $(C2OBJ) -I$(SRC)\$(RELDIR)

4
lib/editline/NTMakefile
View File

@@ -43,9 +43,7 @@ $(LIBDIR)\libeditline.lib: $(libeditline_la_OBJS)
$(OBJ)\testit.exe: $(OBJ)\testit.obj $(LIBEDITLINE) $(LIBROKEN) $(LIBVERS) $(OBJ)\testit.exe: $(OBJ)\testit.obj $(LIBEDITLINE) $(LIBROKEN) $(LIBVERS)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP_NODIST)
$(_VC_MANIFEST_CLEAN)
$(_CODESIGN)
all:: $(LIBEDITLINE) all:: $(LIBEDITLINE)

4
lib/gssapi/NTMakefile
View File

@@ -473,9 +473,7 @@ $(BINDIR)\libgssapi.dll: $(libgssapi_OBJs)
$(libgssapi_OBJs: = $(libgssapi_OBJs: =
) )
<< <<
$(_VC_MANIFEST_EMBED_DLL) $(DLLPREP)
$(_VC_MANIFEST_CLEAN)
$(_CODESIGN)
$(LIBGSSAPI): $(BINDIR)\libgssapi.dll $(LIBGSSAPI): $(BINDIR)\libgssapi.dll

43
lib/hcrypto/NTMakefile
View File

@@ -177,74 +177,59 @@ test-binaries: \
$(OBJ)\destest.exe: $(OBJ)\destest.obj $(TESTLIB) $(LIBROKEN) $(OBJ)\destest.exe: $(OBJ)\destest.obj $(TESTLIB) $(LIBROKEN)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP_NODIST)
$(_VC_MANIFEST_CLEAN)
$(OBJ)\mdtest.exe: $(OBJ)\mdtest.obj $(LIBHCRYPTO) $(LIBROKEN) $(OBJ)\mdtest.exe: $(OBJ)\mdtest.obj $(LIBHCRYPTO) $(LIBROKEN)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP_NODIST)
$(_VC_MANIFEST_CLEAN)
$(OBJ)\rc2test.exe: $(OBJ)\rc2test.obj $(LIBHCRYPTO) $(LIBROKEN) $(OBJ)\rc2test.exe: $(OBJ)\rc2test.obj $(LIBHCRYPTO) $(LIBROKEN)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP_NODIST)
$(_VC_MANIFEST_CLEAN)
$(OBJ)\rctest.exe: $(OBJ)\rctest.obj $(LIBHCRYPTO) $(LIBROKEN) $(OBJ)\rctest.exe: $(OBJ)\rctest.obj $(LIBHCRYPTO) $(LIBROKEN)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP_NODIST)
$(_VC_MANIFEST_CLEAN)
$(OBJ)\test_bn.exe: $(OBJ)\test_bn.obj $(LIBHCRYPTO) $(LIBROKEN) $(LIBASN1) $(OBJ)\test_bn.exe: $(OBJ)\test_bn.obj $(LIBHCRYPTO) $(LIBROKEN) $(LIBASN1)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP_NODIST)
$(_VC_MANIFEST_CLEAN)
$(OBJ)\test_cipher.exe: $(OBJ)\test_cipher.obj $(LIBHCRYPTO) $(LIBROKEN) $(LIBVERS) $(OBJ)\test_cipher.exe: $(OBJ)\test_cipher.obj $(LIBHCRYPTO) $(LIBROKEN) $(LIBVERS)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP_NODIST)
$(_VC_MANIFEST_CLEAN)
$(OBJ)\test_engine_dso.exe: $(OBJ)\test_engine_dso.obj $(LIBHCRYPTO) $(LIBROKEN) $(LIBASN1) $(LIBVERS) $(OBJ)\test_engine_dso.exe: $(OBJ)\test_engine_dso.obj $(LIBHCRYPTO) $(LIBROKEN) $(LIBASN1) $(LIBVERS)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP_NODIST)
$(_VC_MANIFEST_CLEAN)
$(OBJ)\test_hmac.exe: $(OBJ)\test_hmac.obj $(LIBHCRYPTO) $(OBJ)\test_hmac.exe: $(OBJ)\test_hmac.obj $(LIBHCRYPTO)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP_NODIST)
$(_VC_MANIFEST_CLEAN)
$(OBJ)\test_imath.exe: $(OBJ)\test_imath.obj $(TESTLIB) $(LIBROKEN) $(OBJ)\test_imath.exe: $(OBJ)\test_imath.obj $(TESTLIB) $(LIBROKEN)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP_NODIST)
$(_VC_MANIFEST_CLEAN)
$(OBJ)\test_pkcs5.exe: $(OBJ)\test_pkcs5.obj $(LIBHCRYPTO) $(LIBROKEN) $(OBJ)\test_pkcs5.exe: $(OBJ)\test_pkcs5.obj $(LIBHCRYPTO) $(LIBROKEN)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP_NODIST)
$(_VC_MANIFEST_CLEAN)
$(OBJ)\test_pkcs12.exe: $(OBJ)\test_pkcs12.obj $(LIBHCRYPTO) $(LIBASN1) $(LIBROKEN) $(OBJ)\test_pkcs12.exe: $(OBJ)\test_pkcs12.obj $(LIBHCRYPTO) $(LIBASN1) $(LIBROKEN)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP_NODIST)
$(_VC_MANIFEST_CLEAN)
$(OBJ)\test_rsa.exe: $(OBJ)\test_rsa.obj $(LIBHCRYPTO) $(LIBROKEN) $(LIBASN1) $(LIBVERS) $(OBJ)\test_rsa.exe: $(OBJ)\test_rsa.obj $(LIBHCRYPTO) $(LIBROKEN) $(LIBASN1) $(LIBVERS)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP_NODIST)
$(_VC_MANIFEST_CLEAN)
$(OBJ)\test_dh.exe: $(OBJ)\test_dh.obj $(LIBHCRYPTO) $(LIBROKEN) $(LIBASN1) $(LIBVERS) $(OBJ)\test_dh.exe: $(OBJ)\test_dh.obj $(LIBHCRYPTO) $(LIBROKEN) $(LIBASN1) $(LIBVERS)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP_NODIST)
$(_VC_MANIFEST_CLEAN)
$(OBJ)\test_rand.exe: $(OBJ)\test_rand.obj $(LIBHCRYPTO) $(LIBROKEN) $(LIBASN1) $(LIBVERS) $(OBJ)\test_rand.exe: $(OBJ)\test_rand.obj $(LIBHCRYPTO) $(LIBROKEN) $(LIBASN1) $(LIBVERS)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP_NODIST)
$(_VC_MANIFEST_CLEAN)
$(OBJ)\test_crypto.sh: test_crypto.in NTMakefile $(OBJ)\test_crypto.sh: test_crypto.in NTMakefile
$(SED) -e "s,[@]srcdir[@],$(SRCDIR),g" -e "s,[@]exeext[@],.exe,g" < test_crypto.in > $@ $(SED) -e "s,[@]srcdir[@],$(SRCDIR),g" -e "s,[@]exeext[@],.exe,g" < test_crypto.in > $@

8
lib/hdb/NTMakefile
View File

@@ -67,9 +67,7 @@ ldap_objs = $(OBJ)\hdb-ldap.obj
$(ldap_dll): $(ldap_objs) $(ldap_dll): $(ldap_objs)
$(DLLGUILINK) -implib:$(ldap_lib) $(DLLGUILINK) -implib:$(ldap_lib)
$(_VC_MANIFEST_EMBED_DLL) $(DLLPREP)
$(_VC_MANIFEST_CLEAN)
$(_CODESIGN)
clean:: clean::
-$(RM) $(ldap_dll) -$(RM) $(ldap_dll)
@@ -167,11 +165,11 @@ test-binaries: $(OBJ)\test_dbinfo.exe $(OBJ)\test_hdbkeys.exe
$(OBJ)\test_dbinfo.exe: $(OBJ)\test_dbinfo.obj $(LIBHDB) $(LIBKRB5) $(LIBROKEN) $(LIBVERS) $(OBJ)\test_dbinfo.exe: $(OBJ)\test_dbinfo.obj $(LIBHDB) $(LIBKRB5) $(LIBROKEN) $(LIBVERS)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP_NODIST)
$(OBJ)\test_hdbkeys.exe: $(OBJ)\test_hdbkeys.obj $(LIBHDB) $(LIBKRB5) $(LIBROKEN) $(LIBASN1) $(LIBVERS) $(OBJ)\test_hdbkeys.exe: $(OBJ)\test_hdbkeys.obj $(LIBHDB) $(LIBKRB5) $(LIBROKEN) $(LIBASN1) $(LIBVERS)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP_NODIST)
test-run: test-run:
cd $(OBJ) cd $(OBJ)

8
lib/hx509/NTMakefile
View File

@@ -206,11 +206,9 @@ $(OBJ)\hxtool-commands.c $(OBJ)\hxtool-commands.h: hxtool-commands.in $(SLC)
$(SLC) hxtool-commands.in $(SLC) hxtool-commands.in
cd $(SRCDIR) cd $(SRCDIR)
$(BINDIR)\hxtool.exe: $(OBJ)\hxtool.obj $(OBJ)\hxtool-commands.obj $(LIBHX509) $(BINDIR)\hxtool.exe: $(OBJ)\hxtool.obj $(OBJ)\hxtool-commands.obj $(LIBHEIMDAL)
$(EXECONLINK) $(LIBASN1) $(LIBHCRYPTO) $(LIBROKEN) $(LIBSL) $(LIBVERS) $(LIBWIND) $(LIBCOMERR) $(EXECONLINK) $(LIBHEIMDAL) $(LIBROKEN) $(LIBSL) $(LIBVERS) $(LIBCOMERR)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP)
$(_VC_MANIFEST_CLEAN)
$(_CODESIGN)
$(OBJ)\hx509-protos.h: $(OBJ)\hx509-protos.h:
cd $(OBJ) cd $(OBJ)

22
lib/kadm5/NTMakefile
View File

@@ -197,21 +197,15 @@ EXELIBDEPS= \
$(SBINDIR)\iprop-log.exe: $(OBJ)\iprop-log.obj $(OBJ)\iprop-commands.obj $(EXELIBDEPS) $(SBINDIR)\iprop-log.exe: $(OBJ)\iprop-log.obj $(OBJ)\iprop-commands.obj $(EXELIBDEPS)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP)
$(_VC_MANIFEST_CLEAN)
$(_CODESIGN)
$(LIBEXECDIR)\ipropd-master.exe: $(OBJ)\ipropd_master.obj $(OBJ)\ipropd_common.obj $(EXELIBDEPS) $(LIBEXECDIR)\ipropd-master.exe: $(OBJ)\ipropd_master.obj $(OBJ)\ipropd_common.obj $(EXELIBDEPS)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP)
$(_VC_MANIFEST_CLEAN)
$(_CODESIGN)
$(LIBEXECDIR)\ipropd-slave.exe: $(OBJ)\ipropd_slave.obj $(OBJ)\ipropd_common.obj $(EXELIBDEPS) $(LIBEXECDIR)\ipropd-slave.exe: $(OBJ)\ipropd_slave.obj $(OBJ)\ipropd_common.obj $(EXELIBDEPS)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP)
$(_VC_MANIFEST_CLEAN)
$(_CODESIGN)
$(LIBKADM5CLNT): $(LIBKADM5CLNT_OBJS) $(LIBKADM5CLNT): $(LIBKADM5CLNT_OBJS)
$(LIBCON) $(LIBCON)
@@ -220,9 +214,7 @@ $(LIBKADM5SRV): $(BINDIR)\libkadm5srv.dll
$(BINDIR)\libkadm5srv.dll: $(LIBKADM5SRV_OBJS) $(LIBKRB5) $(LIBROKEN) $(LIBHDB) $(LIBCOMERR) $(LIBASN1) $(LIBSQLITE) $(BINDIR)\libkadm5srv.dll: $(LIBKADM5SRV_OBJS) $(LIBKRB5) $(LIBROKEN) $(LIBHDB) $(LIBCOMERR) $(LIBASN1) $(LIBSQLITE)
$(DLLGUILINK) -implib:$(LIBKADM5SRV) -def:libkadm5srv-exports.def $(DLLGUILINK) -implib:$(LIBKADM5SRV) -def:libkadm5srv-exports.def
$(_VC_MANIFEST_EMBED_DLL) $(DLLPREP)
$(_VC_MANIFEST_CLEAN)
$(_CODESIGN)
all:: $(INCFILES) $(LIBKADM5SRV) $(LIBKADM5CLNT) $(SBINPROGRAMS) $(LIBEXECPROGRAMS) all:: $(INCFILES) $(LIBKADM5SRV) $(LIBKADM5CLNT) $(SBINPROGRAMS) $(LIBEXECPROGRAMS)
@@ -243,13 +235,11 @@ test-binaries: \
$(OBJ)\default_keys.exe: $(OBJ)\default_keys.obj $(OBJ)\default_keys.exe: $(OBJ)\default_keys.obj
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP_NODIST)
$(_VC_MANIFEST_CLEAN)
$(OBJ)\sample_passwd_check.dll: $(OBJ)\sample_passwd_check.obj $(OBJ)\sample_passwd_check.dll: $(OBJ)\sample_passwd_check.obj
$(DLLGUILINK) #TODO: Define exports $(DLLGUILINK) #TODO: Define exports
$(_VC_MANIFEST_EMBED_DLL) $(DLLPREP_NODIST)
$(_VC_MANIFEST_CLEAN)
test-run: test-run:

8
lib/krb5/NTMakefile
View File

@@ -352,9 +352,7 @@ clean::
$(BINDIR)\verify_krb5_conf.exe: $(OBJ)\verify_krb5_conf.obj $(LIBKRB5) $(LIBROKEN) $(LIBVERS) $(BINDIR)\verify_krb5_conf.exe: $(OBJ)\verify_krb5_conf.obj $(LIBKRB5) $(LIBROKEN) $(LIBVERS)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP)
$(_VC_MANIFEST_CLEAN)
$(_CODESIGN)
{}.c{$(OBJ)}.obj:: {}.c{$(OBJ)}.obj::
$(C2OBJ_P) -DBUILD_KRB5_LIB $(C2OBJ_P) -DBUILD_KRB5_LIB
@@ -433,8 +431,8 @@ test-run:
$(test_binaries): $$(@R).obj $(test_binaries): $$(@R).obj
$(EXECONLINK) $(LIBKRB5) $(LIBVERS) $(LIBROKEN) $(LIBHCRYPTO) $(LIBASN1) $(EXECONLINK) $(LIBKRB5) $(LIBVERS) $(LIBROKEN) $(LIBHCRYPTO) $(LIBASN1)
$(_VC_MANIFEST_EMBED_EXE) $(EXECONLINK) $(LIBHEIMDAL) $(LIBVERS) $(LIBROKEN)
$(_VC_MANIFEST_CLEAN) $(EXEPREP_NODIST)
$(test_binaries:.exe=.obj): $$(@B).c $(test_binaries:.exe=.obj): $$(@B).c
$(C2OBJ_C) -Fo$@ -Fd$(@D)\ $** -DBlah $(C2OBJ_C) -Fo$@ -Fd$(@D)\ $** -DBlah

3
lib/ntlm/NTMakefile
View File

@@ -69,7 +69,6 @@ test-run:
$(OBJ)\test_ntlm.exe: $(OBJ)\test_ntlm.obj $(LIBHEIMNTLM) $(LIBKRB5) $(LIBVERS) $(LIBROKEN) $(LIBHCRYPTO) $(LIBASN1) $(OBJ)\test_ntlm.exe: $(OBJ)\test_ntlm.obj $(LIBHEIMNTLM) $(LIBKRB5) $(LIBVERS) $(LIBROKEN) $(LIBHCRYPTO) $(LIBASN1)
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP_NODIST)
$(_VC_MANIFEST_CLEAN)
test:: test-binaries test-run test:: test-binaries test-run

6
lib/sl/NTMakefile
View File

@@ -40,8 +40,7 @@ $(LIBSL): $(OBJ)\sl.obj
$(BINDIR)\slc.exe: $(OBJ)\slc-gram.obj $(OBJ)\slc-lex.obj $(BINDIR)\slc.exe: $(OBJ)\slc-gram.obj $(OBJ)\slc-lex.obj
$(EXECONLINK) $(LIBROKEN) $(LIBVERS) $(EXECONLINK) $(LIBROKEN) $(LIBVERS)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP)
$(_VC_MANIFEST_CLEAN)
$(OBJ)\slc-gram.c: slc-gram.y $(OBJ)\slc-gram.c: slc-gram.y
$(YACC) -o $@ --defines=$(@R).h slc-gram.y $(YACC) -o $@ --defines=$(@R).h slc-gram.y
@@ -57,8 +56,7 @@ $(OBJ)\slc-lex.obj: $(OBJ)\slc-lex.c
$(OBJ)\test_sl.exe: $(OBJ)\test_sl.obj $(OBJ)\test_sl.exe: $(OBJ)\test_sl.obj
$(EXECONLINK) $(LIBSL) $(LIBVERS) $(LIBROKEN) $(EXECONLINK) $(LIBSL) $(LIBVERS) $(LIBROKEN)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP_NODIST)
$(_VC_MANIFEST_CLEAN)
all:: $(INCFILES) $(LIBSL) $(BINDIR)\slc.exe all:: $(INCFILES) $(LIBSL) $(BINDIR)\slc.exe

3
lib/vers/NTMakefile
View File

@@ -43,8 +43,7 @@ $(OBJ)\print_version.obj: print_version.c
$(OBJ)\make-print-version.exe: $(OBJ)\make-print-version.obj $(OBJ)\make-print-version.exe: $(OBJ)\make-print-version.obj
$(EXECONLINK) $(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE) $(EXEPREP_NODIST)
$(_VC_MANIFEST_CLEAN)
$(OBJ)\print_version.h: $(OBJ)\make-print-version.exe $(OBJ)\print_version.h: $(OBJ)\make-print-version.exe
$(OBJ)\make-print-version.exe $@ $(OBJ)\make-print-version.exe $@

4
lib/wind/NTMakefile
View File

@@ -125,8 +125,8 @@ TEST_BINARIES=\
{$(OBJ)}.obj{$(OBJ)}.exe: {$(OBJ)}.obj{$(OBJ)}.exe:
$(EXECONLINK) $(LIBWIND) $(LIBROKEN) $(EXECONLINK) $(LIBWIND) $(LIBROKEN)
$(_VC_MANIFEST_EMBED_EXE) $(EXECONLINK) $(LIBHEIMDAL) $(LIBROKEN)
$(_VC_MANIFEST_CLEAN) $(EXEPREP_NODIST)
$(OBJ)\test-bidi.exe: $(OBJ)\test-bidi.obj $(OBJ)\test-bidi.exe: $(OBJ)\test-bidi.obj