*** newsbuild.com_orig_61b10	Sat Mar 22 10:07:24 1997
--- newsbuild.com	Sat Mar 22 10:33:04 1997
***************
*** 92,101 ****
  $!	  - use DCL symbol CC_OPT to specify CC optimization level;
  $!	    this solves the problem when gcc was called with /OPT=2/OPT
  $!	    where the second qualifier would reduce the optimization level to 1
  $!
  $!  Usage:
  $!	$ SET DEF [.NEWS_SRC]
! $!	$ @NEWSBUILD [tcp-transport] [force] [debug] [client-only] [compile-defines]
  $!
  $!		tcp-transport:  N [ONE]
  $!			        M [ULTINET]
--- 92,110 ----
  $!	  - use DCL symbol CC_OPT to specify CC optimization level;
  $!	    this solves the problem when gcc was called with /OPT=2/OPT
  $!	    where the second qualifier would reduce the optimization level to 1
+ $!	V6.1b10	22-MAR-1997  Richard Levitte  levitte@lp.se
+ $!	  - added documentation for the purge-options parameter (former
+ $!	    parameter 6, now parameter 7).
+ $!	  - added a compiler option, so the manager can force his compiler
+ $!	    of choice.  This becomes the new parameter 6.
+ $!	  - added file types everywhere.  This helps a lot against the
+ $!	    frustration with logical names like, say, "NEWS"...
+ $!	  - added code to make sure the qualifiers "/VAXC" or "/DECC" are
+ $!	    used whenever appropriate
  $!
  $!  Usage:
  $!	$ SET DEF [.NEWS_SRC]
! $!	$ @NEWSBUILD [tcp-transport] [force] [debug] [client-only] [compile-defines] [compiler] [purge-options]
  $!
  $!		tcp-transport:  N [ONE]
  $!			        M [ULTINET]
***************
*** 128,133 ****
--- 137,155 ----
  $!						C code.
  $!				<empty string> - no extra compile time defines
  $!
+ $!		compiler:
+ $!				GNUC - force the use of GNU C
+ $!				VAXC - force the use of VAX C
+ $!				DECC - force the use of DEC C
+ $!				empty - this procedure tries to find out,
+ $!					with GNU C as primary choise.
+ $!
+ $!		purge-options:
+ $!				comma-separated list consisting of the
+ $!				following keywords:
+ $!					NOOBJ - do not purge object files.
+ $!					NOEXE - do not purge executables.
+ $!
  $!--
  $!
  $ makehay_ver='f$verify(0)
***************
*** 152,157 ****
--- 174,184 ----
  $ comp_decc = 2
  $ comp_gcc  = 3
  $
+ $ if p6 .nes. ""
+ $ then
+ $     compiler = f$locate(f$extract(0,1,f$edit(p6,"upcase,collapse")),"VDG")+1
+ $     if compiler.gt.3 then compiler = 0
+ $ endif
  $! if you want to override the automatic guessing of compiler type
  $! uncomment one of the following three lines:
  $!compiler = comp_vaxc
***************
*** 209,214 ****
--- 236,246 ----
  $ else
  $   define link_opt sys$disk:[-.news_src]options_c_link.opt
  $ endif
+ $ ccsw = ""
+ $ if compiler.eq.comp_decc .and. f$trnlnm("DECC$CC_DEFAULT").eqs."/VAXC" then -
+      ccsw = "/DECC"
+ $ if compiler.eq.comp_vaxc .and. f$trnlnm("DECC$CC_DEFAULT").eqs."/DECC" then -
+      ccsw = "/VAXC"
  $ defsw = ""
  $ use_multinet = 0
  $ use_cmu = 0
***************
*** 482,488 ****
  $   ENDIF
  $!
  $!
! $   cc = "cc/NOLIS" + defsw	! default, also VAX C
  $   cc_opt   = "/OPT/NODEBUG"
  $   cc_noopt = "/NOOPT/DEBUG"
  $
--- 514,520 ----
  $   ENDIF
  $!
  $!
! $   cc = "cc" + ccsw + "/NOLIS" + defsw	! default, also VAX C
  $   cc_opt   = "/OPT/NODEBUG"
  $   cc_noopt = "/NOOPT/DEBUG"
  $
***************
*** 566,579 ****
  $   ENDIF
  $ ENDIF
  $!
! $!	Examine parameter 6 (Purge object,exe | do not purge)
  $ purge_objs = 1
  $ purge_exes = 1
! $ If p6.nes.""
  $ Then
! $   p6 = F$Edit(p6,"Upcase,Collapse")
! $   If F$Locate("NOOBJ",p6).lt.F$Length(p6) Then purge_objs = 0
! $   If F$Locate("NOEXE",p6).lt.F$Length(p6) Then purge_exes = 0
  $ EndIf
  $ purge_objs = 0
  $ purge_exes = 0
