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

Embed application manifest in Heimdal assembly .dlls

Browse Source
This commit is contained in:
Asanka C. Herath
2010-10-01 13:33:21 -04:00
parent f4f0d20ff7
commit 6ee40622b1
5 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/com_err/NTMakefile
View File

@@ -54,7 +54,7 @@ $(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
$(DLLPREP) $(DLLPREP_NODIST)
!endif !endif

2
lib/gssapi/NTMakefile
View File

@@ -473,7 +473,7 @@ $(BINDIR)\gssapi.dll: $(libgssapi_OBJs) $(RES)
$(libgssapi_OBJs: = $(libgssapi_OBJs: =
) )
<< <<
$(DLLPREP) $(DLLPREP_NODIST)
$(LIBGSSAPI): $(BINDIR)\gssapi.dll $(LIBGSSAPI): $(BINDIR)\gssapi.dll

2
lib/heimdal/NTMakefile
View File

@@ -73,7 +73,7 @@ $(DLL): $(DLLDEPS) $(DEF) $(RES)
$(DLLGUILINK_C) $(DLLDEPS) $(DLLSDKDEPS) $(RES) \ $(DLLGUILINK_C) $(DLLDEPS) $(DLLSDKDEPS) $(RES) \
-def:$(DEF) -out:$(DLL) \ -def:$(DEF) -out:$(DLL) \
-implib:$(LIBHEIMDAL) -implib:$(LIBHEIMDAL)
$(DLLPREP) $(DLLPREP_NODIST)
clean:: clean::
-$(RM) $(BINDIR)\heimdal.* -$(RM) $(BINDIR)\heimdal.*

2
lib/ntlm/NTMakefile
View File

@@ -50,7 +50,7 @@ $(LIBHEIMNTLM): $(BINDIR)\heimntlm.dll
$(BINDIR)\heimntlm.dll: $(OBJ)\ntlm.obj $(LIBHEIMDAL) $(RES) $(BINDIR)\heimntlm.dll: $(OBJ)\ntlm.obj $(LIBHEIMDAL) $(RES)
$(DLLGUILINK) -def:libheimntlm-exports.def -implib:$(LIBHEIMNTLM) $(DLLGUILINK) -def:libheimntlm-exports.def -implib:$(LIBHEIMNTLM)
$(DLLPREP) $(DLLPREP_NODIST)
clean:: clean::
-$(RM) $(BINDIR)\heimntlm.* -$(RM) $(BINDIR)\heimntlm.*

29
packages/windows/assembly/NTMakefile
View File

@@ -82,9 +82,10 @@ $(ASMKRBDIR)\$(ASMKRBNAME).cat: $(ASMKRBDIR)\$(ASMKRBMAN).cdf
cd $(SRCDIR) cd $(SRCDIR)
asm-krb: \ asm-krb: \
$(ASMKRBBINS) \ $(APPMANIFEST) \
$(ASMKRBDIR)\$(ASMKRBMAN) \ $(ASMKRBBINS) \
$(ASMKRBDIR)\$(ASMKRBNAME).cat $(ASMKRBDIR)\$(ASMKRBMAN) \
$(ASMKRBDIR)\$(ASMKRBNAME).cat \
all:: asm-krb all:: asm-krb
@@ -94,6 +95,14 @@ clean::
test:: test::
$(MT) -manifest $(ASMKRBDIR)\$(ASMKRBMAN) -validate_manifest $(MT) -manifest $(ASMKRBDIR)\$(ASMKRBMAN) -validate_manifest
{$(BINDIR)}.dll{$(ASMKRBDIR)}.dll:
$(CP) $< $@
$(DLLPREP_MERGE)
{$(BINDIR)}.pdb{$(ASMKRBDIR)}.pdb:
$(CP) $< $@
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Heimdal.GSSAPI Assembly # Heimdal.GSSAPI Assembly
@@ -128,9 +137,10 @@ $(ASMGSSDIR)\$(ASMGSSNAME).cat: $(ASMGSSDIR)\$(ASMGSSMAN).cdf
cd $(SRCDIR) cd $(SRCDIR)
asm-gss: \ asm-gss: \
$(ASMGSSBINS) \ $(APPMANIFEST) \
$(ASMGSSDIR)\$(ASMGSSMAN) \ $(ASMGSSBINS) \
$(ASMGSSDIR)\$(ASMGSSNAME).cat $(ASMGSSDIR)\$(ASMGSSMAN) \
$(ASMGSSDIR)\$(ASMGSSNAME).cat \
all:: asm-gss all:: asm-gss
@@ -139,6 +149,7 @@ clean::
{$(BINDIR)}.dll{$(ASMGSSDIR)}.dll: {$(BINDIR)}.dll{$(ASMGSSDIR)}.dll:
$(CP) $< $@ $(CP) $< $@
$(DLLPREP_MERGE)
{$(BINDIR)}.pdb{$(ASMGSSDIR)}.pdb: {$(BINDIR)}.pdb{$(ASMGSSDIR)}.pdb:
$(CP) $< $@ $(CP) $< $@
@@ -220,12 +231,6 @@ clean::
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
{$(BINDIR)}.dll{$(ASMKRBDIR)}.dll:
$(CP) $< $@
{$(BINDIR)}.pdb{$(ASMKRBDIR)}.pdb:
$(CP) $< $@
.SUFFIXES: .dll .pdb .SUFFIXES: .dll .pdb
mk-asm-dirs: mk-asm-dirs: