diff options
| author | Jeffrey Altman <jaltman@secure-endpoints.com> | 2007-04-14 16:38:50 +0000 |
|---|---|---|
| committer | Jeffrey Altman <jaltman@secure-endpoints.com> | 2007-04-14 16:38:50 +0000 |
| commit | 0f4199ae1aaffb40a1f30732c9f50afd923bfea5 (patch) | |
| tree | 502be1b5853cbb5982b6a71479166a18eb184f04 /src/windows/ms2mit | |
| parent | f6ca08eb5279fd4b84a8e639ab0a40b927f89948 (diff) | |
| download | krb5-0f4199ae1aaffb40a1f30732c9f50afd923bfea5.tar.gz krb5-0f4199ae1aaffb40a1f30732c9f50afd923bfea5.tar.xz krb5-0f4199ae1aaffb40a1f30732c9f50afd923bfea5.zip | |
Add resource data windows/version.rc for:
kinit.exe, klist.exe, kdestroy.exe, kvno.exe
kdeltkt.exe, kcpytkt.exe, kfwlogon.dll, kfwcpcc.exe
gss-client.exe, gss-server.exe, kpasswd.exe
Remove resource files: kfwcpcc.rc kfwlogon.rc and use
windows/version.rc in their place
Add resource make rules to Makefile.in files included
in this commit
Add missing _VC_MANIFEST_EMBED_EXE rule to kpasswd/Makefile.in
Comment out addition Windows only make rules with ##WIN32##
ticket: 5529
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19471 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/windows/ms2mit')
| -rw-r--r-- | src/windows/ms2mit/Makefile.in | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/src/windows/ms2mit/Makefile.in b/src/windows/ms2mit/Makefile.in index 6162eb08e..0bb4d8d70 100644 --- a/src/windows/ms2mit/Makefile.in +++ b/src/windows/ms2mit/Makefile.in @@ -9,14 +9,28 @@ BUILDTOP=$(REL)..$(S).. DEFINES = PROG_LIBPATH=-L$(TOPLIBD) -L$(KRB5_LIBDIR) -all-windows:: $(OUTPRE)ms2mit.exe $(OUTPRE)mit2ms.exe +VERSIONRC = $(BUILDTOP)\windows\version.rc +RCFLAGS=$(CPPFLAGS) -I$(SRCTOP) -D_WIN32 -DRES_ONLY -$(OUTPRE)ms2mit.exe: $(OUTPRE)ms2mit.obj - link $(EXE_LINKOPTS) -out:$@ $(OUTPRE)ms2mit.obj $(BUILDTOP)\util\windows\$(OUTPRE)getopt.obj user32.lib advapi32.lib $(KLIB) $(CLIB) +MS2MIT=$(OUTPRE)ms2mit.exe +MIT2MS=$(OUTPRE)mit2ms.exe + +MS2MITRES=$(MS2MIT:.exe=.res) +MIT2MSRES=$(MIT2MS:.exe=.res) + +$(MS2MITRES): $(VERSIONRC) + $(RC) $(RCFLAGS) -DMS2MIT_APP -fo $@ -r $** +$(MIT2MSRES): $(VERSIONRC) + $(RC) $(RCFLAGS) -DMIT2MS_APP -fo $@ -r $** + +all-windows:: $(MS2MIT) $(MIT2MS) + +$(MS2MIT): $(OUTPRE)ms2mit.obj $(MS2MITRES) + link $(EXE_LINKOPTS) -out:$@ $(OUTPRE)ms2mit.obj $(BUILDTOP)\util\windows\$(OUTPRE)getopt.obj user32.lib advapi32.lib $(KLIB) $(CLIB) $(MS2MITRES) $(_VC_MANIFEST_EMBED_EXE) -$(OUTPRE)mit2ms.exe: $(OUTPRE)mit2ms.obj - link $(EXE_LINKOPTS) -out:$@ $(OUTPRE)mit2ms.obj $(BUILDTOP)\util\windows\$(OUTPRE)getopt.obj user32.lib advapi32.lib $(KLIB) $(CLIB) +$(MIT2MS): $(OUTPRE)mit2ms.obj $(MIT2MSRES) + link $(EXE_LINKOPTS) -out:$@ $(OUTPRE)mit2ms.obj $(BUILDTOP)\util\windows\$(OUTPRE)getopt.obj user32.lib advapi32.lib $(KLIB) $(CLIB) $(MIT2MSRES) $(_VC_MANIFEST_EMBED_EXE) install:: |