Windows: Merge in application manifest when building assemblies

This commit is contained in:
Asanka C. Herath
2010-11-22 03:36:33 -05:00
parent 402afa0e0d
commit 29383b4cd0
5 changed files with 5 additions and 4 deletions

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

View File

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

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.*

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.*

View File

@@ -99,6 +99,7 @@ test::
{$(BINDIR)}.dll{$(ASMKRBDIR)}.dll: {$(BINDIR)}.dll{$(ASMKRBDIR)}.dll:
$(CP) $< $@ $(CP) $< $@
$(DLLPREP_MERGE)
{$(BINDIR)}.pdb{$(ASMKRBDIR)}.pdb: {$(BINDIR)}.pdb{$(ASMKRBDIR)}.pdb:
$(CP) $< $@ $(CP) $< $@