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/krb524 | |
| 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/krb524')
| -rw-r--r-- | src/krb524/Makefile.in | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in index c1c69ca12f..08ad1e769d 100644 --- a/src/krb524/Makefile.in +++ b/src/krb524/Makefile.in @@ -38,6 +38,7 @@ PROG_RPATH=$(KRB5_LIBDIR) ##WIN32##K4LIB=$(USE_ALTERNATE_KRB4_LIB) ##WIN32##!endif +K524EXE = $(OUTPRE)k524init.exe K524LIB = $(OUTPRE)krb524.lib K524DEP = $(K524LIB) K524DEF = krb524.def @@ -69,9 +70,20 @@ EXTRADEPSRCS = \ ##WIN32##K524DEP=$(STLIBOBJS) ##WIN32##!endif +##WIN32##VERSIONRC = $(BUILDTOP)\windows\version.rc +##WIN32##RCFLAGS=$(CPPFLAGS) -I$(SRCTOP) -D_WIN32 -DRES_ONLY + +##WIN32##EXERES=$(K524EXE:.exe=.res) +##WIN32##LIBRES=$(K524LIB:.lib=.res) + +##WIN32##$(EXERES): $(VERSIONRC) +##WIN32## $(RC) $(RCFLAGS) -DKRB524_INIT -fo $@ -r $** +##WIN32##$(LIBRES): $(VERSIONRC) +##WIN32## $(RC) $(RCFLAGS) -DKRB524_LIB -fo $@ -r $** + all-unix:: krb524d krb524test k524init -all-windows:: $(OUTPRE)k524init.exe $(K524LIB) +##WIN32##all-windows:: $(K524EXE) $(K524LIB) krb524test: test.o $(KRB5_DEPLIB) $(KRB4COMPAT_DEPLIBS) $(CC_LINK) -o krb524test test.o $(KRB5_LIB) $(KRB4COMPAT_LIBS) @@ -85,13 +97,13 @@ krb524d: $(SERVER_OBJS) $(KADMSRV_DEPLIBS) $(KRB5_DEPLIB) $(KRB4COMPAT_DEPLIBS) k524init: $(CLIENT_OBJS) $(KRB5_DEPLIB) $(KRB4COMPAT_DEPLIBS) $(CC_LINK) -o k524init $(CLIENT_OBJS) $(KRB5_LIB) $(KRB4COMPAT_LIBS) -$(K524LIB): $(OUTPRE)krb524.$(OBJEXT) $(OUTPRE)libinit.$(OBJEXT) $(KLIB) $(CLIB) - link $(DLL_LINKOPTS) -def:$(K524DEF) -out:$*.dll $** $(WINLIBS) - $(_VC_MANIFEST_EMBED_DLL) +##WIN32##$(K524LIB): $(OUTPRE)krb524.$(OBJEXT) $(OUTPRE)libinit.$(OBJEXT) $(KLIB) $(CLIB) $(LIBRES) +##WIN32## link $(DLL_LINKOPTS) -def:$(K524DEF) -out:$*.dll $** $(WINLIBS) +##WIN32## $(_VC_MANIFEST_EMBED_DLL) -$(OUTPRE)k524init.exe: $(OUTPRE)k524init.$(OBJEXT) $(KLIB) $(K4LIB) $(CLIB) $(BUILDTOP)\util\windows\$(OUTPRE)getopt.lib - link $(EXE_LINKOPTS) -out:$@ $** $(WINLIBS) $(SCLIB) - $(_VC_MANIFEST_EMBED_EXE) +##WIN32##$(K524EXE): $(OUTPRE)k524init.$(OBJEXT) $(KLIB) $(K4LIB) $(CLIB) $(EXERES) $(BUILDTOP)\util\windows\$(OUTPRE)getopt.lib +##WIN32## link $(EXE_LINKOPTS) -out:$@ $** $(WINLIBS) $(SCLIB) +##WIN32## $(_VC_MANIFEST_EMBED_EXE) install-unix:: $(INSTALL_PROGRAM) krb524d $(DESTDIR)$(SERVER_BINDIR)/krb524d |