*** make.com_orig	Fri Jun 21 09:42:14 1996
--- make.com	Sat Feb 15 13:57:39 1997
***************
*** 6,9 ****
--- 6,10 ----
  $!	Compile the CTWM Window Manager
  $!
+ $ FLEX = FLEX
  $ Set Symbol/Scope=NoGlobal
  $!
***************
*** 14,20 ****
  $ Then
  $	CC := CC/STAND=VAXC
! $	OPT = "AXP_OPT"
  $ Else
! $	OPT = "VAX_OPT"
  $ Endif
  $!
--- 15,36 ----
  $ Then
  $	CC := CC/STAND=VAXC
! $	OPT = "DECC_OPT"
  $ Else
! $	write sys$error "Ignore the possible %DCL-W-IVQUAL or %CC-W-EMPTYFILE"
! $	CC := CC/STAND=VAXC
! $	OPT = "DECC_OPT"
! $	Set Noon
! $	CC NL:/OBJ=NL:
! $	If $status .eq. %x00038240
! $	Then	! no DEC C or the standard is to run VAX C
! $		CC := CC/DECC
! $		CC NL:/OBJ=NL:
! $		If $status .eq. %x00038240
! $		Then	! no DEC C, meaning VAX C without the /VAXC qualifier
! $			CC := CC
! $			OPT = "VAXC_OPT"
! $		Endif
! $	Endif
! $	write sys$error "There, you can look again now..."
  $ Endif
  $!
***************
*** 23,33 ****
  $! this is where the Xmu include files are held,
  $!  usually in sys$sysroot:[decw$include.xmu]
! $ define/nolog x11xmu MPHA7$USER1:[THEORY.PETERC.R5.XMU]
  $! where the xpm object library is.
! $ define/nolog xpmlib MPHA7$USER1:[THEORY.PETERC.XPM]
  $!
  $!  Get the compiler options via the logical name COPTS
  $!
! $ cc_options = f$trnlnm("COPTS") + "/define=(VMS,XPM)"
  $!
  $!  Get the linker options via the logical name LOPTS
--- 39,50 ----
  $! this is where the Xmu include files are held,
  $!  usually in sys$sysroot:[decw$include.xmu]
! $ define/nolog x11xmu sys$sysroot:[decw$include.xmu]
  $! where the xpm object library is.
! $ define/nolog xpmlib source:[xpm-3_4e]
  $!
  $!  Get the compiler options via the logical name COPTS
  $!
! $ cc_options = f$trnlnm("COPTS") + -
! 	       "/define=(VMS,XPM,C_ALLOCA,""""emacs"""",BLOCK_INPUT)"
  $!
  $!  Get the linker options via the logical name LOPTS
***************
*** 40,68 ****
  $! CALL MAKE FILE.OBJ	"CC ''cc_options' FILE.C"	FILE.C
  $!
! $ write sys$output "Compiling CTWM sources"
! $ CALL MAKE ADD_WINDOW.OBJ  	"CC ''cc_options' ADD_WINDOW.C"	ADD_WINDOW.C
! $ CALL MAKE CTWM.OBJ  		"CC ''cc_options' CTWM.C"	CTWM.C
! $ CALL MAKE CURSOR.OBJ  	"CC ''cc_options' CURSOR.C"	CURSOR.C
  $ CALL MAKE DEFTWMRC.OBJ  	"CC ''cc_options' DEFTWMRC.C"	DEFTWMRC.C
! $ CALL MAKE EVENTS.OBJ  	"CC ''cc_options' EVENTS.C"	EVENTS.C
! $ CALL MAKE GC.OBJ  		"CC ''cc_options' GC.C"	GC.C
! $ CALL MAKE GRAM.OBJ  		"CC ''cc_options' GRAM.C"	GRAM.C
! $ CALL MAKE ICONMGR.OBJ  	"CC ''cc_options' ICONMGR.C"	ICONMGR.C
! $ CALL MAKE WORKMGR.OBJ  	"CC ''cc_options' WORKMGR.C"	WORKMGR.C
! $ CALL MAKE ICONS.OBJ  		"CC ''cc_options' ICONS.C"	ICONS.C
! $ CALL MAKE LEX.OBJ  		"CC ''cc_options' LEX.C"	LEX.C
! $ CALL MAKE LIST.OBJ  		"CC ''cc_options' LIST.C"	LIST.C
! $ CALL MAKE MENUS.OBJ  		"CC ''cc_options' MENUS.C"	MENUS.C
! $ CALL MAKE PARSE.OBJ  		"CC ''cc_options' PARSE.C"	PARSE.C
! $ CALL MAKE RESIZE.OBJ  	"CC ''cc_options' RESIZE.C"	RESIZE.C
! $ CALL MAKE UTIL.OBJ  		"CC ''cc_options' UTIL.C"	UTIL.C
  $ CALL MAKE VERSION.OBJ  	"CC ''cc_options' VERSION.C"	VERSION.C
