snapshot of project "lynx", label v2-8-6pre_4

1 files changed, 59 insertions, 67 deletions

diff --git a/src/descrip.mms b/src/descrip.mms
index 2f8def50..3fc03ff2 100644
--- a/src/descrip.mms
+++ b/src/descrip.mms
@@ -25,6 +25,7 @@
 !  07/29/95 FM Added support for GNUC.
 !  02/29/96 FM Added LYMap.
 !  06/28/97 FM Added UCAuto, UCAux, and UCdomap.
+!  15 Sep 06 (TD)	Cleanup...
 !
 ! Instructions:
 !       Use the correct command line for your TCP/IP implementation:
@@ -65,97 +66,88 @@ OBJS =	DefaultStyle.obj, GridText.obj, HTAlert.obj, HTFWriter.obj, -
 	LYUpload.obj, LYUtils.obj, LYexit.obj, LYrcFile.obj, TRSTable.obj, -
 	UCAuto.obj, UCAux.obj, UCdomap.obj
 
-.ifdef WIN_TCP
-TCP = WIN_TCP
-TCPOPT = WIN_TCP
+.ifdef SLANG
+SCREEN_DEF = USE_SLANG
+SCREEN_INC = , SLANG_INC 
+SCREEN_LIB = , SLANG_LIB:slang.olb/lib
+.else
 .ifdef DEC_C
-CDEF = __VMS_CURSES
+SCREEN_DEF = __VMS_CURSES
 .endif
 .endif
 
-.ifdef CMU_TCP
-TCP = CMU_TCP
-TCPOPT = CMU_TCP
 .ifdef DEC_C
-CDEF = __VMS_CURSES
+COMPILER = DECC
+MODEL_DEF = _DECC_V4_SOURCE
+.else
+MODEL_DEF =
+.ifdef GNU_C
+COMPILER = GNUC
+CC = gcc
+.else
+COMPILER = VAXC
 .endif
 .endif
 
+.ifdef WIN_TCP
+NETWORK_DEF = WIN_TCP
+NETWORK_OPT = WIN_TCP
+.else
+.ifdef CMU_TCP
+NETWORK_DEF = CMU_TCP
+NETWORK_OPT = CMU_TCP
+.else
 .ifdef SOCKETSHR_TCP
-TCP = SOCKETSHR_TCP
-TCPOPT = SOCKETSHR_TCP
-.ifdef DEC_C
-CDEF = _DECC_V4_SOURCE,__VMS_CURSES
-.endif
-.endif
-
+NETWORK_DEF = SOCKETSHR_TCP
+NETWORK_OPT = SOCKETSHR_TCP
+.else
 .ifdef UCX
-TCP = UCX
+NETWORK_DEF = UCX
 .ifdef DEC_C
-TCPOPT = UCXSHR
-CDEF = __VMS_CURSES
+NETWORK_OPT = UCXSHR
 .else
-TCPOPT = UCXOLB
-.endif
+NETWORK_OPT = UCXOLB
 .endif
-
+.else
 .ifdef TCPWARE
-TCP = TCPWARE
+NETWORK_DEF = TCPWARE,UCX
 .ifdef DEC_C
-TCTOPT= TCPWARESHR
-CDEF = __VMS_CURSES
+NETWORK_OPT = TCPWARESHR
 .else
-TCTOPT= TCPWAREOLB
-.endif
+NETWORK_OPT = TCPWAREOLB
 .endif
-
-.ifdef MULTINET
-TCP = MULTINET
-TCPOPT = MULTINET
-.ifdef DEC_C
-CDEF = _DECC_V4_SOURCE,__SOCKET_TYPEDEFS,__VMS_CURSES
-.endif
-.endif
-
-.ifdef DECnet
-TCP = DECNET
-TCPOPT = DECNET
-.endif
-
-.ifdef TCP
 .else
-TCP = MULTINET
-TCPOPT = MULTINET
-.ifdef DEC_C
-CDEF = _DECC_V4_SOURCE,__SOCKET_TYPEDEFS,__VMS_CURSES
-.endif
-.endif
+.ifdef DECnet
+NETWORK_DEF = DECNET
+NETWORK_OPT = DECNET
+.else !  Default to MultiNet
+NETWORK_DEF = MULTINET,__SOCKET_TYPEDEFS
+NETWORK_OPT = MULTINET
+.endif !  DECnet
+.endif !  TCPWARE
+.endif !  UCX
+.endif !  SOCKETSHR_TCP
+.endif !  CMU_TCP
+.endif !  WIN_TCP
+
+COMPILER_DEF = $(MODEL_DEF),$(NETWORK_DEF),$(SCREEN_DEF)
 
 .ifdef DEC_C
-COMPILER = DECC
-.ifdef TCPWARE
-TCPFLAGS = /decc/Prefix=All/NoMember/Define=(ACCESS_AUTH,$(TCP),UCX,$(CDEF))
+MY_CFLAGS = /decc/Prefix=All/NoMember/Define=(ACCESS_AUTH,$(COMPILER_DEF))
 .else
-TCPFLAGS = /decc/Prefix=All/NoMember/Define=(ACCESS_AUTH,$(TCP),$(CDEF))
+MY_CFLAGS = /Define = (ACCESS_AUTH, $(COMPILER_DEF))
 .endif
+
+.if "$(MMS_ARCHNAME)" .eq "IA64"
+TOPT = 
+COPT = 
 .else
-.ifdef GNU_C
-COMPILER = GNUC
-CC = gcc
-.else
-COMPILER = VAXC
-.endif
-.ifdef TCPWARE
-TCPFLAGS = /Define = (ACCESS_AUTH, $(TCP), UCX)
-.else
-TCPFLAGS = /Define = (ACCESS_AUTH, $(TCP))
-.endif
+TOPT = ,sys$disk:[]$(NETWORK_OPT).opt/opt
+COPT = ,sys$disk:[]$(COMPILER).opt/opt
 .endif
 
-TOPT = sys$disk:[]$(TCPOPT).opt
-COPT = sys$disk:[]$(COMPILER).opt
-WWWLIB = [-.WWW.Library.Implementation]WWWLib_$(TCP).olb
-CFLAGS = $(TCPFLAGS) $(CFLAGS)/Include=([], [-], [.chrtrans], [-.WWW.Library.Implementation])
+WWWLIB = [-.WWW.Library.Implementation]WWWLib.olb
+CFLAGS = $(MY_CFLAGS) $(CFLAGS)/Include=([], [-], [.chrtrans], [-.WWW.Library.Implementation]$(SCREEN_INC))
 
 
 lynx :	lynx.exe
@@ -164,7 +156,7 @@ lynx :	lynx.exe
 HDRS = [.chrtrans]iso01_uni.h
 
 lynx.exe :   $(HDRS) $(OBJS) $(WWWLIB)
-	$(LINK) /Executable = Lynx.exe $(OBJS), $(WWWLIB)/lib, $(TOPT)/opt, $(COPT)/opt
+	$(LINK) /Executable = Lynx.exe $(OBJS), $(WWWLIB)/lib $(SCREEN_LIB) $(TOPT) $(COPT)
 
 $(HDRS) :
 	set default [.chrtrans]