v14i049: dmake version 3.5 patch 1 part 04/04

Dennis Vadura dvadura at watdragon.waterloo.edu
Sat Aug 4 09:28:05 AEST 1990


Posting-number: Volume 14, Issue 49
Submitted-by: dvadura at watdragon.waterloo.edu (Dennis Vadura)
Archive-name: dmake/patch01pt4

#!/bin/sh
# this is part 4 of a multipart archive
# do not concatenate these parts, unpack them in order with /bin/sh
# file dmake-3.5-patch1 continued
#
CurArch=4
if test ! -r s2_seq_.tmp
then echo "Please unpack part 1 first!"
     exit 1; fi
( read Scheck
  if test "$Scheck" != $CurArch
  then echo "Please unpack part $Scheck next!"
       exit 1;
  else exit 0; fi
) < s2_seq_.tmp || exit 1
sed 's/^X//' << 'SHAR_EOF' >> dmake-3.5-patch1
XX! 
XX! # You can get a smaller executable still, buy adding a -1 to the list of
XX! # flags below, but then you can't run this on an 8086/88 cpu.
XX! #CFLAGS += -1
XX! CFLAGS += -I$(osrdir) -f- -d -O -N- -w-nod
XX  
XX  # See if we modify anything in the lower levels.
XX  .IF $(OSENVIRONMENT) != $(NULL)
XX*** /u2/dvadura/src/generic/dmake/src.dist/msdos/tccdos/config.h	Mon Jul 30 11:52:43 1990
XX--- msdos/tccdos/config.h	Tue Jul 31 10:52:27 1990
XX***************
XX*** 1,4 ****
XX! /* RCS      -- $Header$
XX  -- SYNOPSIS -- Configurarion include file.
XX  -- 
XX  -- DESCRIPTION
XX--- 1,4 ----
XX! /* RCS      -- $Header: /u2/dvadura/src/generic/dmake/src/msdos/tccdos/RCS/config.h,v 1.1 90/07/31 10:52:26 dvadura Exp $
XX  -- SYNOPSIS -- Configurarion include file.
XX  -- 
XX  -- DESCRIPTION
XX***************
XX*** 28,34 ****
XX  --      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
XX  --
XX  -- LOG
XX! --     $Log$
XX  */
XX  
XX  /* define this for configurations that don't have the coreleft function
XX--- 28,37 ----
XX  --      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
XX  --
XX  -- LOG
XX! --     $Log:	config.h,v $
XX!  * Revision 1.1  90/07/31  10:52:26  dvadura
XX!  * Initial Revision Dmake 3.5
XX!  * 
XX  */
XX  
XX  /* define this for configurations that don't have the coreleft function
XX*** /u2/dvadura/src/generic/dmake/src.dist/msdos/sysintf.h	Mon Jul 30 11:52:44 1990
XX--- msdos/sysintf.h	Sat Jul 28 14:26:51 1990
XX***************
XX*** 10,18 ****
XX  extern char * tempnam();
XX  extern char * getcwd();
XX  
XX- /*No parallelism in DOS so don't need to explode the graph. */
XX- #define Explode_prq(a,b,c)
XX- 
XX  /*
XX  ** standard C items
XX  */
XX--- 10,15 ----
XX*** /u2/dvadura/src/generic/dmake/src.dist/msdos/mscdos/tempnam.c	Mon Jul 30 11:52:49 1990
XX--- msdos/mscdos/tempnam.c	Tue Jul 31 20:25:35 1990
XX***************
XX*** 4,9 ****
XX--- 4,12 ----
XX  #include <stdlib.h>
XX  #include <time.h>
XX  
XX+ #if defined(max)
XX+ #   undef  max
XX+ #endif
XX  #define max(A,B) (((A)<(B))?(B):(A))
XX  
XX  extern char *mktemp();
XX*** /u2/dvadura/src/generic/dmake/src.dist/msdos/mscdos/startup.mk	Mon Jul 30 11:52:51 1990
XX--- msdos/mscdos/startup.mk	Tue Jul 31 19:37:37 1990
XX***************
XX*** 86,92 ****
XX     AR     := ar			# archiver
XX     ARFLAGS = ruv
XX  
XX!    RM	   := /bin/rm		# remove a file command
XX     RMFLAGS  =
XX  
XX  # Implicit generation rules for making inferences.
XX--- 86,92 ----
XX     AR     := ar			# archiver
XX     ARFLAGS = ruv
XX  
XX!    RM	   := rm		# remove a file command
XX     RMFLAGS  =
XX  
XX  # Implicit generation rules for making inferences.
XX*** /u2/dvadura/src/generic/dmake/src.dist/msdos/mscdos/make.bat	Mon Jul 30 11:52:53 1990
XX--- msdos/mscdos/make.bat	Tue Jul 31 20:26:44 1990
XX***************
XX*** 1,56 ****
XX  mkdir objects
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  infer.c
XX! mv infer.obj objects
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  make.c
XX! mv make.obj objects
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  stat.c
XX! mv stat.obj objects
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  expand.c
XX! mv expand.obj objects
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  string.c
XX! mv string.obj objects
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  hash.c
XX! mv hash.obj objects
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  dag.c
XX! mv dag.obj objects
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  dmake.c
XX! mv dmake.obj objects
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  path.c
XX! mv path.obj objects
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  imacs.c
XX! mv imacs.obj objects
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  sysintf.c
XX! mv sysintf.obj objects
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  parse.c
XX! mv parse.obj objects
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  getinp.c
XX! mv getinp.obj objects
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  quit.c
XX! mv quit.obj objects
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  basename.c
XX! mv basename.obj objects
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  dump.c
XX! mv dump.obj objects
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  macparse.c
XX! mv macparse.obj objects
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  rulparse.c
XX! mv rulparse.obj objects
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  percent.c
XX! mv percent.obj objects
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  msdos\ruletab.c
XX! mv ruletab.obj objects
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  msdos\dirbrk.c
XX! mv dirbrk.obj objects
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  msdos\runargv.c
XX! mv runargv.obj objects
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  msdos\arlib.c
XX! mv arlib.obj objects
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  msdos\_chdir.c
XX! mv _chdir.obj objects
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  msdos\switchar.c
XX! mv switchar.obj objects
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  msdos\rmprq.c
XX! mv rmprq.obj objects
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  msdos\mscdos\tempnam.c
XX! mv tempnam.obj objects
XX! link @msdos\mscdos\mscobj.rsp,dmake.exe,NUL.MAP, at msdos\mscdos\msclib.rsp
XX--- 1,56 ----
XX  mkdir objects
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  infer.c
XX! mv infer.obj objects 
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  make.c
XX! mv make.obj objects 
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  stat.c
XX! mv stat.obj objects 
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  expand.c
XX! mv expand.obj objects 
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  string.c
XX! mv string.obj objects 
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  hash.c
XX! mv hash.obj objects 
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  dag.c
XX! mv dag.obj objects 
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  dmake.c
XX! mv dmake.obj objects 
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  path.c
XX! mv path.obj objects 
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  imacs.c
XX! mv imacs.obj objects 
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  sysintf.c
XX! mv sysintf.obj objects 
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  parse.c
XX! mv parse.obj objects 
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  getinp.c
XX! mv getinp.obj objects 
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  quit.c
XX! mv quit.obj objects 
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  basename.c
XX! mv basename.obj objects 
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  dump.c
XX! mv dump.obj objects 
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  macparse.c
XX! mv macparse.obj objects 
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  rulparse.c
XX! mv rulparse.obj objects 
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  percent.c
XX! mv percent.obj objects 
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  msdos\ruletab.c
XX! mv ruletab.obj objects 
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  msdos\dirbrk.c
XX! mv dirbrk.obj objects 
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  msdos\runargv.c
XX! mv runargv.obj objects 
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  msdos\arlib.c
XX! mv arlib.obj objects 
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  msdos\_chdir.c
XX! mv _chdir.obj objects 
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  msdos\switchar.c
XX! mv switchar.obj objects 
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  msdos\rmprq.c
XX! mv rmprq.obj objects 
XX  cl -c -nologo -DHELP -I. -Icommon -Imsdos -Imsdos\mscdos -D__STDC__=1 -DM_I86=1  msdos\mscdos\tempnam.c
XX! mv tempnam.obj objects 
XX! link @msdos\mscdos\mscobj.rsp,dmake.exe,NUL.MAP, at msdos\mscdos\msclib.rsp,NUL.DEF
XX*** /u2/dvadura/src/generic/dmake/src.dist/msdos/mscdos/config.mk	Mon Jul 30 11:52:53 1990
XX--- msdos/mscdos/config.mk	Tue Jul 31 19:29:31 1990
XX***************
XX*** 1,4 ****
XX! # This is the Turbo C 2.0 DOSconfiguration file for DMAKE
XX  #	It simply modifies the values of SRC, and checks to see if
XX  #	OSENVIRONMENT is defined.  If so it includes the appropriate
XX  #	config.mk file.
XX--- 1,4 ----
XX! # This is the MSC 4.0 and higher DOS configuration file for DMAKE
XX  #	It simply modifies the values of SRC, and checks to see if
XX  #	OSENVIRONMENT is defined.  If so it includes the appropriate
XX  #	config.mk file.
XX***************
XX*** 8,20 ****
XX  #
XX  osrdir := $(OS)$(DIRSEPSTR)$(OSRELEASE)
XX  
XX- # tlink does not know how to deal with tmpfiles that have e:\ in their path.
XX  TMPDIR :=
XX  .EXPORT : TMPDIR
XX  
XX  # Definition of macros for library, and C startup code.
XX  
XX! # The following sources are required for TURBO C 2.0
XX  SRC += tempnam.c
XX  
XX  .SOURCE.c : $(osrdir)
XX--- 8,19 ----
XX  #
XX  osrdir := $(OS)$(DIRSEPSTR)$(OSRELEASE)
XX  
XX  TMPDIR :=
XX  .EXPORT : TMPDIR
XX  
XX  # Definition of macros for library, and C startup code.
XX  
XX! # The following sources are required for MSC
XX  SRC += tempnam.c
XX  
XX  .SOURCE.c : $(osrdir)
XX***************
XX*** 22,28 ****
XX--- 21,46 ----
XX  
XX  # Local configuration modifications for CFLAGS, there's local BSD includes
XX  # too.
XX+ # If you have a 286, you can use -G2 or appropriate to get better code, 
XX+ # in that case uncomment the line below.
XX+ #CFLAGS += -G2
XX  CFLAGS += -I$(osrdir) -D__STDC__=1 -DM_I86=1
XX+ 
XX+ # Debugging Flags
XX+ DB_CFLAGS     += -Zi
XX+ DB_LDFLAGS    += /co /li /map
XX+ DB_LDLIBS     +=
XX+ 
XX+ # NO Debug flags, MSC 6.0 flags, set the environment variable MSC_VER to be
XX+ # 6.0 to get these by default when you make dmake using 'dmake'.
XX+ .IMPORT .IGNORE : MSC_VER
XX+ .IF $(MSC_VER)
XX+    .IF $(MSC_VER) != 4.0
XX+       NDB_CFLAGS    += -Osecgle -Gs
XX+       NDB_LDFLAGS   += /exe /packc /batch
XX+       NDB_LDLIBS    +=
XX+    .END
XX+ .END
XX  
XX  # See if we modify anything in the lower levels.
XX  .IF $(OSENVIRONMENT) != $(NULL)
XX*** /u2/dvadura/src/generic/dmake/src.dist/msdos/mscdos/config.h	Mon Jul 30 11:52:54 1990
XX--- msdos/mscdos/config.h	Tue Jul 31 14:23:27 1990
XX***************
XX*** 1,4 ****
XX! /* RCS      -- $Header$
XX  -- SYNOPSIS -- Configurarion include file.
XX  -- 
XX  -- DESCRIPTION
XX--- 1,4 ----
XX! /* RCS      -- $Header: /u2/dvadura/src/generic/dmake/src/msdos/mscdos/RCS/config.h,v 1.1 90/07/31 14:23:25 dvadura Exp $
XX  -- SYNOPSIS -- Configurarion include file.
XX  -- 
XX  -- DESCRIPTION
XX***************
XX*** 28,34 ****
XX  --      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
XX  --
XX  -- LOG
XX! --     $Log$
XX  */
XX  
XX  /* define this for configurations that don't have the coreleft function
XX--- 28,37 ----
XX  --      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
XX  --
XX  -- LOG
XX! --     $Log:	config.h,v $
XX!  * Revision 1.1  90/07/31  14:23:25  dvadura
XX!  * Initial Revision Dmake 3.5
XX!  * 
XX  */
XX  
XX  /* define this for configurations that don't have the coreleft function
XX***************
XX*** 39,41 ****
XX--- 42,71 ----
XX  
XX  /*No parallelism in DOS so don't need to explode the graph. */
XX  #define Explode_prq(a,b,c)
XX+ 
XX+ /* MSC Version 4.0 doesn't understand SIGTERM, later versions do. */
XX+ #ifndef SIGTERM
XX+ #   define SIGTERM SIGINT
XX+ #endif
XX+ 
XX+ /* Fixes unimplemented line buffering for MSC
XX+  * MSC _IOLBF is the same as _IOFBF
XX+  * This redefinition causes the following warning, but ignore it
XX+  * c:/usr/include/stdio.h(129) : warning C4005: '_IOLBF' : macro redefinition
XX+  */
XX+ #if defined(MSDOS) && defined (_MSC_VER)
XX+ #   undef  _IOLBF
XX+ #   define _IOLBF   _IONBF
XX+ #endif
XX+ 
XX+ /* in alloc.h: size_t is redefined
XX+  * defined in stdio.h which is included alloc.h
XX+  */
XX+ #if defined(MSDOS) && defined (_MSC_VER)
XX+ #   define _TYPES_
XX+ #endif
XX+ 
XX+ /* in sysintf.c: SIGQUIT is used, this is not defined in MSC */
XX+ #ifndef SIGQUIT
XX+ #   define SIGQUIT SIGTERM
XX+ #endif
XX*** /u2/dvadura/src/generic/dmake/src.dist/msdos/config.mk	Mon Jul 30 11:52:57 1990
XX--- msdos/config.mk	Mon Jul 30 11:30:34 1990
XX***************
XX*** 4,16 ****
XX  #	It augments	SRC, OBJDIR, TARGET, CFLAGS, LDLIBS
XX  #
XX  STARTUPFILE	= $(OS)/startup.mk
XX  CPPFLAGS 	= $(CFLAGS)
XX! LDOBJS		= $(CSTARTUP) $(OBJECTS)
XX! LDARGS		= @<+$(LDOBJS:s,/,\\,:t"+\n")\n+>,$(TARGET),NUL.MAP,@<+$(LDLIBS:s,/,\\,:t"+\n")\n+>$(LDFLAGS)
XX  
XX  # Debug flags
XX! DB_CFLAGS	= -DDBUG -v
XX! DB_LDFLAGS	= /v
XX  DB_LDLIBS	=
XX  
XX  # NO Debug flags
XX--- 4,17 ----
XX  #	It augments	SRC, OBJDIR, TARGET, CFLAGS, LDLIBS
XX  #
XX  STARTUPFILE	= $(OS)/startup.mk
XX+ 
XX  CPPFLAGS 	= $(CFLAGS)
XX! LDOBJS		= $(CSTARTUP) $(OBJDIR)/{$(<:f)}
XX! LDARGS		= @<+$(LDOBJS:s,/,\\,:t"+\n")\n+>,$(TARGET),NUL.MAP,@<+$(LDLIBS:s,/,\\,:t"+\n")\n+>$(LDFLAGS),NUL.DEF
XX  
XX  # Debug flags
XX! DB_CFLAGS	= -DDBUG
XX! DB_LDFLAGS	=
XX  DB_LDLIBS	=
XX  
XX  # NO Debug flags
XX***************
XX*** 49,54 ****
XX--- 50,58 ----
XX  
XX     SRC		+= dbug.c malloc.c
XX     HDR		+= db.h 
XX+ 
XX+    .SOURCE.c : common
XX+    .SOURCE.h : common
XX  .ELSE
XX     CFLAGS	+= $(NDB_CFLAGS)
XX     LDFLAGS	+= $(NDB_LDFLAGS)
XX*** /u2/dvadura/src/generic/dmake/src.dist/msdos/arlib.c	Mon Jul 30 11:52:58 1990
XX--- msdos/arlib.c	Tue Jul 31 13:37:50 1990
XX***************
XX*** 1,4 ****
XX! /* RCS      -- $Header: /u2/dvadura/src/generic/dmake/src/msdos/RCS/arlib.c,v 1.1 90/07/19 14:10:42 dvadura Exp $
XX  -- SYNOPSIS -- Library access code.
XX  -- 
XX  -- DESCRIPTION
XX--- 1,4 ----
XX! /* RCS      -- $Header: /u2/dvadura/src/generic/dmake/src/msdos/RCS/arlib.c,v 1.2 90/07/31 13:37:44 dvadura Exp $
XX  -- SYNOPSIS -- Library access code.
XX  -- 
XX  -- DESCRIPTION
XX***************
XX*** 28,33 ****
XX--- 28,36 ----
XX  --
XX  -- LOG
XX  --     $Log:	arlib.c,v $
XX+  * Revision 1.2  90/07/31  13:37:44  dvadura
XX+  * renamed macros.h to stdmacs.h in include
XX+  * 
XX   * Revision 1.1  90/07/19  14:10:42  dvadura
XX   * Initial Revision of Version 3.5
XX   * 
XX***************
XX*** 34,40 ****
XX  */
XX  
XX  #include "extern.h"
XX! #include "macros.h"
XX  #include "vextern.h"
XX  
XX  time_t
XX--- 37,43 ----
XX  */
XX  
XX  #include "extern.h"
XX! #include "stdmacs.h"
XX  #include "vextern.h"
XX  
XX  time_t
XX*** /u2/dvadura/src/generic/dmake/src.dist/man/dmake.tf	Mon Jul 30 11:53:11 1990
XX--- man/dmake.tf	Fri Jul 27 15:52:54 1990
XX***************
XX*** 3,15 ****
XX  .ds TB "0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.5i +0.5i +2.0i
XX  .de Ip
XX  .fi
XX! .nr Ip \w\\$1 
XX  .IP "\\$1" \\n(Ipu
XX  \\$2
XX  .nf
XX  ..
XX  .de Is
XX! .nr )I \w\\$1u
XX  ..
XX  .de Ii
XX  .in \\n()Ru
XX--- 3,15 ----
XX  .ds TB "0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.2i +0.5i +0.5i +2.0i
XX  .de Ip
XX  .fi
XX! .nr Ip \w\\$1 
XX  .IP "\\$1" \\n(Ipu
XX  \\$2
XX  .nf
XX  ..
XX  .de Is
XX! .nr )I \w\\$1u
XX  ..
XX  .de Ii
XX  .in \\n()Ru
XX*** /u2/dvadura/src/generic/dmake/src.dist/makefile.mk	Mon Jul 30 11:53:32 1990
XX--- makefile.mk	Tue Jul 31 15:44:49 1990
XX***************
XX*** 13,22 ****
XX  #       OSRELEASE     - bsd43, sysvr3, 386ix
XX  #		      - tccdos, mscdos  (valid only of OS == msdos)
XX  #       OSENVIRONMENT - uw {valid for unix, bsd43 configuration only.}
XX! #			dynix (valid for unix, bsd43 configuration only.)
XX  #
XX  # See the config.mk file in the relevant subdirectories for additional
XX  # comments describing when a setting is applicable.
XX  
XX  # First target in the makefile, do this so that targets declared in the
XX  # included files are never marked as being the first *default* target.
XX--- 13,26 ----
XX  #       OSRELEASE     - bsd43, sysvr3, 386ix
XX  #		      - tccdos, mscdos  (valid only of OS == msdos)
XX  #       OSENVIRONMENT - uw {valid for unix, bsd43 configuration only.}
XX! #			vf (valid for unix, bsd43 configuration only.)
XX  #
XX  # See the config.mk file in the relevant subdirectories for additional
XX  # comments describing when a setting is applicable.
XX+ #
XX+ # Uncomment the line below if you do not have a mkdir command, and rely on
XX+ # a shell for this functionality.  (command.com under DOS comes to mind).
XX+ #USESHELL = ;
XX  
XX  # First target in the makefile, do this so that targets declared in the
XX  # included files are never marked as being the first *default* target.
XX***************
XX*** 66,72 ****
XX  # to objects directory in a portable, compiler independent way)
XX  %$O: %.c
XX  	$(CC) -c $(CFLAGS) $<
XX! 	mv $(@:f) $(OBJDIR)
XX  
XX  # remaining dependencies should be automatically generated
XX  sysintf$O  : $(OS)/sysintf.h
XX--- 70,76 ----
XX  # to objects directory in a portable, compiler independent way)
XX  %$O: %.c
XX  	$(CC) -c $(CFLAGS) $<
XX! 	mv $(@:f) $(OBJDIR) $(USESHELL)
XX  
XX  # remaining dependencies should be automatically generated
XX  sysintf$O  : $(OS)/sysintf.h
XX***************
XX*** 78,84 ****
XX  PRINTEXCLUDE = $(OBJDIR) $(OBJDIR).dbg test RCS control man common
XX  .INCLUDE : common/print.mk
XX  
XX! clean:; $(RM) -rf dmake dbdmake objects*
XX  
XX  
XX  #--------------------------------------------------------------------------
XX--- 82,88 ----
XX  PRINTEXCLUDE = $(OBJDIR) $(OBJDIR).dbg test RCS control man common
XX  .INCLUDE : common/print.mk
XX  
XX! clean:; $(RM) -rf dmake$E dbdmake$E objects*
XX  
XX  
XX  #--------------------------------------------------------------------------
XX***************
XX*** 153,170 ****
XX  #
XX  unix-bsd43-scripts-flags       = OS=unix OSRELEASE=bsd43  OSENVIRONMENT=
XX  unix-sysvr3-scripts-flags      = OS=unix OSRELEASE=sysvr3 OSENVIRONMENT=
XX  unix-386ix-scripts-flags       = OS=unix OSRELEASE=386ix  OSENVIRONMENT=
XX  unix-bsd43-uw-scripts-flags    = OS=unix OSRELEASE=bsd43  OSENVIRONMENT=uw
XX! unix-bsd43-dynix-scripts-flags = OS=unix OSRELEASE=bsd43  OSENVIRONMENT=dynix
XX  
XX! unix-scripts:
XX  	$(MAKE) SCRIPTFILE=make.sh unix-bsd43-scripts
XX  	$(MAKE) SCRIPTFILE=make.sh unix-bsd43-uw-scripts
XX! 	$(MAKE) SCRIPTFILE=make.sh unix-bsd43-dynix-scripts
XX  	$(MAKE) SCRIPTFILE=make.sh unix-sysvr3-scripts
XX  	$(MAKE) SCRIPTFILE=make.sh unix-386ix-scripts
XX  
XX! unix-%-scripts:; $(MAKECMD) -nus $(MS) $($@-flags) >$(SH)
XX  
XX  # We make the standard dos scripts here, but we have to go and fix up the
XX  # make.bat file since it contains names of temporary files for the response
XX--- 157,176 ----
XX  #
XX  unix-bsd43-scripts-flags       = OS=unix OSRELEASE=bsd43  OSENVIRONMENT=
XX  unix-sysvr3-scripts-flags      = OS=unix OSRELEASE=sysvr3 OSENVIRONMENT=
XX+ unix-sysvr1-scripts-flags      = OS=unix OSRELEASE=sysvr1 OSENVIRONMENT=
XX  unix-386ix-scripts-flags       = OS=unix OSRELEASE=386ix  OSENVIRONMENT=
XX  unix-bsd43-uw-scripts-flags    = OS=unix OSRELEASE=bsd43  OSENVIRONMENT=uw
XX! unix-bsd43-vf-scripts-flags    = OS=unix OSRELEASE=bsd43  OSENVIRONMENT=vf
XX  
XX! unix-scripts: clean
XX  	$(MAKE) SCRIPTFILE=make.sh unix-bsd43-scripts
XX  	$(MAKE) SCRIPTFILE=make.sh unix-bsd43-uw-scripts
XX! 	$(MAKE) SCRIPTFILE=make.sh unix-bsd43-vf-scripts
XX  	$(MAKE) SCRIPTFILE=make.sh unix-sysvr3-scripts
XX+ 	$(MAKE) SCRIPTFILE=make.sh unix-sysvr1-scripts
XX  	$(MAKE) SCRIPTFILE=make.sh unix-386ix-scripts
XX  
XX! unix-%-scripts:; $(MAKECMD) -ns $(MS) $($@-flags) >$(SH)
XX  
XX  # We make the standard dos scripts here, but we have to go and fix up the
XX  # make.bat file since it contains names of temporary files for the response
XX***************
XX*** 178,184 ****
XX  msdos-tccdos-scripts-flags = OS=msdos OSRELEASE=tccdos  OSENVIRONMENT=
XX  msdos-mscdos-scripts-flags = OS=msdos OSRELEASE=mscdos  OSENVIRONMENT=
XX  
XX! msdos-scripts:
XX  	$(MAKE) SCRIPTFILE=make.bat msdos-tccdos-scripts
XX  	$(MAKE) SCRIPTFILE=make.bat msdos-mscdos-scripts
XX  
XX--- 184,190 ----
XX  msdos-tccdos-scripts-flags = OS=msdos OSRELEASE=tccdos  OSENVIRONMENT=
XX  msdos-mscdos-scripts-flags = OS=msdos OSRELEASE=mscdos  OSENVIRONMENT=
XX  
XX! msdos-scripts: clean
XX  	$(MAKE) SCRIPTFILE=make.bat msdos-tccdos-scripts
XX  	$(MAKE) SCRIPTFILE=make.bat msdos-mscdos-scripts
XX  
XX*** /u2/dvadura/src/generic/dmake/src.dist/makefile	Mon Jul 30 11:53:31 1990
XX--- makefile	Tue Jul 31 15:47:56 1990
XX***************
XX*** 7,23 ****
XX  
XX  all:
XX  	@echo "You must issue one of:"
XX- 	@echo "   make bsd43uw       - Generic BSD 4.3 at U of Waterloo"
XX  	@echo "   make bsd43         - Generic BSD 4.3"
XX  	@echo "   make sysvr3        - Generic SysV R3 UNIX"
XX! 	@echo "   make dynix         - Sequent DYNIX system"
XX  	@echo "   make tccdos        - DOS with tcc 2.0"
XX  	@echo "   make 386ix         - 386/ix (SysV R3) [NOTE: not tested]"
XX! 	@echo "   make mscdos        - DOS with MSC 4.0 [NOTE: not tested]"
XX  
XX! bsd43uw 	   :; /bin/sh -x < unix/bsd43/uw/make.sh
XX! dynix              :; /bin/sh -x < unix/bsd43/dynix/make.sh
XX! sysvr3 bsd43 386ix :; /bin/sh -x < unix/$@/make.sh
XX  
XX  # DOS with some form of make and sh
XX  # Note if you do not have a 'make and/or sh' program under MSDOS then
XX--- 7,27 ----
XX  
XX  all:
XX  	@echo "You must issue one of:"
XX  	@echo "   make bsd43         - Generic BSD 4.3"
XX+ 	@echo "   make bsd43uw       - Generic BSD 4.3 at U of Waterloo"
XX+ 	@echo "   make bsd43vf       - Generic BSD 4.3 that needs vfprintf"
XX  	@echo "   make sysvr3        - Generic SysV R3 UNIX"
XX! 	@echo "   make sysvr1        - Generic SysV R1 UNIX"
XX  	@echo "   make tccdos        - DOS with tcc 2.0"
XX+ 	@echo "   make mscdos        - DOS with MSC 4.0 and up"
XX  	@echo "   make 386ix         - 386/ix (SysV R3) [NOTE: not tested]"
XX! 	@echo "   make dynix         - Sequent DYNIX system"
XX! 	@echo "   make ultrix        - Ultrix 3.0 system"
XX! 	@echo "   make mips          - Any MIPS box"
XX  
XX! bsd43uw :; /bin/sh -x < unix/bsd43/uw/make.sh
XX! bsd43vf dynix ultrix mips :; /bin/sh -x < unix/bsd43/vf/make.sh
XX! sysvr1 sysvr3 bsd43 386ix :; /bin/sh -x < unix/$@/make.sh
XX  
XX  # DOS with some form of make and sh
XX  # Note if you do not have a 'make and/or sh' program under MSDOS then
XX*** /u2/dvadura/src/generic/dmake/src.dist/extern.h	Mon Jul 30 11:53:44 1990
XX--- extern.h	Sat Jul 28 14:22:18 1990
XX***************
XX*** 1,4 ****
XX! /* RCS      -- $Header: /u2/dvadura/src/generic/dmake/src/RCS/extern.h,v 1.1 90/07/19 13:55:31 dvadura Exp $
XX  -- SYNOPSIS -- external declarations for dmake functions.
XX  -- 
XX  -- DESCRIPTION
XX--- 1,4 ----
XX! /* RCS      -- $Header: /u2/dvadura/src/generic/dmake/src/RCS/extern.h,v 1.2 90/07/28 14:21:23 dvadura Exp $
XX  -- SYNOPSIS -- external declarations for dmake functions.
XX  -- 
XX  -- DESCRIPTION
XX***************
XX*** 28,33 ****
XX--- 28,39 ----
XX  --
XX  -- LOG
XX  --     $Log:	extern.h,v $
XX+  * Revision 1.2  90/07/28  14:21:23  dvadura
XX+  * Moved the include point for config.h to the bottom of the file.
XX+  * This prevents DOS versions crapping out during a compile when some extern
XX+  * declaration is replaced by a macro which expands to nothing.  Such macros
XX+  * are defined in config.h.
XX+  * 
XX   * Revision 1.1  90/07/19  13:55:31  dvadura
XX   * Initial Revision of Version 3.5
XX   * 
XX***************
XX*** 37,43 ****
XX  #define EXTERN_h
XX  
XX  #include "vextern.h"
XX- #include "config.h"
XX  #include <stdlib.h>
XX  #include <string.h>
XX  
XX--- 43,48 ----
XX***************
XX*** 129,134 ****
XX--- 134,144 ----
XX  extern	char*	_strspn ANSI((char *,char *));
XX  extern	char*	_strstr ANSI((char *,char *));
XX  extern	char*	_substr ANSI((char *,char *));
XX+ 
XX+ /* Include this last as it invalidates some functions that are defined
XX+  * externally above and turns them into no-ops.  Have to do this after
XX+  * the extern declarations however. */
XX+ #include "config.h"
XX  
XX  #endif
XX  
XX*** /u2/dvadura/src/generic/dmake/src.dist/common/alloc.h	Mon Jul 30 11:54:08 1990
XX--- common/alloc.h	Sat Jul 28 14:19:07 1990
XX***************
XX*** 1,4 ****
XX! /* RCS      -- $Header: /u2/dvadura/src/generic/dmake/src/common/RCS/alloc.h,v 1.1 90/07/19 13:30:39 dvadura Exp $
XX  -- SYNOPSIS -- macros for allocating memory.
XX  -- 
XX  -- DESCRIPTION
XX--- 1,4 ----
XX! /* RCS      -- $Header: /u2/dvadura/src/generic/dmake/src/common/RCS/alloc.h,v 1.2 90/07/28 14:10:47 dvadura Exp $
XX  -- SYNOPSIS -- macros for allocating memory.
XX  -- 
XX  -- DESCRIPTION
XX***************
XX*** 29,34 ****
XX--- 29,37 ----
XX  --
XX  -- LOG
XX  --     $Log:	alloc.h,v $
XX+  * Revision 1.2  90/07/28  14:10:47  dvadura
XX+  * Fixed up definition of size_t to accomodate MSDOS.
XX+  * 
XX   * Revision 1.1  90/07/19  13:30:39  dvadura
XX   * Initial Revision of Version 3.5
XX   * 
XX***************
XX*** 43,49 ****
XX--- 46,56 ----
XX   */
XX  
XX  #ifndef _TYPES_
XX+ #if defined(MSDOS) || defined(__MSDOS__)
XX+ typedef unsigned size_t;
XX+ #else
XX  typedef long size_t;
XX+ #endif
XX  #endif
XX  
XX  #define	usizeof(t)	(size_t)sizeof(t)
XX*** /u2/dvadura/src/generic/dmake/src.dist/_readme.dos	Mon Jul 30 11:54:13 1990
XX--- _readme.dos	Tue Jul 31 20:24:08 1990
XX***************
XX*** 1,11 ****
XX  Some notes on the MSDOS implementation of dmake.
XX  
XX  dmake does not care if you are running command.com or some other command
XX  interpretter, you must however specify the proper values of the environment
XX  variables SHELL, SHELLFLAGS, GROUPSHELL, and GROUPFLAGS in order for things
XX  to work correctly.  Read the man page first.
XX  
XX! Group recipes under DOS require you to set the GROUPSUFFIX macro.
XX  
XX  As shipped the startup.mk files for the DOS version try to figure out what
XX  command interpretter you are using and set things up appropriately.
XX--- 1,41 ----
XX  Some notes on the MSDOS implementation of dmake.
XX  
XX+ Making the binary:
XX+ ------------------
XX+ 
XX+    Turbo-C:  By default the turbo-C (make tccdos) script will make a version
XX+ 	     of the binary that is compiled for an 8088 and up cpu.  Once made
XX+ 	     you can make a version for a 186 or 286 by modifying
XX+ 	     msdos/tccdos/config.mk and setting CFLAGS to contain the right
XX+ 	     flags.
XX+ 
XX+ 	     The contents of the default response files
XX+ 	     (named in msdos/tccdos/make.bat) assume specific locations for
XX+ 	     your turbo-C libraries you may need to edit these before actually
XX+ 	     getting a successful binary linked.
XX+ 
XX+    Microsoft-C 4.0 and Higher:
XX+ 	     Is straight forward, just type 'make mscdos' and the compile will
XX+ 	     chunk along.  The dmake binary is somewhat large.  If you are
XX+ 	     running into memory limitations using dmake and you compiled with
XX+ 	     MSC then you might try to recompile the binaries using the
XX+ 	     medium-model (/AM) and then relink using the response file found
XX+ 	     msdos/mscdos/mscovl.rsp.  This defines two overlays that contain
XX+ 	     mutually exclusive portions of dmake.  The resulting resident
XX+ 	     binary is actually bigger but it uses less memory at run-time,
XX+ 	     apx 14k less.
XX+ 
XX+ 
XX+ Other notes:
XX+ ------------
XX+ 
XX  dmake does not care if you are running command.com or some other command
XX  interpretter, you must however specify the proper values of the environment
XX  variables SHELL, SHELLFLAGS, GROUPSHELL, and GROUPFLAGS in order for things
XX  to work correctly.  Read the man page first.
XX  
XX! Group recipes under DOS that use command.com as the command interpretter
XX! require you to set the GROUPSUFFIX macro.
XX  
XX  As shipped the startup.mk files for the DOS version try to figure out what
XX  command interpretter you are using and set things up appropriately.
XX***************
XX*** 14,21 ****
XX  
XX  dmake does not contain any builtin commands.  It gets all commands it executes
XX  from an external environment.  It is therefore most useful if it is used in
XX! conjunction with an environment such as is provided by the the MKS Tool kit,
XX! or equivalent.
XX  
XX  If running under the MKS toolkit, dmake does not currently support their
XX  extended length argument passing conventions.  I need a working version of
XX--- 44,51 ----
XX  
XX  dmake does not contain any builtin commands.  It gets all commands it executes
XX  from an external environment.  It is therefore most useful if it is used in
XX! conjunction with an environment similar to that provided by the the
XX! MKS Tool kit, or equivalent.
XX  
XX  If running under the MKS toolkit, dmake does not currently support their
XX  extended length argument passing conventions.  I need a working version of
XX*** /u2/dvadura/src/generic/dmake/src.dist/_readme	Mon Jul 30 11:54:12 1990
XX--- _readme	Mon Jul 30 14:32:54 1990
XX***************
XX*** 19,25 ****
XX  	  apollo, and others)
XX  	. significantly enhanced macro facilities
XX  	. transitive closure on inference graph
XX! 	. sofisticated inference algorithm
XX  	. support for traversing the file sytem both during making of targets
XX  	  and during inference
XX  	. %-meta rules for specifying rules to be used for inferring
XX--- 19,25 ----
XX  	  apollo, and others)
XX  	. significantly enhanced macro facilities
XX  	. transitive closure on inference graph
XX! 	. sophisticated inference algorithm
XX  	. support for traversing the file sytem both during making of targets
XX  	  and during inference
XX  	. %-meta rules for specifying rules to be used for inferring
XX***************
XX*** 29,34 ****
XX--- 29,35 ----
XX  	. parallel making of targets on architectures that support it
XX  	. attributed targets
XX  	. text diversions
XX+ 	. group recipes
XX  
XX  All code found in this distribution is original and writen by me except where
XX  noted in the source and the following:
XX*** /u2/dvadura/src/generic/dmake/src.dist/_install	Mon Jul 30 11:54:13 1990
XX--- _install	Sat Jul 28 14:42:15 1990
XX***************
XX*** 50,59 ****
XX  (NOTE:  If you are using MSDOS then, you will actually be using the make.bat
XX  	scriptfile to make the correct version of dmake for MSDOS.  If you
XX  	are running a SHELL other than command.com, you may have to perform
XX! 	some extra work to invoke the batch file.)
XX  
XX  The making of dmake, echoes the commands being executed, and should proceed
XX! relatively error free.  Ignore any warnings that concerned unused arguments
XX  to functions, these are normal in some configurations (esp the MSDOS)
XX  configuration.
XX  
XX--- 50,63 ----
XX  (NOTE:  If you are using MSDOS then, you will actually be using the make.bat
XX  	scriptfile to make the correct version of dmake for MSDOS.  If you
XX  	are running a SHELL other than command.com, you may have to perform
XX! 	some extra work to invoke the batch file.
XX! 	
XX! 	Make sure you read the _readme.dos file before atempting to make the
XX! 	MSDOS version, as it contains important configuration and a limitation
XX! 	information.)
XX  
XX  The making of dmake, echoes the commands being executed, and should proceed
XX! relatively error free.  Ignore any warnings that concern unused arguments
XX  to functions, these are normal in some configurations (esp the MSDOS)
XX  configuration.
XX  
XSHAR_EOF
Xchmod 0640 _patches || echo "restore of _patches fails"
Xset `wc -c _patches`;Sum=$1
Xif test "$Sum" != "76671"
Xthen echo original size 76671, current size $Sum;fi
X
X# Now run patch to fix up the files
Xpatch -p0 < _patches
Xexit 0
SHAR_EOF
chmod 0640 dmake-3.5-patch1 || echo "restore of dmake-3.5-patch1 fails"
rm -f s2_seq_.tmp
echo "You have unpacked the last part"
exit 0



More information about the Comp.sources.misc mailing list