! $ CALL MAKE VMS_CMD_SERVICES.OBJ -
! 				"CC ''cc_options' VMS_CMD_SERVICES.C" -
! 				VMS_CMD_SERVICES.H
! $ CALL MAKE LNM.OBJ  	"CC ''cc_options' LNM.C"	LNM.C
  $!
  $ write sys$output "Building CTWM image"
! $ CALL MAKE CTWM.EXE	"LINK ''link_options'/EXE=CTWM.EXE CTWM.''OPT'/OPT"	*.OBJ
  $!
  $ deassign xpmlib
--- 57,132 ----
  $! CALL MAKE FILE.OBJ	"CC ''cc_options' FILE.C"	FILE.C
  $!
! $ write sys$output "Building LEX.C from LEX.L using flex"
! $ CALL MAKE LEXYY.C		"FLEX LEX.L"			LEX.L
! $ CALL MAKE LEX.C		"COPY LEXYY.C LEX.C"		LEXYY.C
! $ write sys$output -
! 	"Building GRAM.C and GRAM.H from GRAM.Y using bison/def/yacc"
! $ CALL MAKE Y_TAB.C		"BISON /DEF/YACC GRAM.Y"	GRAM.Y
! $ CALL MAKE GRAM.C		"COPY Y_TAB.C GRAM.C"		Y_TAB.C
! $ CALL MAKE GRAM.H		"COPY Y_TAB.H GRAM.H"		Y_TAB.H
! $ write sys$output -
! 	"Building DEFTWMRC.C from SYSTEM.CTWMRC using GENDEFTWMRC.COM"
! $ CALL MAKE DEFTWMRC.C		"@GENDEFTWMRC.COM"		SYSTEM.CTWMRC -
!        GENDEFTWMRC.COM
! $ write sys$output "Compiling CTWM sources with CC=",CC
! $ CALL MAKE ADD_WINDOW.OBJ  	"CC ''cc_options' ADD_WINDOW.C"	ADD_WINDOW.C -
!        "TWM.H ADD_WINDOW.H UTIL.H RESIZE.H PARSE.H GRAM.H LIST.H EVENTS.H" -
!        "MENUS.H SCREEN.H ICONS.H ICONMGR.H" -
!        "LIST.H MANUS.H ICONMGR.H WORKMGR.H"
! $ CALL MAKE CTWM.OBJ  		"CC ''cc_options' CTWM.C"	CTWM.C -
!        "TWM.H ADD_WINDOW.H GC.H PARSE.H VERSION.H MENUS.H EVENTS.H UTIL.H" -
!        "GRAM.H SCREEN.H ICONS.H ICONMGR.H" -
!        "LIST.H MANUS.H ICONMGR.H WORKMGR.H"
! $ CALL MAKE CURSOR.OBJ  	"CC ''cc_options' CURSOR.C"	CURSOR.C -
!        "TWM.H SCREEN.H UTIL.H" -
!        "LIST.H MANUS.H ICONMGR.H WORKMGR.H"
  $ CALL MAKE DEFTWMRC.OBJ  	"CC ''cc_options' DEFTWMRC.C"	DEFTWMRC.C