--- 598,611 ----
  $   ENDIF
  $ ENDIF
  $!
! $!	Examine parameter 7 (Purge object,exe | do not purge)
  $ purge_objs = 1
  $ purge_exes = 1
! $ If p7.nes.""
  $ Then
! $   p7 = F$Edit(p7,"Upcase,Collapse")
! $   If F$Locate("NOOBJ",p7).lt.F$Length(p7) Then purge_objs = 0
! $   If F$Locate("NOEXE",p7).lt.F$Length(p7) Then purge_exes = 0
  $ EndIf
  $ purge_objs = 0
  $ purge_exes = 0
***************
*** 597,603 ****
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc inpaths"
! $     cc/object=[-.news_build]inpaths.obj'cc_opt' inpaths
  $     set def [-.news_build]
  $     if purge_objs then purge inpaths.obj
  $   ENDIF
--- 629,635 ----
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc inpaths"
! $     cc/object=[-.news_build]inpaths.obj'cc_opt' inpaths.c
  $     set def [-.news_build]
  $     if purge_objs then purge inpaths.obj
  $   ENDIF
***************
*** 620,634 ****
  $   IF iftest
  $   THEN
  $     say "$ link inpaths"
! $     link/nomap/notrace/exe=[-.news_dist]inpaths.exe inpaths,'link_lib'
  $     if purge_exes then purge [-.news_dist]inpaths.exe
  $   ENDIF
  $ ENDIF
  $!
  $! .OLB files
  $!
! $ IF f$search("NEWS_LIBRARY.OLB").eqs."" THEN $ library/create/obj news_library
! $ IF f$search("NEWS_LIBRARYD.OLB").eqs."" THEN $ library/create/obj news_libraryd
  $!
  $!  get cre date time for include files
  $!
--- 652,666 ----
  $   IF iftest
  $   THEN
  $     say "$ link inpaths"
! $     link/nomap/notrace/exe=[-.news_dist]inpaths.exe inpaths.obj,'link_lib'
  $     if purge_exes then purge [-.news_dist]inpaths.exe
  $   ENDIF
  $ ENDIF
  $!
  $! .OLB files
  $!
! $ IF f$search("NEWS_LIBRARY.OLB").eqs."" THEN $ library/create/obj news_library.olb
! $ IF f$search("NEWS_LIBRARYD.OLB").eqs."" THEN $ library/create/obj news_libraryd.olb
  $!
  $!  get cre date time for include files
  $!
***************
*** 706,712 ****
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc news"
! $     cc/object=[-.news_build]news.obj'cc_opt' news
  $     set def [-.news_build]
  $     if purge_objs then purge news.obj
  $   ENDIF
--- 738,744 ----
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc news"
! $     cc/object=[-.news_build]news.obj'cc_opt' news.c
  $     set def [-.news_build]
  $     if purge_objs then purge news.obj
  $   ENDIF
***************
*** 732,738 ****
  $   THEN
  $     say "$ link news,news_library/library"
  $     link/nomap/notrace/exe=[-.news_dist]news.exe -
! 	news,news_library/library/include=newsmsg,'link_lib'
  $     if purge_exes then purge [-.news_dist]news.exe
  $   ENDIF
  $ ENDIF
--- 764,770 ----
  $   THEN
  $     say "$ link news,news_library/library"
  $     link/nomap/notrace/exe=[-.news_dist]news.exe -
! 	news.obj,news_library.olb/library/include=newsmsg,'link_lib'
  $     if purge_exes then purge [-.news_dist]news.exe
  $   ENDIF
  $ ENDIF
***************
*** 764,770 ****
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc/debug/noopt news"
! $     cc/object=[-.news_build]newsdbg.obj'cc_noopt' news
  $     set def [-.news_build]
  $     if purge_objs then purge newsdbg.obj
  $   ENDIF
--- 796,802 ----
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc/debug/noopt news"
! $     cc/object=[-.news_build]newsdbg.obj'cc_noopt' news.c
  $     set def [-.news_build]
  $     if purge_objs then purge newsdbg.obj
  $   ENDIF
***************
*** 788,794 ****
  $   IF iftest
  $   THEN
  $     say "$ link/debug newsdbg,news_libraryd/library"
! $     link/debug/nomap newsdbg,news_libraryd/library/include=newsmsg,'link_lib'
  $     if purge_exes then purge newsdbg.exe
  $   ENDIF
  $ ENDIF
--- 820,826 ----
  $   IF iftest
  $   THEN
  $     say "$ link/debug newsdbg,news_libraryd/library"
