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

Windows: Include manifest dependencies by default when building tools

Browse Source
This commit is contained in:
Asanka C. Herath
2010-09-27 16:07:49 -04:00
parent f1e276cc20
commit 1b32efe62c
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/asn1/NTMakefile
View File

@@ -514,7 +514,7 @@ $(BINDIR)\asn1_compile.exe: \
$(OBJ)\symbol.obj \ $(OBJ)\symbol.obj \
$(OBJ)\asn1_compile-version.res $(OBJ)\asn1_compile-version.res
$(EXECONLINK) $(LIBROKEN) $(LIBVERS) $(EXECONLINK) $(LIBROKEN) $(LIBVERS)
$(EXEPREP) $(EXEPREP_NOHEIM)
$(OBJ)\lex.c: lex.l $(OBJ)\asn1parse.h $(OBJ)\lex.c: lex.l $(OBJ)\asn1parse.h
$(LEX) -o$@ lex.l $(LEX) -o$@ lex.l

2
lib/com_err/NTMakefile
View File

@@ -60,7 +60,7 @@ $(COMERRDLL): $(libcomerr_OBJs) $(OBJ)\libcom_err-version.res
$(BINDIR)\compile_et.exe: $(OBJ)\parse.obj $(OBJ)\lex.obj $(OBJ)\compile_et.obj $(OBJ)\compile_et-version.res $(BINDIR)\compile_et.exe: $(OBJ)\parse.obj $(OBJ)\lex.obj $(OBJ)\compile_et.obj $(OBJ)\compile_et-version.res
$(EXECONLINK) $(LIBROKEN) $(LIBVERS) $(EXECONLINK) $(LIBROKEN) $(LIBVERS)
$(EXEPREP) $(EXEPREP_NOHEIM)
$(OBJ)\parse.obj: $(OBJ)\parse.c $(OBJ)\parse.obj: $(OBJ)\parse.c
$(C2OBJ) -I$(SRC)\$(RELDIR) $(C2OBJ) -I$(SRC)\$(RELDIR)

2
lib/sl/NTMakefile
View File

@@ -40,7 +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)
$(EXEPREP) $(EXEPREP_NOHEIM)
$(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

14
windows/NTMakefile.w32
View File

@@ -425,6 +425,9 @@ clean::
MT=mt.exe -nologo MT=mt.exe -nologo
_VC_MANIFEST_EMBED_EXE= \ _VC_MANIFEST_EMBED_EXE= \
( if exist $@.manifest $(MT) -outputresource:$@;1 -manifest $@.manifest $(APPMANIFEST) )
_VC_MANIFEST_EMBED_EXE_NOHEIM= \
( if exist $@.manifest $(MT) -outputresource:$@;1 -manifest $@.manifest ) ( if exist $@.manifest $(MT) -outputresource:$@;1 -manifest $@.manifest )
_VC_MANIFEST_EMBED_DLL= \ _VC_MANIFEST_EMBED_DLL= \
@@ -475,16 +478,19 @@ _CODESIGN=( echo Skipping code sign )
# prepare binaries. # prepare binaries.
EXEPREP=\ EXEPREP=\
( $(_VC_MANIFEST_EMBED_EXE) && $(_VC_MANIFEST_CLEAN) && $(_CODESIGN) ) || $(RM) $@ ( $(_VC_MANIFEST_EMBED_EXE) && $(_VC_MANIFEST_CLEAN) && $(_CODESIGN) ) || ( $(RM) $@ && exit /b 1 )
EXEPREP_NOHEIM=\
( $(_VC_MANIFEST_EMBED_EXE_NOHEIM) && $(_VC_MANIFEST_CLEAN) && $(_CODESIGN) ) || ( $(RM) $@ && exit /b 1 )
EXEPREP_NODIST=\ EXEPREP_NODIST=\
( $(_VC_MANIFEST_EMBED_EXE) && $(_VC_MANIFEST_CLEAN) ) || $(RM) $@ ( $(_VC_MANIFEST_EMBED_EXE_NOHEIM) && $(_VC_MANIFEST_CLEAN) ) || ( $(RM) $@ && exit /b 1 )
DLLPREP=\ DLLPREP=\
( $(_VC_MANIFEST_EMBED_DLL) && $(_VC_MANIFEST_CLEAN) && $(_CODESIGN) ) || $(RM) $@ ( $(_VC_MANIFEST_EMBED_DLL) && $(_VC_MANIFEST_CLEAN) && $(_CODESIGN) ) || ( $(RM) $@ && exit /b 1 )
DLLPREP_NODIST=\ DLLPREP_NODIST=\
( $(_VC_MANIFEST_EMBED_DLL) && $(_VC_MANIFEST_CLEAN) ) || $(RM) $@ ( $(_VC_MANIFEST_EMBED_DLL) && $(_VC_MANIFEST_CLEAN) ) || ( $(RM) $@ && exit /b 1 )
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# Convenience macros for import libraries and assemblies # Convenience macros for import libraries and assemblies