! $ CALL MAKE EVENTS.OBJ  	"CC ''cc_options' EVENTS.C"	EVENTS.C -
!        "TWM.H ADD_WINDOW.H MENUS.H EVENTS.H RESIZE.H PARSE.H GRAM.H UTIL.H" -
!        "SCREEN.H ICONS.H ICONMGR.H VERSION.H" -
!        "LIST.H MANUS.H ICONMGR.H WORKMGR.H"
! $ CALL MAKE GC.OBJ  		"CC ''cc_options' GC.C"	GC.C -
!        "TWM.H UTIL.H GRAM.H SCREEN.H" -
!        "LIST.H MANUS.H ICONMGR.H WORKMGR.H"
! $ CALL MAKE GRAM.OBJ  		"CC ''cc_options' GRAM.C"	GRAM.C -
!        "TWM.H MENUS.H ICONS.H ADD_WINDOW.H LIST.H UTIL.H SCREEN.H PARSE.H" -
!        "LIST.H MANUS.H ICONMGR.H WORKMGR.H"
! $ CALL MAKE ICONMGR.OBJ  	"CC ''cc_options' ICONMGR.C"	ICONMGR.C -
!        "TWM.H UTIL.H PARSE.H SCREEN.H RESIZE.H ADD_WINDOW.H SICONIFY.BM" -
!        "LIST.H MANUS.H ICONMGR.H WORKMGR.H"
! $ CALL MAKE ICONS.OBJ  		"CC ''cc_options' ICONS.C"	ICONS.C -
!        "TWM.H SCREEN.H ICONS.H GRAM.H LIST.H PARSE.H UTIL.H" -
!        "LIST.H MANUS.H ICONMGR.H WORKMGR.H"
! $ CALL MAKE LEX.OBJ  		"CC ''cc_options' LEX.C"	LEX.C -
!        "GRAM.H PARSE.H"
! $ CALL MAKE LIST.OBJ  		"CC ''cc_options' LIST.C"	LIST.C -
!        "TWM.H SCREEN.H GRAM.H UTIL.H" -
!        "LIST.H MANUS.H ICONMGR.H WORKMGR.H"
! $ CALL MAKE MENUS.OBJ  		"CC ''cc_options' MENUS.C"	MENUS.C -
!        "TWM.H GC.H MENUS.H RESIZE.H EVENTS.H UTIL.H PARSE.H GRAM.H SCREEN.H" -
!        "ICONS.H VMS_CMD_SERVICE.H VERSION.H" -
!        "LIST.H MANUS.H ICONMGR.H WORKMGR.H"
! $ CALL MAKE PARSE.OBJ  		"CC ''cc_options' PARSE.C"	PARSE.C -
!        "TWM.H SCREEN.H MENUS.H UTIL.H GRAM.H PARSE.H VERSION.H" -
!        "LIST.H MANUS.H ICONMGR.H WORKMGR.H"
! $ CALL MAKE RESIZE.OBJ  	"CC ''cc_options' RESIZE.C"	RESIZE.C -
!        "TWM.H PARSE.H UTIL.H RESIZE.H ADD_WINDOW.H SCREEN.H" -
!        "LIST.H MANUS.H ICONMGR.H WORKMGR.H"
! $ CALL MAKE UTIL.OBJ  		"CC ''cc_options' UTIL.C"	UTIL.C -
!        "TWM.H UTIL.H GRAM.H SCREEN.H ICONS.H XPM.H SICONIFY.BM" -
!        "LIST.H MANUS.H ICONMGR.H WORKMGR.H"
  $ CALL MAKE VERSION.OBJ  	"CC ''cc_options' VERSION.C"	VERSION.C
! $ CALL MAKE WORKMGR.OBJ  	"CC ''cc_options' WORKMGR.C"	WORKMGR.C -
!        "TWM.H UTIL.H PARSE.H SCREEN.H ICONS.H RESIZE.H ADD_WINDOW.H EVENTS.H" -
!        "GRAM.H" -
!        "LIST.H MANUS.H ICONMGR.H WORKMGR.H"
! $ CALL MAKE VMS_CMD_SERVICES.OBJ "CC ''cc_options' VMS_CMD_SERVICES.C" -
!        VMS_CMD_SERVICES.C VMS_CMD_SERVICES.H LNM.H
! $ CALL MAKE LNM.OBJ	  	"CC ''cc_options' LNM.C"	LNM.C
! $ CALL MAKE ALLOCA.OBJ		"CC ''cc_options' ALLOCA.C"	ALLOCA.C
  $!
  $ write sys$output "Building CTWM image"
! $ CALL MAKE CTWM.EXE	"LINK ''link_options'/EXE=CTWM.EXE CTWM.''OPT'/OPT" -
!        *.OBJ CTWM.'OPT'
  $!
  $ deassign xpmlib
***************
*** 112,116 ****
--- 176,186 ----
  $ Goto Exit
  $
+ $BailOut:
+ $ VV='F$Verify(0)
+ $ If V Then Set Verify
+ $ Exit
  $Makeit:
+ $ On Error Then Goto BailOut
+ $ On Control_y Then Goto BailOut
  $ Set Verify
  $ 'P2