! $     link/debug/nomap newsdbg.obj,news_libraryd.olb/library/include=newsmsg,'link_lib'
  $     if purge_exes then purge newsdbg.exe
  $   ENDIF
  $ ENDIF
***************
*** 804,822 ****
  $ IF compiler.eq.comp_decc
  $ THEN
  $   link/nomap/notrace/exe=[-.news_dist]cachem.exe -
! 	cachem,cache,cache_hash,cache_map,cache_verify,cache_logger,-
! 	sys$disk:[-.news_src]options_c_link_decc/opt
  $ ELSE
  $   IF compiler.eq.comp_gcc
  $   THEN
  $     link/nomap/notrace/exe=[-.news_dist]cachem.exe -
! 	  cachem,cache,cache_hash,cache_map,cache_verify,cache_logger,-
! 	  gnu_cc:[000000]gcclib/lib,-
  	  sys$disk:[-.news_src]options_c_link/opt
  $   ELSE
  $     link/nomap/notrace/exe=[-.news_dist]cachem.exe -
! 	  cachem,cache,cache_hash,cache_map,cache_verify,cache_logger,-
! 	  sys$disk:[-.news_src]options_c_link/opt
  $   ENDIF
  $ ENDIF
  $ IF purge_exes THEN purge [-.news_dist]cachem.exe
--- 836,854 ----
  $ IF compiler.eq.comp_decc
  $ THEN
  $   link/nomap/notrace/exe=[-.news_dist]cachem.exe -
! 	cachem.obj,cache.obj,cache_hash.obj,cache_map.obj,cache_verify.obj,-
! 	cache_logger.obj,sys$disk:[-.news_src]options_c_link_decc/opt
  $ ELSE
  $   IF compiler.eq.comp_gcc
  $   THEN
  $     link/nomap/notrace/exe=[-.news_dist]cachem.exe -
! 	  cachem.obj,cache.obj,cache_hash.obj,cache_map.obj,cache_verify.obj,-
! 	  cache_logger.obj,gnu_cc:[000000]gcclib/lib,-
  	  sys$disk:[-.news_src]options_c_link/opt
  $   ELSE
  $     link/nomap/notrace/exe=[-.news_dist]cachem.exe -
! 	  cachem.obj,cache.obj,cache_hash.obj,cache_map.obj,cache_verify.obj,-
! 	  cache_logger.obj,sys$disk:[-.news_src]options_c_link/opt
  $   ENDIF
  $ ENDIF
  $ IF purge_exes THEN purge [-.news_dist]cachem.exe
***************
*** 840,847 ****
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc nntp_server"
! $     cc/object=[-.news_build]nntp_server.obj'cc_opt' nntp_server
! $     cc/object=[-.news_build]nntp_serverd.obj'cc_noopt' nntp_server
  $     set def [-.news_build]
  $     if purge_objs then purge nntp_server.obj,nntp_serverd.obj
  $   ENDIF
--- 872,879 ----
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc nntp_server"
! $     cc/object=[-.news_build]nntp_server.obj'cc_opt' nntp_server.c
! $     cc/object=[-.news_build]nntp_serverd.obj'cc_noopt' nntp_server.c
  $     set def [-.news_build]
  $     if purge_objs then purge nntp_server.obj,nntp_serverd.obj
  $   ENDIF
***************
*** 867,873 ****
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc nntp_tty"
! $     cc/object=[-.news_build]nntp_tty.obj'cc_noopt' nntp_tty
  $     set def [-.news_build]
  $     if purge_objs then purge nntp_tty.obj
  $   ENDIF
--- 899,905 ----
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc nntp_tty"
! $     cc/object=[-.news_build]nntp_tty.obj'cc_noopt' nntp_tty.c
  $     set def [-.news_build]
  $     if purge_objs then purge nntp_tty.obj
  $   ENDIF
***************
*** 894,902 ****
  $   THEN
  $     say "$ link/debug nntp_tty,nntp_server"
  $     link/nomap/debug/exe=[-.NEWS_BUILD] -
! 	  nntp_tty,nntp_serverd,-
!         cached,cache_mapd,cache_hashd,cache_loggerd,-
!         news_libraryd/libr/include=newsmsg,'link_lib'
  $     if purge_exes then purge [-.news_build]nntp_tty.exe
  $   ENDIF
  $ ENDIF
--- 926,934 ----
  $   THEN
  $     say "$ link/debug nntp_tty,nntp_server"
  $     link/nomap/debug/exe=[-.NEWS_BUILD] -
