diff options
| author | Richard Basch <probe@mit.edu> | 1997-02-06 02:31:41 +0000 |
|---|---|---|
| committer | Richard Basch <probe@mit.edu> | 1997-02-06 02:31:41 +0000 |
| commit | a0b9ce4bee60136363cfff7a93c4e42eab972c02 (patch) | |
| tree | 400984337fe3766653ff4cc2cb6b7d3d7f87f3f4 /src/windows/gss | |
| parent | a9266b1dec31de9f33b0d032b885edd377a23ee5 (diff) | |
Windows/NT integration (V1_0_WIN32_BRANCH merge)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9788 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/windows/gss')
| -rw-r--r-- | src/windows/gss/ChangeLog | 8 | ||||
| -rw-r--r-- | src/windows/gss/Makefile.in | 48 |
2 files changed, 36 insertions, 20 deletions
diff --git a/src/windows/gss/ChangeLog b/src/windows/gss/ChangeLog index b2fa4d7b3..ebd251620 100644 --- a/src/windows/gss/ChangeLog +++ b/src/windows/gss/ChangeLog @@ -1,3 +1,11 @@ +Tue Feb 4 16:18:25 1997 Richard Basch <basch@lehman.com> + + * Makefile.in: win16 - fixed the winsock.lib path reference + +Thu Jan 30 22:07:35 1997 Richard Basch <basch@lehman.com> + + * Makefile.in: Win32 - link in the resource file + Fri Nov 22 15:52:55 1996 unknown <bjaspan@mit.edu> * gss-client.c (connect_to_server): use sizeof instead of h_length diff --git a/src/windows/gss/Makefile.in b/src/windows/gss/Makefile.in index 540f24e99..949a8dbb0 100644 --- a/src/windows/gss/Makefile.in +++ b/src/windows/gss/Makefile.in @@ -1,51 +1,59 @@ # makefile: Constructs the Kerberos for Windows ticket manager # Works for both k4 and k5 releases. # -NAME = gss OBJS = gss.obj gss-client.obj gss-misc.obj +##WIN32##XOBJS = resource.obj ##### Options DEBUG = 1 BUILDTOP =..\.. -LIBDIR = $(BUILDTOP)\lib -GLIB = $(LIBDIR)\gssapi.lib -WLIB = $(LIBDIR)\winsock.lib +##WIN16##WLIB = $(BUILDTOP)\lib\winsock.lib INCLUDES = /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5 ##### C Compiler -CC = cl -CFLAGS_RELEASE = /nologo /W3 /AL /GAs /Gy /G2 /Zp /O2 /DNDEBUG=1 -CFLAGS_DEBUG = /nologo /W3 /AL /GAs /Gy /G2 /Zp /O2 /Od /Zi !if $(DEBUG) -CFLAGS = $(CFLAGS_DEBUG) $(INCLUDES) +CFLAGS = $(CCOPTS2) $(INCLUDES) /Zi !else -CFLAGS = $(CFLAGS_RELEASE) $(INCLUDES) +CFLAGS = $(CCOPTS2) $(INCLUDES) !endif ##### RC Compiler -RC = rc -##WIN16##RFLAGS = /nologo $(INCLUDES) +##WIN16##RFLAGS = /nologo /D$(KRB)=1 $(INCLUDES) ##WIN32##RFLAGS = $(INCLUDES) + ##### Linker LINK = link LIBS = $(GLIB) $(WLIB) -SYSLIBS = libw llibcew +##WIN16##SYSLIBS = libw llibcew +##WIN32##SYSLIBS = libc.lib kernel32.lib wsock32.lib user32.lib \ +##WIN32## gdi32.lib comdlg32.lib !if $(DEBUG) -LFLAGS = /co /nologo /nod /nopackcode /map:full +##WIN16##LFLAGS = /co /nologo /nod /nopackcode /map:full +##WIN32##LFLAGS = /nologo /nod /debug !else -LFLAGS = /nologo /nod /nopackcode +##WIN16##LFLAGS = /nologo /nod /nopackcode +##WIN32##LFLAGS = /nologo /nod !endif -all:: makefile $(NAME).exe +all:: makefile gss.exe + +gss.exe: $*.def $*.res $(OBJS) $(XOBJS) $(LIBS) +##WIN16## $(LINK) $(LFLAGS) $(OBJS), $@, $*.map, \ +##WIN16## $(LIBS) $(SYSLIBS), $*.def +##WIN16## $(RC) $(RFLAGS) /k $*.res $@ +##WIN32## $(LINK) $(LFLAGS) /map:$*.map /out:$@ $(OBJS) $(XOBJS) \ +##WIN32## $(LIBS) $(SYSLIBS) + +##WIN32##gss.res: gss.rc +##WIN32## $(RC) $(RFLAGS) /r $*.rc -$(NAME).exe: $*.def $*.res $(OBJS) $(LIBS) - $(LINK) $(LFLAGS) $(OBJS), $@, $*.map, $(LIBS) $(SYSLIBS), $*.def - $(RC) $(RFLAGS) /k $*.res $@ +##WIN32##resource.obj: gss.res +##WIN32## $(CVTRES) /nologo /out:$@ gss.res -$(OBJS) $(NAME).res: gss.h +$(OBJS) gss.res: gss.h -install: +install:: copy gss.exe ..\floppy clean:: |