diff options
Diffstat (limited to 'src/windows/kfwlogon')
-rw-r--r-- | src/windows/kfwlogon/Makefile.in | 26 | ||||
-rw-r--r-- | src/windows/kfwlogon/kfwcpcc.rc | 10 | ||||
-rw-r--r-- | src/windows/kfwlogon/kfwlogon.rc | 10 |
3 files changed, 17 insertions, 29 deletions
diff --git a/src/windows/kfwlogon/Makefile.in b/src/windows/kfwlogon/Makefile.in index 96562ec36b..0d7fcc565b 100644 --- a/src/windows/kfwlogon/Makefile.in +++ b/src/windows/kfwlogon/Makefile.in @@ -13,21 +13,29 @@ LOCALINCLUDES = -I$(BUILDTOP) -I$(PISMERE)\athena\util\loadfuncs \ PROG_LIBPATH=-L$(TOPLIBD) -L$(KRB5_LIBDIR) SYSLIBS = kernel32.lib user32.lib advapi32.lib wsock32.lib secur32.lib userenv.lib -RFLAGS = $(LOCALINCLUDES) -RCFLAGS = $(RFLAGS) -D_WIN32 -all-windows:: $(OUTPRE)kfwlogon.dll $(OUTPRE)kfwcpcc.exe +VERSIONRC = $(BUILDTOP)\windows\version.rc +RCFLAGS=$(CPPFLAGS) -I$(SRCTOP) -D_WIN32 -DRES_ONLY + +KFWLOGON=$(OUTPRE)kfwlogon.dll +KFWCPCC=$(OUTPRE)kfwcpcc.exe -$(OUTPRE)kfwlogon.res: kfwlogon.rc ..\version.rc +LIBRES=$(KFWLOGON:.dll=.res) +EXERES=$(KFWCPCC:.exe=.res) -$(OUTPRE)kfwcpcc.res: kfwcpcc.rc ..\version.rc +$(LIBRES): $(VERSIONRC) + $(RC) $(RCFLAGS) -DKFWLOGON_LIB -fo $@ -r $** +$(EXERES): $(VERSIONRC) + $(RC) $(RCFLAGS) -DKFWCPCC_APP -fo $@ -r $** + +all-windows:: $(OUTPRE)kfwlogon.dll $(OUTPRE)kfwcpcc.exe -$(OUTPRE)kfwlogon.dll: $(OUTPRE)kfwlogon.obj $(OUTPRE)kfwcommon.obj $(OUTPRE)kfwlogon.res - link $(DLL_LINKOPTS) -out:$@ $(OUTPRE)kfwlogon.obj $(OUTPRE)kfwcommon.obj -entry:DllEntryPoint -def:kfwlogon.def $(SYSLIBS) $(KLIB) $(CLIB) +$(KFWLOGON): $(OUTPRE)kfwlogon.obj $(OUTPRE)kfwcommon.obj $(LIBRES) + link $(DLL_LINKOPTS) -out:$@ $(OUTPRE)kfwlogon.obj $(OUTPRE)kfwcommon.obj -entry:DllEntryPoint -def:kfwlogon.def $(SYSLIBS) $(KLIB) $(CLIB) $(LIBRES) $(_VC_MANIFEST_EMBED_DLL) -$(OUTPRE)kfwcpcc.exe: $(OUTPRE)kfwcpcc.obj $(OUTPRE)kfwcommon.obj $(OUTPRE)kfwcpcc.res - link $(EXE_LINKOPTS) -out:$@ $(OUTPRE)kfwcpcc.obj $(OUTPRE)kfwcommon.obj $(SYSLIBS) $(KLIB) $(CLIB) +$(KFWCPCC): $(OUTPRE)kfwcpcc.obj $(OUTPRE)kfwcommon.obj $(EXERES) + link $(EXE_LINKOPTS) -out:$@ $(OUTPRE)kfwcpcc.obj $(OUTPRE)kfwcommon.obj $(SYSLIBS) $(KLIB) $(CLIB) $(EXERES) $(_VC_MANIFEST_EMBED_EXE) install:: diff --git a/src/windows/kfwlogon/kfwcpcc.rc b/src/windows/kfwlogon/kfwcpcc.rc deleted file mode 100644 index 5b0bbf217e..0000000000 --- a/src/windows/kfwlogon/kfwcpcc.rc +++ /dev/null @@ -1,10 +0,0 @@ -#include <windows.h>
-#include <winver.h>
-#include "patchlevel.h"
-
-#define K5_DESCRIPTION "Kerberos for Windows Logon Network Provider\0"
-#define K5_FILETYPE VFT_APP
-#define K5_INTERNAL_NAME "KFWLOGON\0"
-#define K5_ORIGINAL_NAME "kfwcpcc.exe\0"
-
-#include "..\version.rc"
diff --git a/src/windows/kfwlogon/kfwlogon.rc b/src/windows/kfwlogon/kfwlogon.rc deleted file mode 100644 index 1a3cb15eea..0000000000 --- a/src/windows/kfwlogon/kfwlogon.rc +++ /dev/null @@ -1,10 +0,0 @@ -#include <windows.h>
-#include <winver.h>
-#include "patchlevel.h"
-
-#define K5_DESCRIPTION "Kerberos for Windows Logon Network Provider\0"
-#define K5_FILETYPE VFT_DLL
-#define K5_INTERNAL_NAME "KFWLOGON\0"
-#define K5_ORIGINAL_NAME "kfwlogon.dll\0"
-
-#include "..\version.rc"
|