! 	  nntp_tty.obj,nntp_serverd.obj,-
!         cached.obj,cache_mapd.obj,cache_hashd.obj,cache_loggerd.obj,-
!         news_libraryd.olb/libr/include=newsmsg,'link_lib'
  $     if purge_exes then purge [-.news_build]nntp_tty.exe
  $   ENDIF
  $ ENDIF
***************
*** 921,927 ****
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc nntp_dec"
! $     cc/object=[-.news_build]nntp_dec.obj'cc_opt' nntp_dec
  $     set def [-.news_build]
  $     if purge_objs then purge nntp_dec.obj
  $   ENDIF
--- 953,959 ----
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc nntp_dec"
! $     cc/object=[-.news_build]nntp_dec.obj'cc_opt' nntp_dec.c
  $     set def [-.news_build]
  $     if purge_objs then purge nntp_dec.obj
  $   ENDIF
***************
*** 948,956 ****
  $   THEN
  $     say "$ link nntp_dec,nntp_server"
  $     link/nomap/notrace/exe=[-.news_dist]nntp_dec -
! 	nntp_dec,nntp_server,newsdist,-
!         add_transform,newsrtl,newsmsg,newslock,-
!         cache,cache_map,cache_hash,cache_logger,-
          'link_lib'
  $     if purge_exes then purge [-.news_dist]nntp_dec.exe
  $   ENDIF
--- 980,988 ----
  $   THEN
  $     say "$ link nntp_dec,nntp_server"
  $     link/nomap/notrace/exe=[-.news_dist]nntp_dec -
! 	nntp_dec.obj,nntp_server.obj,newsdist.obj,-
!         add_transform.obj,newsrtl.obj,newsmsg.obj,newslock.obj,-
!         cache.obj,cache_map.obj,cache_hash.obj,cache_logger.obj,-
          'link_lib'
  $     if purge_exes then purge [-.news_dist]nntp_dec.exe
  $   ENDIF
***************
*** 976,982 ****
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc nntp_decm"
! $     cc/object=[-.news_build]nntp_decm.obj'cc_opt' nntp_decm
  $     set def [-.news_build]
  $     if purge_objs then purge nntp_decm.obj
  $   ENDIF
--- 1008,1014 ----
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc nntp_decm"
! $     cc/object=[-.news_build]nntp_decm.obj'cc_opt' nntp_decm.c
  $     set def [-.news_build]
  $     if purge_objs then purge nntp_decm.obj
  $   ENDIF
***************
*** 1003,1011 ****
  $   THEN
  $     say "$ link nntp_decm,nntp_server"
  $     link/nomap/exe=[-.NEWS_DIST]nntp_decm -
! 	nntp_decm,nntp_server,newsdist,-
!         add_transform,newsrtl,newsmsg,newslock,-
!         cache,cache_map,cache_hash,cache_logger,-
          'link_lib'
  $     if purge_exes then purge [-.news_dist]nntp_decm.exe
  $   ENDIF
--- 1035,1043 ----
  $   THEN
  $     say "$ link nntp_decm,nntp_server"
  $     link/nomap/exe=[-.NEWS_DIST]nntp_decm -
! 	nntp_decm.obj,nntp_server.obj,newsdist.obj,-
!         add_transform.obj,newsrtl.obj,newsmsg.obj,newslock.obj,-
!         cache.obj,cache_map.obj,cache_hash.obj,cache_logger.obj,-
          'link_lib'
  $     if purge_exes then purge [-.news_dist]nntp_decm.exe
  $   ENDIF
***************
*** 1031,1037 ****
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc nntp_client"
! $     cc/object=[-.news_build]nntp_client.obj'cc_opt' nntp_client
  $     set def [-.news_build]
  $     if purge_objs then purge nntp_client.obj
  $   ENDIF
--- 1063,1069 ----
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc nntp_client"
! $     cc/object=[-.news_build]nntp_client.obj'cc_opt' nntp_client.c
  $     set def [-.news_build]
  $     if purge_objs then purge nntp_client.obj
  $   ENDIF
***************
*** 1054,1060 ****
  $   IF iftest
  $   THEN
  $     say "$ link nntp_client"
! $     link/nomap/exe=[-.NEWS_DIST]nntp_client nntp_client,newsmsg,-
          'link_lib'
  $     if purge_exes then purge [-.news_dist]nntp_client.exe
  $   ENDIF
--- 1086,1092 ----
  $   IF iftest
  $   THEN
  $     say "$ link nntp_client"
! $     link/nomap/exe=[-.NEWS_DIST]nntp_client nntp_client.obj,newsmsg.obj,-
          'link_lib'
  $     if purge_exes then purge [-.news_dist]nntp_client.exe
  $   ENDIF
