From: Theodore Tso <tytso@mit.edu>
Date: Tue, 5 Aug 1997 22:48:13 +0000 (+0000)
Subject: Makefile.in, telnet.rc: Add version resource to the executable
X-Git-Tag: krb5-1.1-beta1~1067
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=462a96df9c516129ceba3a3fbd04e9132ebacc35;p=krb5.git

Makefile.in, telnet.rc: Add version resource to the executable

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10157 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/windows/wintel/ChangeLog b/src/windows/wintel/ChangeLog
index c6ba91e6c..50ebe6e99 100644
--- a/src/windows/wintel/ChangeLog
+++ b/src/windows/wintel/ChangeLog
@@ -1,3 +1,7 @@
+Tue Aug  5 18:47:02 1997  Theodore Y. Ts'o  <tytso@mit.edu>
+
+	* Makefile.in, telnet.rc: Add version resource to the executable.
+
 Mon Jul 28 23:35:49 1997  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* Makefile.in: Take out the /nod option, and remove libc.lib from
diff --git a/src/windows/wintel/Makefile.in b/src/windows/wintel/Makefile.in
index 6f2dd8836..c27992cb2 100644
--- a/src/windows/wintel/Makefile.in
+++ b/src/windows/wintel/Makefile.in
@@ -24,8 +24,8 @@ CFLAGS 	 = $(CCOPTS2) $(INCLUDES) /D$(KRB)=1 $(KRBOPT) /Zi
 CFLAGS 	 = $(CCOPTS2) $(INCLUDES) /D$(KRB)=1 $(KRBOPT)
 !endif
 
-##WIN32##RFLAGS  = /D$(KRB)=1 $(INCLUDES)
-##WIN16##RFLAGS  = /nologo /D$(KRB)=1 $(INCLUDES)
+##WIN32##RFLAGS  = $(INCLUDES)
+##WIN16##RFLAGS  = /nologo $(INCLUDES)
 
 
 ##### Linker
@@ -44,15 +44,15 @@ LIBS 	 = $(KLIB) $(CLIB) $(WLIB)
 
 all:: makefile telnet.exe
 
-telnet.exe: $*.def $*.res $(OBJS) $(XOBJS) $(LIBS)
+telnet.exe: $*.def $(OBJS) $(XOBJS) $(LIBS)
 ##WIN16##	$(LINK) $(LFLAGS) $(OBJS) $(XOBJS), $@, $*.map, \
 ##WIN16##	  $(LIBS) $(SYSLIBS), $*.def
-##WIN16##	$(RC) $(RFLAGS) /k telnet.rc $@
+##WIN16##	$(RC) $(RFLAGS) /k -DTELNET_APP telnet.rc $@
 ##WIN32##	$(LINK) $(LFLAGS) /map:$*.map /out:$@ $(OBJS) $(XOBJS) \
 ##WIN32##	  $(LIBS) $(SYSLIBS)
 
 ##WIN32##telnet.res: telnet.rc
-##WIN32##	$(RC) $(RFLAGS) /r $*.rc
+##WIN32##	$(RC) $(RFLAGS) -D_WIN32 -DTELNET_APP /r $*.rc
 ##WIN32##resource.obj: telnet.res
 ##WIN32##	$(CVTRES) /nologo /out:resource.obj telnet.res
 
diff --git a/src/windows/wintel/telnet.rc b/src/windows/wintel/telnet.rc
index bdd18d973..6fd62c21e 100644
--- a/src/windows/wintel/telnet.rc
+++ b/src/windows/wintel/telnet.rc
@@ -1,5 +1,7 @@
 //Microsoft Developer Studio generated resource script.
 //
+// XXX since modified by hand...
+
 #include "resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
@@ -242,3 +244,4 @@ END
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 
+#include "..\version.rc"