From: Danilo Almeida Date: Mon, 17 May 1999 22:45:16 +0000 (+0000) Subject: Remove win16 stuff. Fix resource dependencies. Link resource file X-Git-Tag: krb5-1.1-beta1~149 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1047241e7af84ba0a0ac97a1e92c4ecae56459b5;p=krb5.git 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 --- diff --git a/src/windows/cns/ChangeLog b/src/windows/cns/ChangeLog index 1c8b5f5b9..282bbf527 100644 --- a/src/windows/cns/ChangeLog +++ b/src/windows/cns/ChangeLog @@ -1,3 +1,9 @@ +Mon May 17 14:19:30 1999 Danilo Almeida + + * Makefile.in: Remove win16 stuff. Fix resource dependencies. + Link resource file directly instead of explicitly + converting it to an object file. + Mon May 10 15:27:57 1999 Danilo Almeida * Makefile.in: Do win32 build in subdir. diff --git a/src/windows/cns/Makefile.in b/src/windows/cns/Makefile.in index 511f3dd27..0840cc69d 100644 --- a/src/windows/cns/Makefile.in +++ b/src/windows/cns/Makefile.in @@ -15,18 +15,17 @@ KRB = KRB$(KVERSION) BUILDTOP = .. LIBDIR = $(BUILDTOP)\lib\krb KLIB = $(LIBDIR)\kerberos.lib -##WIN16##WLIB = $(LIBDIR)\winsock.lib INCLUDES = /I$(BUILDTOP)\include -##WIN16##XOBJS = -##WIN32##XOBJS = cnsres4.obj +RESFILE = $(OUTPRE)cnsres4.res +XOBJS = $(RESFILE) !endif !if $(KVERSION) == 5 BUILDTOP =..\.. LIBDIR = $(BUILDTOP)\lib INCLUDES = /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5 -##WIN16##XOBJS = kpasswd.obj -##WIN32##XOBJS = $(OUTPRE)cnsres5.obj $(OUTPRE)kpasswd.obj $(OUTPRE)cns_reg.obj +RESFILE = $(OUTPRE)cnsres5.res +XOBJS = $(RESFILE) $(OUTPRE)kpasswd.obj $(OUTPRE)cns_reg.obj !endif ##### C Compiler @@ -38,9 +37,9 @@ CFLAGS = $(CCOPTS2) $(INCLUDES) /D$(KRB)=1 /DDEBUG !endif ##### RC Compiler -RC = rc -##WIN16##RFLAGS = /nologo /D$(KRB)=1 $(INCLUDES) -##WIN32##RFLAGS = /D$(KRB)=1 $(INCLUDES) +#RC = rc +RFLAGS = /D$(KRB)=1 $(INCLUDES) +RCFLAGS = $(RFLAGS) -DKRB5_APP ##### CVSRES -- .res -> .obj converter CVTRES = cvtres @@ -48,31 +47,14 @@ CVTRES = cvtres ##### Linker LINK = link LIBS = $(KLIB) $(CLIB) $(WLIB) ../lib/$(OUTPRE)libwin.lib -##WIN16##SYSLIBS = libw llibcew -##WIN32##SYSLIBS = kernel32.lib wsock32.lib user32.lib gdi32.lib advapi32.lib -!ifdef NODEBUG -##WIN16##LFLAGS = /nologo /nod /nopackcode -!else -##WIN16##LFLAGS = /co /nologo /nod /nopackcode /map:full -!endif -##WIN32##LFLAGS = /nologo $(LOPTS) +SYSLIBS = kernel32.lib wsock32.lib user32.lib gdi32.lib advapi32.lib +LFLAGS = /nologo $(LOPTS) -all:: makefile $(OUTPRE)$(NAME).exe +all:: Makefile $(OUTPRE)$(NAME).exe $(OUTPRE)$(NAME).exe: $(NAME).def $(OBJS) $(XOBJS) $(LIBS) -##WIN16## $(LINK) $(LFLAGS) $(OBJS) $(XOBJS), $@, $*.map, \ -##WIN16## $(LIBS) $(SYSLIBS), $*.def -##WIN16## $(RC) $(RFLAGS) -DKRB5_APP /k cnsres4.res $@ -##WIN32## $(LINK) $(LFLAGS) /map:$*.map /out:$@ $(OBJS) $(XOBJS) \ -##WIN32## $(LIBS) $(SYSLIBS) - -##WIN32##.rc.obj: -##WIN32## $(RC) $(RFLAGS) -DKRB5_APP /r $*.rc -##WIN32## $(CVTRES) /nologo /out:$*.obj $*.res - -##WIN32##{}.rc{$(OUTPRE)}.obj: -##WIN32## $(RC) $(RFLAGS) -DKRB5_APP -fo $*.res /r $< -##WIN32## $(CVTRES) /nologo /out:$*.obj $*.res + $(LINK) $(LFLAGS) /map:$*.map /out:$@ $(OBJS) $(XOBJS) \ + $(LIBS) $(SYSLIBS) install:: $(CP) $(OUTPRE)$(NAME).exe $(DESTDIR) @@ -85,9 +67,9 @@ clean:: $(OBJS): cns.h tktlist.h -$(OUTPRE)cns.res: cns.h +$(RESFILE): cns.h -$(OUTPRE)cns.res: clock00.ico clock05.ico clock10.ico clock15.ico clock20.ico \ +$(RESFILE): clock00.ico clock05.ico clock10.ico clock15.ico clock20.ico \ clock25.ico clock30.ico clock35.ico clock40.ico clock45.ico \ clock50.ico clock55.ico clock60.ico clockexp.ico clocktkt.ico \ cns.ico diff --git a/src/windows/gss/ChangeLog b/src/windows/gss/ChangeLog index 199831594..75abc6d41 100644 --- a/src/windows/gss/ChangeLog +++ b/src/windows/gss/ChangeLog @@ -1,3 +1,9 @@ +Mon May 17 14:21:42 1999 Danilo Almeida + + * Makefile.in: Remove win16 stuff. Fix resource dependencies. + Link resource file directly instead of explicitly + converting it to an object file. + Mon May 10 15:28:27 1999 Danilo Almeida * Makefile.in: Do win32 build in subdir. diff --git a/src/windows/gss/Makefile.in b/src/windows/gss/Makefile.in index 0ac783705..d4397c23f 100644 --- a/src/windows/gss/Makefile.in +++ b/src/windows/gss/Makefile.in @@ -1,50 +1,35 @@ # makefile: Constructs the Kerberos for Windows ticket manager # Works for both k4 and k5 releases. # -OBJS = $(OUTPRE)gss.obj $(OUTPRE)gss-client.obj $(OUTPRE)gss-misc.obj -##WIN32##XOBJS = $(OUTPRE)resource.obj +OBJS = $(OUTPRE)gss.obj $(OUTPRE)gss-client.obj $(OUTPRE)gss-misc.obj +RESFILE = $(OUTPRE)gss.res +XOBJS = $(RESFILE) ##### Options # Set NODEBUG if building release instead of debug -BUILDTOP =..\.. -INCLUDES = /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5 +BUILDTOP=..\.. +INCLUDES= /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5 ##### C Compiler -CFLAGS = $(CCOPTS2) $(INCLUDES) +CFLAGS = $(CCOPTS2) $(INCLUDES) ##### RC Compiler -##WIN16##RFLAGS = /nologo $(INCLUDES) -##WIN32##RFLAGS = $(INCLUDES) - +RFLAGS = $(INCLUDES) +RCFLAGS = $(RFLAGS) -D_WIN32 -DGSS_APP ##### Linker -LINK = link -LIBS = $(GLIB) $(CLIB) $(WLIB) -##WIN16##SYSLIBS = libw llibcew -##WIN32##SYSLIBS = kernel32.lib wsock32.lib user32.lib gdi32.lib comdlg32.lib -!ifdef NODEBUG -##WIN16##LFLAGS = /nologo /nod /nopackcode -!else -##WIN16##LFLAGS = /co /nologo /nod /nopackcode /map:full -!endif -##WIN32##LFLAGS = /nologo $(LOPTS) - -all:: makefile $(OUTPRE)gss.exe - -$(OUTPRE)gss.exe: gss.def $(OBJS) $(XOBJS) $(LIBS) -##WIN16## $(LINK) $(LFLAGS) $(OBJS), $@, $*.map, \ -##WIN16## $(LIBS) $(SYSLIBS), gss.def -##WIN16## $(RC) $(RFLAGS) /k -DGSS_APP $*.rc $@ -##WIN32## $(LINK) $(LFLAGS) /map:$*.map /out:$@ $(OBJS) $(XOBJS) \ -##WIN32## $(LIBS) $(SYSLIBS) +LINK = link +LIBS = $(GLIB) $(CLIB) $(WLIB) +SYSLIBS = kernel32.lib wsock32.lib user32.lib gdi32.lib comdlg32.lib +LFLAGS = /nologo $(LOPTS) -##WIN32##$(OUTPRE)gss.res: gss.rc -##WIN32## $(RC) $(RFLAGS) -D_WIN32 -DGSS_APP -fo $@ /r gss.rc +all:: Makefile $(OUTPRE)gss.exe -##WIN32##$(OUTPRE)resource.obj: $(OUTPRE)gss.res -##WIN32## $(CVTRES) /nologo /out:$@ $(OUTPRE)gss.res +$(OUTPRE)gss.exe: gss.def $(OBJS) $(XOBJS) $(LIBS) + $(LINK) $(LFLAGS) /map:$*.map /out:$@ $(OBJS) $(XOBJS) \ + $(LIBS) $(SYSLIBS) -$(OBJS) $(OUTPRE)gss.res: gss.h +$(OBJS) $(XOBJS): gss.h install:: copy $(OUTPRE)gss.exe ..\floppy @@ -57,4 +42,3 @@ clean:: if exist $(OUTPRE)*.map del $(OUTPRE)*.map if exist $(OUTPRE)*.pdb del $(OUTPRE)*.pdb if exist *.err del *.err - diff --git a/src/windows/wintel/ChangeLog b/src/windows/wintel/ChangeLog index 53a7736e9..0e6adc296 100644 --- a/src/windows/wintel/ChangeLog +++ b/src/windows/wintel/ChangeLog @@ -1,3 +1,9 @@ +Mon May 17 14:23:13 1999 Danilo Almeida + + * Makefile.in: Remove win16 stuff. Fix resource dependencies. + Link resource file directly instead of explicitly + converting it to an object file. + 1999-04-17 * 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 32ca0abf9..4d25a8ed0 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)