***************
*** 1104,1110 ****
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc nntp_xmit"
! $     cc/object=[-.news_build]nntp_xmit.obj'cc_opt' nntp_xmit
  $     set def [-.news_build]
  $     if purge_objs then purge nntp_xmit.obj
  $   ENDIF
--- 1136,1142 ----
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc nntp_xmit"
! $     cc/object=[-.news_build]nntp_xmit.obj'cc_opt' nntp_xmit.c
  $     set def [-.news_build]
  $     if purge_objs then purge nntp_xmit.obj
  $   ENDIF
***************
*** 1130,1136 ****
  $   THEN
  $     say "$ link nntp_xmit"
  $     link/nomap/notrace/exe=[-.NEWS_DIST]NNTP_XMIT -
! 	nntp_xmit,nntpxmitcmd,newslock,newsrtl,newsmsg,-
  	'link_lib'
  $     if purge_exes then purge [-.news_dist]nntp_xmit.exe
  $   ENDIF
--- 1162,1168 ----
  $   THEN
  $     say "$ link nntp_xmit"
  $     link/nomap/notrace/exe=[-.NEWS_DIST]NNTP_XMIT -
! 	nntp_xmit.obj,nntpxmitcmd.obj,newslock.obj,newsrtl.obj,newsmsg.obj,-
  	'link_lib'
  $     if purge_exes then purge [-.news_dist]nntp_xmit.exe
  $   ENDIF
***************
*** 1180,1186 ****
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc nntp_xfer"
! $     cc/object=[-.news_build]nntp_xfer.obj'cc_opt' nntp_xfer
  $     set def [-.news_build]
  $     if purge_objs then purge nntp_xfer.obj
  $   ENDIF
--- 1212,1218 ----
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc nntp_xfer"
! $     cc/object=[-.news_build]nntp_xfer.obj'cc_opt' nntp_xfer.c
  $     set def [-.news_build]
  $     if purge_objs then purge nntp_xfer.obj
  $   ENDIF
***************
*** 1206,1212 ****
  $   THEN
  $     say "$ link nntp_xfer"
  $     link/nomap/notrace/exe=[-.NEWS_DIST]nntp_xfer -
! 	nntp_xfer,nntpxfercmd,newslock,newsrtl,newsmsg,-
  	'link_lib'
  $     if purge_exes then purge [-.news_dist]nntp_xfer.exe
  $   ENDIF
--- 1238,1244 ----
  $   THEN
  $     say "$ link nntp_xfer"
  $     link/nomap/notrace/exe=[-.NEWS_DIST]nntp_xfer -
! 	nntp_xfer.obj,nntpxfercmd.obj,newslock.obj,newsrtl.obj,newsmsg.obj,-
  	'link_lib'
  $     if purge_exes then purge [-.news_dist]nntp_xfer.exe
  $   ENDIF
***************
*** 1235,1241 ****
  $     THEN
  $       set def [-.news_src]
  $       say "$ cc nntp_tcpcmu"
! $       cc/object=[-.news_build]nntp_tcpcmu.obj'cc_opt' nntp_tcpcmu
  $       set def [-.news_build]
  $       IF purge_objs then purge nntp_tcpcmu.obj
  $     ENDIF
--- 1267,1273 ----
  $     THEN
  $       set def [-.news_src]
  $       say "$ cc nntp_tcpcmu"
! $       cc/object=[-.news_build]nntp_tcpcmu.obj'cc_opt' nntp_tcpcmu.c
  $       set def [-.news_build]
  $       IF purge_objs then purge nntp_tcpcmu.obj
  $     ENDIF
***************
*** 1262,1270 ****
  $     THEN
  $       say "$ link nntp_tcpcmu,nntp_server"
  $       link/nomap/notrace/exe=[-.NEWS_DIST]nntp_tcpcmu -
!           nntp_tcpcmu,nntp_server,newsdist,-
!           add_transform,newsrtl,newsmsg,newslock,-
!           cache,cache_map,cache_hash,cache_logger,-
            'link_lib'
  $       IF purge_exes then purge [-.news_dist]nntp_tcpcmu.exe
  $     ENDIF
--- 1294,1302 ----
  $     THEN
  $       say "$ link nntp_tcpcmu,nntp_server"
  $       link/nomap/notrace/exe=[-.NEWS_DIST]nntp_tcpcmu -
!           nntp_tcpcmu.obj,nntp_server.obj,newsdist.obj,-
!           add_transform.obj,newsrtl.obj,newsmsg.obj,newslock.obj,-
!           cache.obj,cache_map.obj,cache_hash.obj,cache_logger.obj,-
            'link_lib'
  $       IF purge_exes then purge [-.news_dist]nntp_tcpcmu.exe
  $     ENDIF
