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/clients/kpasswd | |
| parent | f6ca08eb5279fd4b84a8e639ab0a40b927f89948 (diff) | |
| download | krb5-0f4199ae1aaffb40a1f30732c9f50afd923bfea5.zip krb5-0f4199ae1aaffb40a1f30732c9f50afd923bfea5.tar.gz krb5-0f4199ae1aaffb40a1f30732c9f50afd923bfea5.tar.bz2 | |
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/clients/kpasswd')
| -rw-r--r-- | src/clients/kpasswd/Makefile.in | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/clients/kpasswd/Makefile.in b/src/clients/kpasswd/Makefile.in index 0627334..bfa26f7 100644 --- a/src/clients/kpasswd/Makefile.in +++ b/src/clients/kpasswd/Makefile.in @@ -17,6 +17,16 @@ ksetpwd: ksetpwd.o $(KRB5_BASE_DEPLIBS) kpasswd.o: $(srcdir)/kpasswd.c ksetpwd.o: $(srcdir)/ksetpwd.c +##WIN32##VERSIONRC = $(BUILDTOP)\windows\version.rc +##WIN32##RCFLAGS=$(CPPFLAGS) -I$(SRCTOP) -D_WIN32 -DRES_ONLY + +##WIN32##KPWD=$(OUTPRE)kpasswd.exe + +##WIN32##EXERES=$(KPWD:.exe=.res) + +##WIN32##$(EXERES): $(VERSIONRC) +##WIN32## $(RC) $(RCFLAGS) -DKPASSWD_APP -fo $@ -r $** + all-unix:: kpasswd ksetpwd clean-unix:: @@ -26,10 +36,12 @@ install-all install-kdc install-server install-client install-unix:: $(INSTALL_PROGRAM) kpasswd $(DESTDIR)$(CLIENT_BINDIR)/`echo kpasswd|sed '$(transform)'` $(INSTALL_DATA) $(srcdir)/kpasswd.M $(DESTDIR)$(CLIENT_MANDIR)/`echo kpasswd|sed '$(transform)'`.1; -all-windows:: $(OUTPRE)kpasswd.exe +##WIN32##all-windows:: $(KPWD) + +##WIN32##$(KPWD): $(OUTPRE)kpasswd.obj $(KLIB) $(CLIB) $(EXERES) +##WIN32## link $(EXE_LINKOPTS) -out:$@ $** $(SCLIB) +##WIN32## $(_VC_MANIFEST_EMBED_EXE) -$(OUTPRE)kpasswd.exe: $(OUTPRE)kpasswd.obj $(KLIB) $(CLIB) - link $(EXE_LINKOPTS) -out:$@ $** $(SCLIB) # +++ Dependency line eater +++ # # Makefile dependencies follow. This must be the last section in |