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/cns | |
| 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/cns')
| -rw-r--r-- | src/windows/cns/ChangeLog | 6 | ||||
| -rw-r--r-- | src/windows/cns/Makefile.in | 46 |
2 files changed, 20 insertions, 32 deletions
diff --git a/src/windows/cns/ChangeLog b/src/windows/cns/ChangeLog index 1c8b5f5b93..282bbf5276 100644 --- a/src/windows/cns/ChangeLog +++ b/src/windows/cns/ChangeLog @@ -1,3 +1,9 @@ +Mon May 17 14:19:30 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. + Mon May 10 15:27:57 1999 Danilo Almeida <dalmeida@mit.edu> * Makefile.in: Do win32 build in subdir. diff --git a/src/windows/cns/Makefile.in b/src/windows/cns/Makefile.in index 511f3dd279..0840cc69df 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 |