***************
*** 1295,1301 ****
  $     THEN
  $       set def [-.news_src]
  $       say "$ cc nntp_tcpwinmultinet"
! $       cc/object=[-.news_build]nntp_tcpwinmultinet.obj'cc_opt' nntp_tcpwinmultinet
  $       set def [-.news_build]
  $       if purge_objs then purge nntp_tcpwinmultinet.obj
  $     ENDIF
--- 1327,1333 ----
  $     THEN
  $       set def [-.news_src]
  $       say "$ cc nntp_tcpwinmultinet"
! $       cc/object=[-.news_build]nntp_tcpwinmultinet.obj'cc_opt' nntp_tcpwinmultinet.c
  $       set def [-.news_build]
  $       if purge_objs then purge nntp_tcpwinmultinet.obj
  $     ENDIF
***************
*** 1322,1330 ****
  $     THEN
  $       say "$ link nntp_tcpwinmultinet,nntp_server"
  $       link/nomap/notrace/exe=[-.news_dist]nntp_tcpwinmultinet -
!           nntp_tcpwinmultinet,nntp_server,newsdist,-
!           add_transform,newsrtl,newsmsg,newslock,-
!           cache,cache_map,cache_hash,cache_logger,-
            'link_lib'
  $       IF purge_exes then purge [-.news_dist]nntp_tcpwinmultinet.exe
  $     ENDIF
--- 1354,1362 ----
  $     THEN
  $       say "$ link nntp_tcpwinmultinet,nntp_server"
  $       link/nomap/notrace/exe=[-.news_dist]nntp_tcpwinmultinet -
!           nntp_tcpwinmultinet.obj,nntp_server.obj,newsdist.obj,-
!           add_transform.obj,newsrtl.obj,newsmsg.obj,newslock.obj,-
!           cache.obj,cache_map.obj,cache_hash.obj,cache_logger.obj,-
            'link_lib'
  $       IF purge_exes then purge [-.news_dist]nntp_tcpwinmultinet.exe
  $     ENDIF
***************
*** 1354,1360 ****
  $     THEN
  $       set def [-.news_src]
  $       say "$ cc nntp_tcpucxm"
! $       cc/object=[-.news_build]nntp_tcpucxm.obj'cc_opt' nntp_tcpucxm
  $       set def [-.news_build]
  $       if purge_objs then purge nntp_tcpucxm.obj
  $     ENDIF
--- 1386,1392 ----
  $     THEN
  $       set def [-.news_src]
  $       say "$ cc nntp_tcpucxm"
! $       cc/object=[-.news_build]nntp_tcpucxm.obj'cc_opt' nntp_tcpucxm.c
  $       set def [-.news_build]
  $       if purge_objs then purge nntp_tcpucxm.obj
  $     ENDIF
***************
*** 1381,1389 ****
  $     THEN
  $       say "$ link nntp_tcpucxm,nntp_server"
  $       link/nomap/exe=[-.news_dist]nntp_tcpucxm -
!           nntp_tcpucxm,nntp_server,newsdist,-
!           add_transform,newsrtl,newsmsg,newslock,-
!           cache,cache_map,cache_hash,cache_logger,-
            'link_lib'
  $       IF purge_exes then purge [-.news_dist]nntp_tcpucxm.exe
  $     ENDIF
--- 1413,1421 ----
  $     THEN
  $       say "$ link nntp_tcpucxm,nntp_server"
  $       link/nomap/exe=[-.news_dist]nntp_tcpucxm -
!           nntp_tcpucxm.obj,nntp_server.obj,newsdist.obj,-
!           add_transform.obj,newsrtl.obj,newsmsg.obj,newslock.obj,-
!           cache.obj,cache_map.obj,cache_hash.obj,cache_logger.obj,-
            'link_lib'
  $       IF purge_exes then purge [-.news_dist]nntp_tcpucxm.exe
  $     ENDIF
***************
*** 1410,1416 ****
  $   THEN
  $     say "$ libr/help/create news news"
  $     set def [-.news_dist]
! $     libr/help/create news [-.news_src]news
  $     set def [-.news_build]
  $     if purge_exes then purge [-.news_dist]news.hlb
  $   ENDIF
--- 1442,1448 ----
  $   THEN
  $     say "$ libr/help/create news news"
  $     set def [-.news_dist]
! $     libr/help/create news.hlb [-.news_src]news.hlp
  $     set def [-.news_build]
  $     if purge_exes then purge [-.news_dist]news.hlb
  $   ENDIF
***************
*** 1436,1442 ****
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc arbitron"
! $     cc/object=[-.news_build]arbitron.obj'cc_opt' arbitron
  $     set def [-.news_build]
  $     if purge_objs then purge arbitron.obj
  $   ENDIF
