diff options
| author | Danilo Almeida <dalmeida@mit.edu> | 1999-05-17 22:45:16 +0000 |
|---|---|---|
| committer | Danilo Almeida <dalmeida@mit.edu> | 1999-05-17 22:45:16 +0000 |
| commit | 1047241e7af84ba0a0ac97a1e92c4ecae56459b5 (patch) | |
| tree | a67245b54eb197dff330d23804476d5f5fa8f22f /src/windows/wintel | |
| parent | 17e8780961b3c0865763ac07013911682b753a33 (diff) | |
| download | krb5-1047241e7af84ba0a0ac97a1e92c4ecae56459b5.tar.gz krb5-1047241e7af84ba0a0ac97a1e92c4ecae56459b5.tar.xz krb5-1047241e7af84ba0a0ac97a1e92c4ecae56459b5.zip | |
Remove win16 stuff. Fix resource dependencies. Link resource file
directly instead of explicitly converting it to an object file.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11455 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/windows/wintel')
| -rw-r--r-- | src/windows/wintel/ChangeLog | 6 | ||||
| -rw-r--r-- | src/windows/wintel/Makefile.in | 57 |
2 files changed, 27 insertions, 36 deletions
diff --git a/src/windows/wintel/ChangeLog b/src/windows/wintel/ChangeLog index 53a7736e93..0e6adc2960 100644 --- a/src/windows/wintel/ChangeLog +++ b/src/windows/wintel/ChangeLog @@ -1,3 +1,9 @@ +Mon May 17 14:23:13 1999 Danilo Almeida <dalmeida@mit.edu> + + * Makefile.in: Remove win16 stuff. Fix resource dependencies. + Link resource file directly instead of explicitly + converting it to an object file. + 1999-04-17 <tytso@rsts-11.mit.edu> * screen.c (DeleteTopLine): Free the top line before when we allow diff --git a/src/windows/wintel/Makefile.in b/src/windows/wintel/Makefile.in index 32ca0abf95..4d25a8ed06 100644 --- a/src/windows/wintel/Makefile.in +++ b/src/windows/wintel/Makefile.in @@ -1,55 +1,40 @@ # Makefile for the Kerberos for Windows telnet client # Works for both k4 and k5 releases. # -OBJS = $(OUTPRE)telnet.obj $(OUTPRE)negotiat.obj $(OUTPRE)auth.obj $(OUTPRE)edit.obj $(OUTPRE)emul.obj \ - $(OUTPRE)font.obj $(OUTPRE)intern.obj $(OUTPRE)screen.obj $(OUTPRE)encrypt.obj $(OUTPRE)genget.obj +OBJS = $(OUTPRE)telnet.obj $(OUTPRE)negotiat.obj $(OUTPRE)auth.obj \ + $(OUTPRE)edit.obj $(OUTPRE)emul.obj $(OUTPRE)font.obj \ + $(OUTPRE)intern.obj $(OUTPRE)screen.obj $(OUTPRE)encrypt.obj \ + $(OUTPRE)genget.obj ##### Options # Set NODEBUG if building release instead of debug !IF ! defined(KVERSION) -KRBOPT=-DFORWARD -DAUTHENTICATION -DENCRYPTION -DDES_ENCRYPTION -KVERSION = 5 +KRBOPT =-DFORWARD -DAUTHENTICATION -DENCRYPTION -DDES_ENCRYPTION +KVERSION= 5 !endif -KRB = KRB$(KVERSION) +KRB = KRB$(KVERSION) -BUILDTOP =..\.. -INCLUDES = /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5 \ +BUILDTOP=..\.. +INCLUDES= /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5 \ /I$(BUILDTOP)\lib\crypto\des -##WIN16##XOBJS = k5stream.obj enc_des.obj -##WIN32##XOBJS = $(OUTPRE)resource.obj $(OUTPRE)k5stream.obj $(OUTPRE)enc_des.obj - -CFLAGS = $(CCOPTS2) $(INCLUDES) /D$(KRB)=1 $(KRBOPT) - -##WIN32##RFLAGS = $(INCLUDES) -##WIN16##RFLAGS = /nologo $(INCLUDES) +RESFILE = $(OUTPRE)telnet.res +XOBJS = $(RESFILE) $(OUTPRE)k5stream.obj $(OUTPRE)enc_des.obj +CFLAGS = $(CCOPTS2) $(INCLUDES) /D$(KRB)=1 $(KRBOPT) +RFLAGS = $(INCLUDES) +RCFLAGS = $(RFLAGS) -D_WIN32 -DTELNET_APP ##### Linker -LINK = link -LIBS = $(KLIB) $(CLIB) $(WLIB) -##WIN16##SYSLIBS = libw llibcew commdlg winsock -##WIN32##SYSLIBS = kernel32.lib wsock32.lib user32.lib gdi32.lib \ -##WIN32## comdlg32.lib -!ifdef NODEBUG -##WIN16##LFLAGS = /nologo /nod /nopackcode -!else -##WIN16##LFLAGS = /co /nologo /nod /nopackcode /map:full -!endif -##WIN32##LFLAGS = /nologo $(LOPTS) +LINK = link +LIBS = $(KLIB) $(CLIB) $(WLIB) +SYSLIBS = kernel32.lib wsock32.lib user32.lib gdi32.lib comdlg32.lib +LFLAGS = /nologo $(LOPTS) -all:: makefile $(OUTPRE)telnet.exe +all:: Makefile $(OUTPRE)telnet.exe $(OUTPRE)telnet.exe: telnet.def $(OBJS) $(XOBJS) $(LIBS) -##WIN16## $(LINK) $(LFLAGS) $(OBJS) $(XOBJS), $@, $*.map, \ -##WIN16## $(LIBS) $(SYSLIBS), telnet.def -##WIN16## $(RC) $(RFLAGS) /k -DTELNET_APP telnet.rc $@ -##WIN32## $(LINK) $(LFLAGS) /map:$*.map /out:$@ $(OBJS) $(XOBJS) \ -##WIN32## $(LIBS) $(SYSLIBS) - -##WIN32##$(OUTPRE)telnet.res: telnet.rc -##WIN32## $(RC) $(RFLAGS) -D_WIN32 -DTELNET_APP -fo $@ /r $** -##WIN32##$(OUTPRE)resource.obj: $(OUTPRE)telnet.res -##WIN32## $(CVTRES) /nologo /out:$@ $** + $(LINK) $(LFLAGS) /map:$*.map /out:$@ $(OBJS) $(XOBJS) \ + $(LIBS) $(SYSLIBS) install:: copy $(OUTPRE)telnet.exe $(DESTDIR) |