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/gss | |
| 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/gss')
| -rw-r--r-- | src/windows/gss/ChangeLog | 6 | ||||
| -rw-r--r-- | src/windows/gss/Makefile.in | 50 |
2 files changed, 23 insertions, 33 deletions
diff --git a/src/windows/gss/ChangeLog b/src/windows/gss/ChangeLog index 199831594c..75abc6d41c 100644 --- a/src/windows/gss/ChangeLog +++ b/src/windows/gss/ChangeLog @@ -1,3 +1,9 @@ +Mon May 17 14:21:42 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:28:27 1999 Danilo Almeida <dalmeida@mit.edu> * Makefile.in: Do win32 build in subdir. diff --git a/src/windows/gss/Makefile.in b/src/windows/gss/Makefile.in index 0ac7837054..d4397c23f1 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 - |