--- 1468,1474 ----
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc arbitron"
! $     cc/object=[-.news_build]arbitron.obj'cc_opt' arbitron.c
  $     set def [-.news_build]
  $     if purge_objs then purge arbitron.obj
  $   ENDIF
***************
*** 1460,1466 ****
  $   THEN
  $     say "$ link arbitron"
  $     link/nomap/notrace/exe=[-.news_dist]arbitron.exe -
! 	arbitron,news_library/libr/include=newsmsg,'link_lib'
  $     if purge_exes then purge [-.news_dist]arbitron.exe
  $   ENDIF
  $ ENDIF
--- 1492,1498 ----
  $   THEN
  $     say "$ link arbitron"
  $     link/nomap/notrace/exe=[-.news_dist]arbitron.exe -
! 	arbitron.obj,news_library.olb/libr/include=newsmsg,'link_lib'
  $     if purge_exes then purge [-.news_dist]arbitron.exe
  $   ENDIF
  $ ENDIF
***************
*** 1486,1492 ****
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc newitmfile"
! $     cc/object=[-.news_build]NEWITMFILE.obj'cc_opt' NEWITMFILE
  $     set def [-.news_build]
  $     if purge_objs then purge NEWITMFILE.obj
  $   ENDIF
--- 1518,1524 ----
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc newitmfile"
! $     cc/object=[-.news_build]NEWITMFILE.obj'cc_opt' NEWITMFILE.c
  $     set def [-.news_build]
  $     if purge_objs then purge NEWITMFILE.obj
  $   ENDIF
***************
*** 1510,1517 ****
  $   THEN
  $     say "$ link newitmfile"
  $     link/nomap/exe=[-.news_dist]NEWITMFILE.exe -
! 	NEWITMFILE,-
! 	news_library/libr/include=newsmsg,'link_lib'
  $     if purge_exes then purge [-.news_dist]NEWITMFILE.exe
  $   ENDIF
  $ ENDIF
--- 1542,1549 ----
  $   THEN
  $     say "$ link newitmfile"
  $     link/nomap/exe=[-.news_dist]NEWITMFILE.exe -
! 	NEWITMFILE.obj,-
! 	news_library.olb/libr/include=newsmsg,'link_lib'
  $     if purge_exes then purge [-.news_dist]NEWITMFILE.exe
  $   ENDIF
  $ ENDIF
***************
*** 1537,1543 ****
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc newgrpfile"
! $     cc/object=[-.news_build]NEWGRPFILE.obj'cc_opt' NEWGRPFILE
  $     set def [-.news_build]
  $     if purge_objs then purge NEWGRPFILE.obj
  $   ENDIF
--- 1569,1575 ----
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc newgrpfile"
! $     cc/object=[-.news_build]NEWGRPFILE.obj'cc_opt' NEWGRPFILE.c
  $     set def [-.news_build]
  $     if purge_objs then purge NEWGRPFILE.obj
  $   ENDIF
***************
*** 1561,1568 ****
  $   THEN
  $     say "$ link newgrpfile"
  $     link/nomap/exe=[-.news_dist]NEWGRPFILE.exe -
! 	NEWGRPFILE,-
! 	news_library/libr/include=newsmsg,'link_lib'
  $     if purge_exes then purge [-.news_dist]NEWGRPFILE.exe
  $   ENDIF
  $ ENDIF
--- 1593,1600 ----
  $   THEN
  $     say "$ link newgrpfile"
  $     link/nomap/exe=[-.news_dist]NEWGRPFILE.exe -
! 	NEWGRPFILE.obj,-
! 	news_library.olb/libr/include=newsmsg,'link_lib'
  $     if purge_exes then purge [-.news_dist]NEWGRPFILE.exe
  $   ENDIF
  $ ENDIF
***************
*** 1588,1594 ****
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc newsshutdown"
! $     cc/object=[-.news_build]NEWSSHUTDOWN.obj'cc_opt' NEWSSHUTDOWN
  $     set def [-.news_build]
  $     if purge_objs then purge NEWSSHUTDOWN.obj
  $   ENDIF
--- 1620,1626 ----
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc newsshutdown"
! $     cc/object=[-.news_build]NEWSSHUTDOWN.obj'cc_opt' NEWSSHUTDOWN.c
  $     set def [-.news_build]
  $     if purge_objs then purge NEWSSHUTDOWN.obj
  $   ENDIF
***************
*** 1612,1619 ****
  $   THEN
  $     say "$ link newsshutdown"
  $     link/nomap/notrace/exe=[-.news_dist]NEWSSHUTDOWN.exe -
! 	NEWSSHUTDOWN, -
! 	news_library/libr/include=newsmsg,'link_lib'
  $     if purge_exes then purge [-.news_dist]NEWSSHUTDOWN.exe
  $   ENDIF
  $ ENDIF
--- 1644,1651 ----
  $   THEN
  $     say "$ link newsshutdown"
  $     link/nomap/notrace/exe=[-.news_dist]NEWSSHUTDOWN.exe -
! 	NEWSSHUTDOWN.obj, -
! 	news_library.olb/libr/include=newsmsg,'link_lib'
  $     if purge_exes then purge [-.news_dist]NEWSSHUTDOWN.exe
  $   ENDIF
  $ ENDIF
***************
*** 1639,1645 ****
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc feedcheck"
! $     cc/object=[-.news_build]FEEDCHECK.obj'cc_opt' FEEDCHECK
  $     set def [-.news_build]
  $     if purge_objs then purge FEEDCHECK.obj
  $   ENDIF
--- 1671,1677 ----
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc feedcheck"
! $     cc/object=[-.news_build]FEEDCHECK.obj'cc_opt' FEEDCHECK.c
  $     set def [-.news_build]
  $     if purge_objs then purge FEEDCHECK.obj
  $   ENDIF
***************
*** 1689,1695 ****
  $   THEN
  $     say "$ link feedcheck"
  $     link/nomap/notrace/exe=[-.news_dist]FEEDCHECK.exe	-
! 	FEEDCHECK,FEEDCHECKCMD,-
  	'link_lib'
  $     if purge_exes then purge [-.news_dist]FEEDCHECK.exe
  $   ENDIF
--- 1721,1727 ----
  $   THEN
  $     say "$ link feedcheck"
  $     link/nomap/notrace/exe=[-.news_dist]FEEDCHECK.exe	-
! 	FEEDCHECK.obj,FEEDCHECKCMD.obj,-
  	'link_lib'
  $     if purge_exes then purge [-.news_dist]FEEDCHECK.exe
  $   ENDIF
***************
*** 1716,1722 ****
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc batchnews"
! $     cc/object=[-.news_build]BATCHNEWS.obj'cc_opt' BATCHNEWS
  $     set def [-.news_build]
  $     if purge_objs then purge BATCHNEWS.obj
  $   ENDIF
--- 1748,1754 ----
  $   THEN
  $     set def [-.news_src]
  $     say "$ cc batchnews"
! $     cc/object=[-.news_build]BATCHNEWS.obj'cc_opt' BATCHNEWS.c
  $     set def [-.news_build]
  $     if purge_objs then purge BATCHNEWS.obj
  $   ENDIF
***************
*** 1766,1772 ****
  $   THEN
  $     say "$ link batchnews"
  $     link/nomap/notrace/exe=[-.news_dist]BATCHNEWS.exe -
! 	BATCHNEWS,BATCHNEWSCMD,-
  	'link_lib'
  $     if purge_exes then purge [-.news_dist]BATCHNEWS.exe
  $   ENDIF
--- 1798,1804 ----
  $   THEN
  $     say "$ link batchnews"
  $     link/nomap/notrace/exe=[-.news_dist]BATCHNEWS.exe -
! 	BATCHNEWS.obj,BATCHNEWSCMD.obj,-
  	'link_lib'
  $     if purge_exes then purge [-.news_dist]BATCHNEWS.exe
  $   ENDIF
***************
*** 1828,1834 ****
  $     goto cmp_endcase
  $cmp_endcase:
  $     set def [-.news_build]
! $     library/object news_library 'objname
  $     If .not.purge_objs Then goto dbgcomp
  $     IF p2 .eqs. "NODELOBJ" THEN $ goto purgeit
  $     create 'objname
--- 1860,1866 ----
  $     goto cmp_endcase
  $cmp_endcase:
  $     set def [-.news_build]
! $     library/object news_library.olb 'objname
  $     If .not.purge_objs Then goto dbgcomp
  $     IF p2 .eqs. "NODELOBJ" THEN $ goto purgeit
  $     create 'objname
***************
*** 1877,1883 ****
  $     goto cmpdbg_endcase
  $cmpdbg_endcase:
  $     set def [-.news_build]
! $     library/object news_libraryd 'objname
  $     If .not.purge_objs Then goto compdun
  $     create 'objname
  	COMPILE MARKER
--- 1909,1915 ----
  $     goto cmpdbg_endcase
  $cmpdbg_endcase:
  $     set def [-.news_build]
! $     library/object news_libraryd.olb 'objname
  $     If .not.purge_objs Then goto compdun
  $     create 'objname
  	COMPILE MARKER