rjl@monu1.cc.monash.edu.au (Russell Lang) (01/05/91)
Submitted-by: Russell Lang <rjl@monu1.cc.monash.edu.au>
Posting-number: Volume 16, Issue 14
Archive-name: gnuplot2.02/patch4
Patch-To: gnuplot2.0: Volume 11, Issue 65-79
#! /bin/sh
# This is a shell archive. Remove anything before this line, then unpack
# it by saving it into a file and typing "sh file". To overwrite existing
# files, type "sh file -c". You can also feed this as standard input via
# unshar, or by typing "sh <file", e.g.. If this archive is complete, you
# will see the following message at the end:
# "End of shell archive."
# Contents: patch2c
# Wrapped by eln272v@monu1 on Wed Dec 19 11:57:48 1990
PATH=/bin:/usr/bin:/usr/ucb ; export PATH
if test -f patch2c -a "${1}" != "-c" ; then
echo shar: Will not over-write existing file \"patch2c\"
else
echo shar: Extracting \"patch2c\" \(50960 characters\)
sed "s/^X//" >patch2c <<'END_OF_patch2c'
Xdiff -cr ./graphics.c ../gnuplot2.02/graphics.c
X*** ./graphics.c Tue Sep 18 14:57:55 1990
X--- ../gnuplot2.02/graphics.c Fri Nov 23 17:54:08 1990
X***************
X*** 281,287
X xaxis_y = ybot; /* save for impulse plotting */
X else if (xaxis_y >= ytop)
X xaxis_y = ytop ;
X! else if (!log_y) {
X (*t->move)(xleft,xaxis_y);
X (*t->vector)(xright,xaxis_y);
X }
X
X--- 281,287 -----
X xaxis_y = ybot; /* save for impulse plotting */
X else if (xaxis_y >= ytop)
X xaxis_y = ytop ;
X! else if (xzeroaxis && !log_y) {
X (*t->move)(xleft,xaxis_y);
X (*t->vector)(xright,xaxis_y);
X }
X***************
X*** 286,292
X (*t->vector)(xright,xaxis_y);
X }
X
X! if (!log_x && yaxis_x >= xleft && yaxis_x < xright ) {
X (*t->move)(yaxis_x,ybot);
X (*t->vector)(yaxis_x,ytop);
X }
X
X--- 286,292 -----
X (*t->vector)(xright,xaxis_y);
X }
X
X! if (yzeroaxis && !log_x && yaxis_x >= xleft && yaxis_x < xright ) {
X (*t->move)(yaxis_x,ybot);
X (*t->vector)(yaxis_x,ytop);
X }
X***************
X*** 483,489
X (*t->move)(xl+(t->h_char),yl);
X (*t->vector)(xl+4*(t->h_char),yl);
X }
X! plot_impulses(this_plot, xaxis_y);
X break;
X }
X case LINES: {
X
X--- 483,489 -----
X (*t->move)(xl+(t->h_char),yl);
X (*t->vector)(xl+4*(t->h_char),yl);
X }
X! plot_impulses(this_plot, yaxis_x, xaxis_y);
X break;
X }
X case LINES: {
X***************
X*** 536,542
X * Plot the curves in IMPULSES style
X */
X void
X! plot_impulses(plot, xaxis_y)
X struct curve_points *plot;
X int xaxis_y;
X {
X
X--- 536,542 -----
X * Plot the curves in IMPULSES style
X */
X void
X! plot_impulses(plot, yaxis_x, xaxis_y)
X struct curve_points *plot;
X int yaxis_x, xaxis_y;
X {
X***************
X*** 538,544
X void
X plot_impulses(plot, xaxis_y)
X struct curve_points *plot;
X! int xaxis_y;
X {
X int i;
X int x,y;
X
X--- 538,544 -----
X void
X plot_impulses(plot, yaxis_x, xaxis_y)
X struct curve_points *plot;
X! int yaxis_x, xaxis_y;
X {
X int i;
X int x,y;
X***************
X*** 573,579
X }
X }
X
X! (*t->move)(x,xaxis_y);
X (*t->vector)(x,y);
X }
X
X
X--- 573,582 -----
X }
X }
X
X! if (polar)
X! (*t->move)(yaxis_x,xaxis_y);
X! else
X! (*t->move)(x,xaxis_y);
X (*t->vector)(x,y);
X }
X
Xdiff -cr ./internal.c ../gnuplot2.02/internal.c
X*** ./internal.c Tue Mar 27 09:01:26 1990
X--- ../gnuplot2.02/internal.c Thu Nov 29 10:08:43 1990
X***************
X*** 54,60
X int matherr(x) /* MSC 5.1 */
X struct exception *x;
X #endif /* TURBOC */
X! #else /* MSDOS */
X int matherr()
X #endif /* MSDOS */
X {
X
X--- 54,64 -----
X int matherr(x) /* MSC 5.1 */
X struct exception *x;
X #endif /* TURBOC */
X! #else /* not MSDOS */
X! #ifdef apollo
X! int matherr(x) /* apollo */
X! struct exception *x;
X! #else /* Most everyone else (not apollo). */
X int matherr()
X #endif /* apollo */
X #endif /* MSDOS */
X***************
X*** 56,61
X #endif /* TURBOC */
X #else /* MSDOS */
X int matherr()
X #endif /* MSDOS */
X {
X return (undefined = TRUE); /* don't print error message */
X
X--- 60,66 -----
X struct exception *x;
X #else /* Most everyone else (not apollo). */
X int matherr()
X+ #endif /* apollo */
X #endif /* MSDOS */
X {
X return (undefined = TRUE); /* don't print error message */
X***************
X*** 668,674
X if (b.v.int_val >= 0)
X (void) integer(&result,t);
X else
X! (void) complex(&result,1.0/t,0.0);
X break;
X case CMPLX:
X mag =
X
X--- 673,684 -----
X if (b.v.int_val >= 0)
X (void) integer(&result,t);
X else
X! if (t != 0)
X! (void) complex(&result,1.0/t,0.0);
X! else {
X! undefined = TRUE;
X! (void) complex(&result, 0.0, 0.0);
X! }
X break;
X case CMPLX:
X mag =
X***************
X*** 674,680
X mag =
X pow(magnitude(&a),fabs(b.v.cmplx_val.real));
X if (b.v.cmplx_val.real < 0.0)
X! mag = 1.0/mag;
X ang = angle(&a)*b.v.cmplx_val.real+
X b.v.cmplx_val.imag;
X (void) complex(&result,mag*cos(ang),
X
X--- 684,693 -----
X mag =
X pow(magnitude(&a),fabs(b.v.cmplx_val.real));
X if (b.v.cmplx_val.real < 0.0)
X! if (mag != 0.0)
X! mag = 1.0/mag;
X! else
X! undefined = TRUE;
X ang = angle(&a)*b.v.cmplx_val.real+
X b.v.cmplx_val.imag;
X (void) complex(&result,mag*cos(ang),
X***************
X*** 687,693
X if (a.v.cmplx_val.imag == 0.0) {
X mag = pow(a.v.cmplx_val.real,(double)abs(b.v.int_val));
X if (b.v.int_val < 0)
X! mag = 1.0/mag;
X (void) complex(&result,mag,0.0);
X }
X else {
X
X--- 700,709 -----
X if (a.v.cmplx_val.imag == 0.0) {
X mag = pow(a.v.cmplx_val.real,(double)abs(b.v.int_val));
X if (b.v.int_val < 0)
X! if (mag != 0.0)
X! mag = 1.0/mag;
X! else
X! undefined = TRUE;
X (void) complex(&result,mag,0.0);
X }
X else {
X***************
X*** 694,700
X /* not so good, but...! */
X mag = pow(magnitude(&a),(double)abs(b.v.int_val));
X if (b.v.int_val < 0)
X! mag = 1.0/mag;
X ang = angle(&a)*b.v.int_val;
X (void) complex(&result,mag*cos(ang),
X mag*sin(ang));
X
X--- 710,719 -----
X /* not so good, but...! */
X mag = pow(magnitude(&a),(double)abs(b.v.int_val));
X if (b.v.int_val < 0)
X! if (mag != 0.0)
X! mag = 1.0/mag;
X! else
X! undefined = TRUE;
X ang = angle(&a)*b.v.int_val;
X (void) complex(&result,mag*cos(ang),
X mag*sin(ang));
X***************
X*** 703,709
X case CMPLX:
X mag = pow(magnitude(&a),fabs(b.v.cmplx_val.real));
X if (b.v.cmplx_val.real < 0.0)
X! mag = 1.0/mag;
X ang = angle(&a)*b.v.cmplx_val.real+ b.v.cmplx_val.imag;
X (void) complex(&result,mag*cos(ang),
X mag*sin(ang));
X
X--- 722,731 -----
X case CMPLX:
X mag = pow(magnitude(&a),fabs(b.v.cmplx_val.real));
X if (b.v.cmplx_val.real < 0.0)
X! if (mag != 0.0)
X! mag = 1.0/mag;
X! else
X! undefined = TRUE;
X ang = angle(&a)*b.v.cmplx_val.real+ b.v.cmplx_val.imag;
X (void) complex(&result,mag*cos(ang),
X mag*sin(ang));
Xdiff -cr ./lasergnu ../gnuplot2.02/lasergnu
X*** ./lasergnu Tue Mar 27 08:59:14 1990
X--- ../gnuplot2.02/lasergnu Fri Nov 30 08:34:58 1990
X***************
X*** 4,9
X
X set print_banner = on # Print a banner page unless told otherwise.
X set input_files = () # the plot input command files
X
X # Default printer set by shell variable LASER.
X if !($?LASER) then
X
X--- 4,10 -----
X
X set print_banner = on # Print a banner page unless told otherwise.
X set input_files = () # the plot input command files
X+ set lpr_opts = () # options to lpr
X
X # Default printer set by shell variable PRINTER.
X if (! $?PRINTER) then
X***************
X*** 5,13
X set print_banner = on # Print a banner page unless told otherwise.
X set input_files = () # the plot input command files
X
X! # Default printer set by shell variable LASER.
X! if !($?LASER) then
X! set LASER = "imagen018"
X endif
X set printer = (-P$LASER)
X
X
X--- 6,18 -----
X set input_files = () # the plot input command files
X set lpr_opts = () # options to lpr
X
X! # Default printer set by shell variable PRINTER.
X! if (! $?PRINTER) then
X! if ($?LASER) then
X! set PRINTER=$LASER
X! else
X! set PRINTER="lw0"
X! endif
X endif
X set printer = (-P$PRINTER)
X
X***************
X*** 9,15
X if !($?LASER) then
X set LASER = "imagen018"
X endif
X! set printer = (-P$LASER)
X
X # File for plot commands, and for plot output
X set TMP=/tmp/plot$$
X
X--- 14,20 -----
X set PRINTER="lw0"
X endif
X endif
X! set printer = (-P$PRINTER)
X
X # File for plot commands, and for plot output
X set TMP=/tmp/plot$$
X***************
X*** 32,37
X case -b*: # Do not print a banner page.
X case -J*: # Compatible with imprint.
X set print_banner = off
X shift argv
X goto top
X
X
X--- 37,43 -----
X case -b*: # Do not print a banner page.
X case -J*: # Compatible with imprint.
X set print_banner = off
X+ set lpr_opts=($lpr_opts -h)
X shift argv
X goto top
X
X***************
X*** 144,150
X -D"pagereversal on" \
X -D"program lasergnu" $outfile
X else if ($LANG == -Lpostscript) then
X! lpr $printer $outfile
X endif
X else
X echo "lasergnu: error in plotting or empty plot; nothing printed."
X
X--- 150,156 -----
X -D"pagereversal on" \
X -D"program lasergnu" $outfile
X else if ($LANG == -Lpostscript) then
X! lpr $lpr_opts $printer $outfile
X endif
X else
X echo "lasergnu: error in plotting or empty plot; nothing printed."
Xdiff -cr ./linkopt.msc ../gnuplot2.02/linkopt.msc
X*** ./linkopt.msc Tue Mar 27 09:03:42 1990
X--- ../gnuplot2.02/linkopt.msc Mon Dec 3 15:41:19 1990
X***************
X*** 1,4
X! pcgraph+hrcgraph+corgraph+term+graphics+
X plot+setshow+command+help+internal+misc+
X parse+eval+scanner+standard+util+version
X gnuplot
X
X--- 1,4 -----
X! pcgraph+hrcgraph+corgraph+bitmap+term+graphics+
X plot+setshow+command+help+internal+misc+
X parse+eval+scanner+standard+util+version
X gnuplot
Xdiff -cr ./linkopt.tc ../gnuplot2.02/linkopt.tc
X*** ./linkopt.tc Tue Sep 18 14:56:43 1990
X--- ../gnuplot2.02/linkopt.tc Mon Dec 3 15:41:28 1990
X***************
X*** 1,5
X \tc\lib\C0l +
X! command eval graphics help internal misc parse +
X plot scanner setshow standard term util version +
X cga egavga herc att +
X ,gnuplot,gnuplot, +
X
X--- 1,5 -----
X \tc\lib\C0l +
X! bitmap command eval graphics help internal misc parse +
X plot scanner setshow standard term util version +
X cgaf egavgaf hercf attf +
X ,gnuplot,gnuplot, +
X***************
X*** 1,7
X \tc\lib\C0l +
X command eval graphics help internal misc parse +
X plot scanner setshow standard term util version +
X! cga egavga herc att +
X ,gnuplot,gnuplot, +
X \tc\lib\emu +
X \tc\lib\mathl +
X
X--- 1,7 -----
X \tc\lib\C0l +
X bitmap command eval graphics help internal misc parse +
X plot scanner setshow standard term util version +
X! cgaf egavgaf hercf attf +
X ,gnuplot,gnuplot, +
X \tc\lib\emu +
X \tc\lib\mathl +
Xdiff -cr ./makefile.3b1 ../gnuplot2.02/makefile.3b1
X*** ./makefile.3b1 Tue Sep 18 14:56:44 1990
X--- ../gnuplot2.02/makefile.3b1 Tue Dec 11 16:41:39 1990
X***************
X*** 11,16
X # where to install help file gnuplot.gih
X #HELPDEST=/usr/local/lib/gnuplot.gih
X HELPDEST=docs/gnuplot.gih
X
X # -DVFORK if you have vfork()
X # -DBCOPY if your memcpy() is called bcopy() (a Berkeleyism, right?)
X
X--- 11,18 -----
X # where to install help file gnuplot.gih
X #HELPDEST=/usr/local/lib/gnuplot.gih
X HELPDEST=docs/gnuplot.gih
X+ # Where to send email about bugs and comments (locally)
X+ EMAIL=\"pixar\!bug-gnuplot@sun.com\"
X
X # -DVFORK if you have vfork()
X # -DBCOPY if your memcpy() is called bcopy() (a Berkeleyism, right?)
X***************
X*** 14,20
X
X # -DVFORK if you have vfork()
X # -DBCOPY if your memcpy() is called bcopy() (a Berkeleyism, right?)
X! # -DBZERO if you need to use bzero() (another BSD feature) instead of memset()
X # -DNOCOPY if you don't have a memcpy() by any name
X # -DGAMMA if you've got gamma(3)
X # -O if you trust your compiler's optimizer
X
X--- 16,22 -----
X
X # -DVFORK if you have vfork()
X # -DBCOPY if your memcpy() is called bcopy() (a Berkeleyism, right?)
X! # -DBZERO if you need to use bzero() (another BSD feature) instead of memset()
X # -DNOCOPY if you don't have a memcpy() by any name
X # -DGAMMA=gamma if you've got gamma(3)
X # -DNOCWDRC to inhibit check of ".gnuplot" in current directory
X***************
X*** 16,22
X # -DBCOPY if your memcpy() is called bcopy() (a Berkeleyism, right?)
X # -DBZERO if you need to use bzero() (another BSD feature) instead of memset()
X # -DNOCOPY if you don't have a memcpy() by any name
X! # -DGAMMA if you've got gamma(3)
X # -O if you trust your compiler's optimizer
X CC = cc
X CFLAGS = -DGAMMA -O #-g
X
X--- 18,31 -----
X # -DBCOPY if your memcpy() is called bcopy() (a Berkeleyism, right?)
X # -DBZERO if you need to use bzero() (another BSD feature) instead of memset()
X # -DNOCOPY if you don't have a memcpy() by any name
X! # -DGAMMA=gamma if you've got gamma(3)
X! # -DNOCWDRC to inhibit check of ".gnuplot" in current directory
X! # (for security reasons)
X! # -DGETCWD if your unix uses getcwd() instead of getcd()
X! # this is needed by HP-UX and Cray Unicos systems.
X! # -Dunix is required to explicitly define "unix" for SCO
X! # -fswitch if you are compiling on a Sun3 (or even -f68881)
X! # (but -fswitch is buggy on some systems, so watch out)
X # -O if you trust your compiler's optimizer
X CC = cc
X CFLAGS = -DGAMMA=gamma -O #-g
X***************
X*** 19,25
X # -DGAMMA if you've got gamma(3)
X # -O if you trust your compiler's optimizer
X CC = cc
X! CFLAGS = -DGAMMA -O #-g
X
X # -lplot iff you have -DUNIXPLOT
X # -lsuntool -lsunwindow -lpixrect iff you have -DSUN
X
X--- 28,34 -----
X # (but -fswitch is buggy on some systems, so watch out)
X # -O if you trust your compiler's optimizer
X CC = cc
X! CFLAGS = -DGAMMA=gamma -O #-g
X
X # -lplot if you have -DUNIXPLOT
X # -lsuntool -lsunwindow -lpixrect if you have -DSUN
X***************
X*** 21,28
X CC = cc
X CFLAGS = -DGAMMA -O #-g
X
X! # -lplot iff you have -DUNIXPLOT
X! # -lsuntool -lsunwindow -lpixrect iff you have -DSUN
X # -lgl_s if IRIS4D
X LIBS = -lm -lplot
X
X
X--- 30,37 -----
X CC = cc
X CFLAGS = -DGAMMA=gamma -O #-g
X
X! # -lplot if you have -DUNIXPLOT
X! # -lsuntool -lsunwindow -lpixrect if you have -DSUN
X # -lgl_s if IRIS4D
X # -lccgi if -DCGI
X LIBS = -lm -lplot
X***************
X*** 24,29
X # -lplot iff you have -DUNIXPLOT
X # -lsuntool -lsunwindow -lpixrect iff you have -DSUN
X # -lgl_s if IRIS4D
X LIBS = -lm -lplot
X
X # -D<terminal> in TERMFLAGS iff you wish to support <terminal>
X
X--- 33,39 -----
X # -lplot if you have -DUNIXPLOT
X # -lsuntool -lsunwindow -lpixrect if you have -DSUN
X # -lgl_s if IRIS4D
X+ # -lccgi if -DCGI
X LIBS = -lm -lplot
X
X # -D<terminal> in TERMFLAGS iff you wish to support <terminal>
X***************
X*** 27,34
X LIBS = -lm -lplot
X
X # -D<terminal> in TERMFLAGS iff you wish to support <terminal>
X! # other terminal flags defined in term.h
X! # -DUNIXPC unixpc (ATT 3b1 or ATT 7300)
X # -DUNIXPLOT unixplot
X
X TERMFLAGS = -Iterm -DUNIXPLOT -DUNIXPC
X
X--- 37,47 -----
X LIBS = -lm -lplot
X
X # -D<terminal> in TERMFLAGS iff you wish to support <terminal>
X! # see other terminal defines in term.h
X! # -DCGI SCO CGI
X! # -DFIG Fig graphics language (requires object.h from TransFig)
X! # -DIRIS4D IRIS4D series computer
X! # -DSUN Sun Microsystems Workstation
X # -DUNIXPLOT unixplot
X
X TERMFLAGS = -Iterm -DUNIXPLOT
X***************
X*** 31,37
X # -DUNIXPC unixpc (ATT 3b1 or ATT 7300)
X # -DUNIXPLOT unixplot
X
X! TERMFLAGS = -Iterm -DUNIXPLOT -DUNIXPC
X
X OBJS = command.o eval.o graphics.o help.o internal.o misc.o parse.o\
X plot.o scanner.o setshow.o standard.o term.o util.o
X
X--- 44,50 -----
X # -DSUN Sun Microsystems Workstation
X # -DUNIXPLOT unixplot
X
X! TERMFLAGS = -Iterm -DUNIXPLOT
X
X OBJS = bitmap.o command.o eval.o graphics.o help.o internal.o misc.o parse.o\
X plot.o scanner.o setshow.o standard.o term.o util.o
X***************
X*** 33,40
X
X TERMFLAGS = -Iterm -DUNIXPLOT -DUNIXPC
X
X! OBJS = command.o eval.o graphics.o help.o internal.o misc.o parse.o\
X! plot.o scanner.o setshow.o standard.o term.o util.o
X
X DIRS = term demo bugtest docs docs/latextut translate
X CSOURCE1 = command.c setshow.c
X
X--- 46,53 -----
X
X TERMFLAGS = -Iterm -DUNIXPLOT
X
X! OBJS = bitmap.o command.o eval.o graphics.o help.o internal.o misc.o parse.o\
X! plot.o scanner.o setshow.o standard.o term.o util.o
X
X DIRS = term demo bugtest docs docs/latextut translate
X CSOURCE1 = command.c setshow.c
X***************
X*** 37,53
X plot.o scanner.o setshow.o standard.o term.o util.o
X
X DIRS = term demo bugtest docs docs/latextut translate
X! CSOURCE1 = command.c setshow.c
X! CSOURCE2 = help.c graphics.c internal.c
X! CSOURCE3 = misc.c eval.c parse.c plot.c scanner.c standard.c
X! CSOURCE4 = term.c util.c version.c
X! CSOURCE5 = term/aed.trm term/dxy.trm term/eps60.trm term/epson.trm \
X! term/font5x7.trm term/hp26.trm term/hp2648.trm term/hpgl.trm \
X! term/hpljet.trm term/iris4d.trm term/latex.trm term/sun.trm
X! CSOURCE6 = term/post.trm term/pc.trm term/qms.trm term/regis.trm \
X! term/tek.trm term/unixpc.trm term/unixplot.trm term/v384.trm
X! CSOURCE7 = term/imPcodes.h term/imagen.trm term/object.h term/fig.trm \
X! term/latex.trm term/eepic.trm term/x11.trm gnuplot_x11.c
X # not C code, but still needed
X ETC = README README.gnutex makefile.unx makefile.vms linkopt.vms \
X README.x11 makefile.x11 \
X
X--- 50,67 -----
X plot.o scanner.o setshow.o standard.o term.o util.o
X
X DIRS = term demo bugtest docs docs/latextut translate
X! CSOURCE1 = command.c setshow.c
X! CSOURCE2 = help.c graphics.c internal.c
X! CSOURCE3 = misc.c eval.c parse.c plot.c scanner.c standard.c
X! CSOURCE4 = bitmap.c term.c util.c version.c
X! CSOURCE5 = term/aed.trm term/cgi.trm term/dxy.trm term/eepic.trm \
X! term/epson.trm term/fig.trm term/hp26.trm term/hp2648.trm \
X! term/hpgl.trm term/hpljii.trm
X! CSOURCE6 = term/imPcodes.h term/imagen.trm term/object.h \
X! term/iris4d.trm term/kyo.trm term/latex.trm term/pc.trm
X! CSOURCE7 = term/post.trm term/qms.trm term/regis.trm term/sun.trm \
X! term/t410x.trm term/tek.trm term/unixpc.trm term/unixplot.trm \
X! term/v384.trm term/x11.trm gnuplot_x11.c
X # not C code, but still needed
X ETC = Copyright README README.gnutex makefile.unx makefile.vms \
X README.x11 makefile.x11 \
X***************
X*** 49,55
X CSOURCE7 = term/imPcodes.h term/imagen.trm term/object.h term/fig.trm \
X term/latex.trm term/eepic.trm term/x11.trm gnuplot_x11.c
X # not C code, but still needed
X! ETC = README README.gnutex makefile.unx makefile.vms linkopt.vms \
X README.x11 makefile.x11 \
X makefile.3b1 plot.h help.h setshow.h term.h lasergnu \
X demo/1.dat demo/2.dat demo/3.dat demo/controls.demo \
X
X--- 63,69 -----
X term/t410x.trm term/tek.trm term/unixpc.trm term/unixplot.trm \
X term/v384.trm term/x11.trm gnuplot_x11.c
X # not C code, but still needed
X! ETC = Copyright README README.gnutex makefile.unx makefile.vms \
X README.x11 makefile.x11 \
X makefile.3b1 plot.h help.h setshow.h bitmap.h term.h lasergnu \
X demo/1.dat demo/2.dat demo/3.dat demo/controls.demo \
X***************
X*** 51,58
X # not C code, but still needed
X ETC = README README.gnutex makefile.unx makefile.vms linkopt.vms \
X README.x11 makefile.x11 \
X! makefile.3b1 plot.h help.h setshow.h term.h lasergnu \
X! demo/1.dat demo/2.dat demo/3.dat demo/controls.demo \
X demo/simple.demo demo/polar.demo demo/electron.demo \
X bugtest/README bugtest/printf.c bugtest/scanf.c \
X bugtest/mscbug.c term/README
X
X--- 65,72 -----
X # not C code, but still needed
X ETC = Copyright README README.gnutex makefile.unx makefile.vms \
X README.x11 makefile.x11 \
X! makefile.3b1 plot.h help.h setshow.h bitmap.h term.h lasergnu \
X! demo/1.dat demo/2.dat demo/3.dat demo/controls.demo \
X demo/simple.demo demo/polar.demo demo/electron.demo \
X demo/param.demo demo/using.demo demo/using.dat \
X bugtest/README bugtest/printf.c bugtest/scanf.c \
X***************
X*** 54,59
X makefile.3b1 plot.h help.h setshow.h term.h lasergnu \
X demo/1.dat demo/2.dat demo/3.dat demo/controls.demo \
X demo/simple.demo demo/polar.demo demo/electron.demo \
X bugtest/README bugtest/printf.c bugtest/scanf.c \
X bugtest/mscbug.c term/README
X # PC-specific files
X
X--- 68,74 -----
X makefile.3b1 plot.h help.h setshow.h bitmap.h term.h lasergnu \
X demo/1.dat demo/2.dat demo/3.dat demo/controls.demo \
X demo/simple.demo demo/polar.demo demo/electron.demo \
X+ demo/param.demo demo/using.demo demo/using.dat \
X bugtest/README bugtest/printf.c bugtest/scanf.c \
X bugtest/mscbug.c term/README \
X linkopt.vms buildvms.com
X***************
X*** 55,61
X demo/1.dat demo/2.dat demo/3.dat demo/controls.demo \
X demo/simple.demo demo/polar.demo demo/electron.demo \
X bugtest/README bugtest/printf.c bugtest/scanf.c \
X! bugtest/mscbug.c term/README
X # PC-specific files
X PC = corgraph.asm corplot.c header.mac hrcgraph.asm lineproc.mac \
X linkopt.msc linkopt.tc makefile.msc makefile.tc pcgraph.asm
X
X--- 70,77 -----
X demo/simple.demo demo/polar.demo demo/electron.demo \
X demo/param.demo demo/using.demo demo/using.dat \
X bugtest/README bugtest/printf.c bugtest/scanf.c \
X! bugtest/mscbug.c term/README \
X! linkopt.vms buildvms.com
X # PC-specific files
X PC = corgraph.asm corplot.c header.mac hrcgraph.asm lineproc.mac \
X linkopt.msc linkopt.tc makefile.msc makefile.tc pcgraph.asm
X***************
X*** 58,64
X bugtest/mscbug.c term/README
X # PC-specific files
X PC = corgraph.asm corplot.c header.mac hrcgraph.asm lineproc.mac \
X! linkopt.msc linkopt.tc makefile.msc makefile.tc pcgraph.asm
X # Documentation and help files
X DOCS1 = docs/Makefile docs/README docs/checkdoc.c docs/doc2gih.c \
X docs/doc2hlp.c docs/doc2hlp.com docs/doc2ms.c docs/doc2tex.c \
X
X--- 74,80 -----
X linkopt.vms buildvms.com
X # PC-specific files
X PC = corgraph.asm corplot.c header.mac hrcgraph.asm lineproc.mac \
X! linkopt.msc linkopt.tc makefile.msc makefile.tc pcgraph.asm
X # Documentation and help files
X DOCS1 = docs/Makefile docs/README docs/checkdoc.c docs/doc2gih.c \
X docs/doc2hlp.c docs/doc2hlp.com docs/doc2ms.c docs/doc2tex.c \
X***************
X*** 72,78
X # gnutex->gnuplot translator
X TSOURCE1 = translate/Makefile translate/README translate/command.c \
X translate/eval.c translate/gnut2p.1 translate/internal.c \
X! translate/misc.c translate/parse.c translate/plot.c \
X translate/plot.h translate/scanner.c translate/standard.c \
X translate/test1 translate/test2 translate/util.c
X
X
X--- 88,95 -----
X # gnutex->gnuplot translator
X TSOURCE1 = translate/Makefile translate/README translate/command.c \
X translate/eval.c translate/gnut2p.1 translate/internal.c \
X! translate/misc.c translate/parse.c translate/plot.c
X! TSOURCE2 = \
X translate/plot.h translate/scanner.c translate/standard.c \
X translate/test1 translate/test2 translate/util.c
X
X***************
X*** 76,82
X translate/plot.h translate/scanner.c translate/standard.c \
X translate/test1 translate/test2 translate/util.c
X
X! all: gnuplot doc
X
X gnuplot: $(OBJS) version.o
X ld /lib/crt0s.o /lib/shlib.ifile $(OBJS) version.o $(LIBS) -o gnuplot
X
X--- 93,99 -----
X translate/plot.h translate/scanner.c translate/standard.c \
X translate/test1 translate/test2 translate/util.c
X
X! all: gnuplot doc
X
X gnuplot: $(OBJS) version.o
X ld /lib/crt0s.o /lib/shlib.ifile $(OBJS) version.o $(LIBS) -o gnuplot
X***************
X*** 95,101
X man_install: docs/gnuplot.1 docs/lasergnu.1
X cp docs/gnuplot.1 docs/lasergnu.1 $(MANDEST)
X
X! term.o: $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
X $(CC) $(CFLAGS) $(TERMFLAGS) -c term.c
X
X $(OBJS): plot.h
X
X--- 112,118 -----
X man_install: docs/gnuplot.1 docs/lasergnu.1
X cp docs/gnuplot.1 docs/lasergnu.1 $(MANDEST)
X
X! term.o: term.h term.c $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
X $(CC) $(CFLAGS) $(TERMFLAGS) -c term.c
X
X version.o:
X***************
X*** 98,103
X term.o: $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
X $(CC) $(CFLAGS) $(TERMFLAGS) -c term.c
X
X $(OBJS): plot.h
X
X command.o:
X
X--- 115,123 -----
X term.o: term.h term.c $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
X $(CC) $(CFLAGS) $(TERMFLAGS) -c term.c
X
X+ version.o:
X+ $(CC) $(CFLAGS) -DCONTACT=$(EMAIL) -c version.c
X+
X $(OBJS): plot.h
X
X command.o:
X***************
X*** 101,107
X $(OBJS): plot.h
X
X command.o:
X! cc $(CFLAGS) -c command.c -DHELPFILE=\"$(HELPDEST)\"
X
X command.o help.o misc.o: help.h
X
X
X--- 121,127 -----
X $(OBJS): plot.h
X
X command.o:
X! $(CC) $(CFLAGS) -c command.c -DHELPFILE=\"$(HELPDEST)\"
X
X command.o help.o misc.o: help.h
X
X***************
X*** 105,111
X
X command.o help.o misc.o: help.h
X
X! command.o graphics.o misc.o plot.o setshow.o: setshow.h
X
X SOURCES=plot.h help.h setshow.h $(CSOURCE1) $(CSOURCE2) $(CSOURCE3) \
X $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
X
X--- 125,131 -----
X
X command.o help.o misc.o: help.h
X
X! command.o graphics.o misc.o plot.o setshow.o term.o: setshow.h
X
X bitmap.o term.o: bitmap.h
X
X***************
X*** 107,114
X
X command.o graphics.o misc.o plot.o setshow.o: setshow.h
X
X! SOURCES=plot.h help.h setshow.h $(CSOURCE1) $(CSOURCE2) $(CSOURCE3) \
X! $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
X
X lint:
X lint -hx $(CSOURCE1) $(CSOURCE2) $(CSOURCE3) $(CSOURCE4)
X
X--- 127,133 -----
X
X command.o graphics.o misc.o plot.o setshow.o term.o: setshow.h
X
X! bitmap.o term.o: bitmap.h
X
X SOURCES=plot.h help.h setshow.h bitmap.h term.h $(CSOURCE1) $(CSOURCE2) \
X $(CSOURCE3) $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
X***************
X*** 110,115
X SOURCES=plot.h help.h setshow.h $(CSOURCE1) $(CSOURCE2) $(CSOURCE3) \
X $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
X
X lint:
X lint -hx $(CSOURCE1) $(CSOURCE2) $(CSOURCE3) $(CSOURCE4)
X
X
X--- 129,137 -----
X
X bitmap.o term.o: bitmap.h
X
X+ SOURCES=plot.h help.h setshow.h bitmap.h term.h $(CSOURCE1) $(CSOURCE2) \
X+ $(CSOURCE3) $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
X+
X lint:
X lint -hx $(SOURCES)
X
X***************
X*** 111,117
X $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
X
X lint:
X! lint -hx $(CSOURCE1) $(CSOURCE2) $(CSOURCE3) $(CSOURCE4)
X
X clean:
X rm -f *.o *~ term/*~
X
X--- 133,139 -----
X $(CSOURCE3) $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
X
X lint:
X! lint -hx $(SOURCES)
X
X clean:
X rm -f *.o *~ term/*~
Xdiff -cr ./makefile.msc ../gnuplot2.02/makefile.msc
X*** ./makefile.msc Tue Sep 18 14:56:45 1990
X--- ../gnuplot2.02/makefile.msc Thu Dec 6 16:07:54 1990
X***************
X*** 18,24
X # /ST:8000 means stack size 8000 bytes
X LINKFLAGS = /NOE /EX /ST:8000 #/codeview
X
X! OBJS = command.obj eval.obj graphics.obj help.obj internal.obj \
X misc.obj parse.obj plot.obj scanner.obj setshow.obj standard.obj \
X term.obj util.obj version.obj pcgraph.obj hrcgraph.obj corgraph.obj
X
X
X--- 18,24 -----
X # /ST:8000 means stack size 8000 bytes
X LINKFLAGS = /NOE /EX /ST:8000 #/codeview
X
X! OBJS = bitmap.obj command.obj eval.obj graphics.obj help.obj internal.obj \
X misc.obj parse.obj plot.obj scanner.obj setshow.obj standard.obj \
X term.obj util.obj version.obj pcgraph.obj hrcgraph.obj corgraph.obj
X
X***************
X*** 22,33
X misc.obj parse.obj plot.obj scanner.obj setshow.obj standard.obj \
X term.obj util.obj version.obj pcgraph.obj hrcgraph.obj corgraph.obj
X
X! CSOURCE5 = term\aed.trm term\dxy.trm term\eps60.trm term\epson.trm \
X! term\font5x7.trm term\hp26.trm term\hp2648.trm term\hpgl.trm \
X! term\hpljet.trm term\iris4d.trm term\latex.trm term\sun.trm
X! CSOURCE6 = term\post.trm term\pc.trm term\qms.trm term\regis.trm \
X! term\tek.trm term\unixpc.trm term\unixplot.trm term\v384.trm \
X! term\imPcodes.h term\imagen.trm term\object.h term\fig.trm
X
X
X # default rules
X
X--- 22,35 -----
X misc.obj parse.obj plot.obj scanner.obj setshow.obj standard.obj \
X term.obj util.obj version.obj pcgraph.obj hrcgraph.obj corgraph.obj
X
X! CSOURCE5 = term\aed.trm term\cgi.trm term\dxy.trm term\eepic.trm \
X! term\epson.trm term\fig.trm term\hp26.trm term\hp2648.trm \
X! term\hpgl.trm term\hpljii.trm
X! CSOURCE6 = term\imPcodes.h term\imagen.trm term\object.h \
X! term\iris4d.trm term\kyo.trm term\latex.trm term\pc.trm
X! CSOURCE7 = term\post.trm term\qms.trm term\regis.trm term\sun.trm \
X! term\t410x.trm term\tek.trm term\unixpc.trm term\unixplot.trm \
X! term\v384.trm term\x11.trm
X
X # default rules
X .c.obj:
X***************
X*** 29,35
X term\tek.trm term\unixpc.trm term\unixplot.trm term\v384.trm \
X term\imPcodes.h term\imagen.trm term\object.h term\fig.trm
X
X-
X # default rules
X .c.obj:
X cl $(CFLAGS) $*.c
X
X--- 31,36 -----
X term\t410x.trm term\tek.trm term\unixpc.trm term\unixplot.trm \
X term\v384.trm term\x11.trm
X
X # default rules
X .c.obj:
X cl $(CFLAGS) $*.c
X***************
X*** 43,48
X
X hrcgraph.obj: hrcgraph.asm header.mac lineproc.mac
X
X command.obj: command.c plot.h setshow.h help.h
X cl $(CFLAGS) /DHELPFILE=\"$(HELPFILE)\" command.c
X
X
X--- 44,51 -----
X
X hrcgraph.obj: hrcgraph.asm header.mac lineproc.mac
X
X+ bitmap.obj: bitmap.c bitmap.h plot.h
X+
X command.obj: command.c plot.h setshow.h help.h
X cl $(CFLAGS) /DHELPFILE=\"$(HELPFILE)\" command.c
X
X***************
X*** 66,72
X
X standard.obj: standard.c plot.h
X
X! term.obj: term.c term.h plot.h $(CSOURCE5) $(CSOURCE6)
X cl $(CFLAGS) $(TERMFLAGS) /Iterm term.c
X
X util.obj: util.c plot.h
X
X--- 69,75 -----
X
X standard.obj: standard.c plot.h
X
X! term.obj: term.c term.h plot.h setshow.h bitmap.h $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
X cl $(CFLAGS) $(TERMFLAGS) /Iterm term.c
X
X util.obj: util.c plot.h
Xdiff -cr ./makefile.tc ../gnuplot2.02/makefile.tc
X*** ./makefile.tc Tue Sep 18 14:56:47 1990
X--- ../gnuplot2.02/makefile.tc Thu Dec 6 16:59:50 1990
X***************
X*** 1,4
X! # make file for Turbo C
X # Modified from MSC make by John Campbell and Bill Wilson
X # The compile and link includes debug flags. Take them out if you
X # do not want them included (-y -v -M, /m /s /v /l)
X
X--- 1,4 -----
X! # make file for Turbo C++ 1.0
X # Modified from MSC make by John Campbell and Bill Wilson
X # The compile and link includes debug flags. Take them out if you
X # do not want them included (-y -v -M, /m /s /v /l)
X***************
X*** 8,13
X # location of Turbo C compiler
X # if this is changed then linkopt.tc will need to be edited.
X TC = \tc
X # location of BGI files and BGIOBJ.EXE,
X # change this line if not in TC directory, i.e. $(TC)\bgi
X BGI = $(TC)\bgi
X
X--- 8,16 -----
X # location of Turbo C compiler
X # if this is changed then linkopt.tc will need to be edited.
X TC = \tc
X+ # location of TCC.EXE and TLINK.EXE
X+ BIN = $(TC)\bin
X+ #BIN = $(TC)
X # location of BGI files and BGIOBJ.EXE,
X # change this line if not in TC directory, i.e. $(TC)\bgi
X BGI = $(TC)\bgi
X***************
X*** 11,16
X # location of BGI files and BGIOBJ.EXE,
X # change this line if not in TC directory, i.e. $(TC)\bgi
X BGI = $(TC)\bgi
X # -c means don't link, -f means emulate 8087 if not present
X # -ml means use large model (large code, large data)
X # -M means produce link map
X
X--- 14,20 -----
X # location of BGI files and BGIOBJ.EXE,
X # change this line if not in TC directory, i.e. $(TC)\bgi
X BGI = $(TC)\bgi
X+ #BGI = $(TC)
X # -c means don't link, -f means emulate 8087 if not present
X # -ml means use large model (large code, large data)
X # -M means produce link map
X***************
X*** 20,26
X CFLAGS = -c -f -ml -M -y -v -w- -I$(TC)\include -DMSDOS -DPC
X TERMFLAGS =
X
X! OBJS = command.obj eval.obj graphics.obj help.obj internal.obj \
X misc.obj parse.obj plot.obj scanner.obj setshow.obj standard.obj \
X term.obj util.obj version.obj cga.obj egavga.obj herc.obj att.obj
X
X
X--- 24,30 -----
X CFLAGS = -c -f -ml -M -y -v -w- -I$(TC)\include -DMSDOS -DPC
X TERMFLAGS =
X
X! OBJS = bitmap.obj command.obj eval.obj graphics.obj help.obj internal.obj \
X misc.obj parse.obj plot.obj scanner.obj setshow.obj standard.obj \
X term.obj util.obj version.obj cgaf.obj egavgaf.obj hercf.obj attf.obj
X
X***************
X*** 22,28
X
X OBJS = command.obj eval.obj graphics.obj help.obj internal.obj \
X misc.obj parse.obj plot.obj scanner.obj setshow.obj standard.obj \
X! term.obj util.obj version.obj cga.obj egavga.obj herc.obj att.obj
X
X CSOURCE5 = term\aed.trm term\dxy.trm term\eps60.trm term\epson.trm \
X term\font5x7.trm term\hp26.trm term\hp2648.trm term\hpgl.trm \
X
X--- 26,32 -----
X
X OBJS = bitmap.obj command.obj eval.obj graphics.obj help.obj internal.obj \
X misc.obj parse.obj plot.obj scanner.obj setshow.obj standard.obj \
X! term.obj util.obj version.obj cgaf.obj egavgaf.obj hercf.obj attf.obj
X
X CSOURCE5 = term\aed.trm term\cgi.trm term\dxy.trm term\eepic.trm \
X term\epson.trm term\fig.trm term\hp26.trm term\hp2648.trm \
X***************
X*** 24,35
X misc.obj parse.obj plot.obj scanner.obj setshow.obj standard.obj \
X term.obj util.obj version.obj cga.obj egavga.obj herc.obj att.obj
X
X! CSOURCE5 = term\aed.trm term\dxy.trm term\eps60.trm term\epson.trm \
X! term\font5x7.trm term\hp26.trm term\hp2648.trm term\hpgl.trm \
X! term\hpljet.trm term\iris4d.trm term\latex.trm
X! CSOURCE6 = term\post.trm term\pc.trm term\qms.trm term\regis.trm \
X! term\tek.trm term\unixpc.trm term\unixplot.trm term\v384.trm \
X! term\imPcodes.h term\imagen.trm term\object.h term\fig.trm
X
X
X all: gnuplot.exe $(HELPFILE)
X
X--- 28,41 -----
X misc.obj parse.obj plot.obj scanner.obj setshow.obj standard.obj \
X term.obj util.obj version.obj cgaf.obj egavgaf.obj hercf.obj attf.obj
X
X! CSOURCE5 = term\aed.trm term\cgi.trm term\dxy.trm term\eepic.trm \
X! term\epson.trm term\fig.trm term\hp26.trm term\hp2648.trm \
X! term\hpgl.trm term\hpljii.trm
X! CSOURCE6 = term\imPcodes.h term\imagen.trm term\object.h \
X! term\iris4d.trm term\kyo.trm term\latex.trm term\pc.trm
X! CSOURCE7 = term\post.trm term\qms.trm term\regis.trm term\sun.trm \
X! term\t410x.trm term\tek.trm term\unixpc.trm term\unixplot.trm \
X! term\v384.trm term\x11.trm
X
X all: gnuplot.exe $(HELPFILE)
X
X***************
X*** 31,37
X term\tek.trm term\unixpc.trm term\unixplot.trm term\v384.trm \
X term\imPcodes.h term\imagen.trm term\object.h term\fig.trm
X
X-
X all: gnuplot.exe $(HELPFILE)
X
X # use linkopt.tc to avoid command-line overflow
X
X--- 37,42 -----
X term\t410x.trm term\tek.trm term\unixpc.trm term\unixplot.trm \
X term\v384.trm term\x11.trm
X
X all: gnuplot.exe $(HELPFILE)
X
X # use linkopt.tc to avoid command-line overflow
X***************
X*** 37,43
X # use linkopt.tc to avoid command-line overflow
X
X gnuplot.exe: $(OBJS)
X! tlink /m /s /v /l @linkopt.tc
X
X # default rules
X
X
X--- 42,48 -----
X # use linkopt.tc to avoid command-line overflow
X
X gnuplot.exe: $(OBJS)
X! $(BIN)\tlink /m /s /v /l @linkopt.tc
X
X # default rules
X
X***************
X*** 42,48
X # default rules
X
X .c.obj:
X! tcc $(CFLAGS) $<
X
X command.obj: command.c plot.h setshow.h help.h
X tcc $(CFLAGS) -DHELPFILE="$(HELPFILE)" command.c
X
X--- 47,53 -----
X # default rules
X
X .c.obj:
X! $(BIN)\tcc $(CFLAGS) $<
X
X bitmap.obj: bitmap.c bitmap.h plot.h
X
X***************
X*** 44,49
X .c.obj:
X tcc $(CFLAGS) $<
X
X command.obj: command.c plot.h setshow.h help.h
X tcc $(CFLAGS) -DHELPFILE="$(HELPFILE)" command.c
X
X
X--- 49,56 -----
X .c.obj:
X $(BIN)\tcc $(CFLAGS) $<
X
X+ bitmap.obj: bitmap.c bitmap.h plot.h
X+
X command.obj: command.c plot.h setshow.h help.h
X $(BIN)\tcc $(CFLAGS) -DHELPFILE="$(HELPFILE)" command.c
X
X***************
X*** 45,51
X tcc $(CFLAGS) $<
X
X command.obj: command.c plot.h setshow.h help.h
X! tcc $(CFLAGS) -DHELPFILE="$(HELPFILE)" command.c
X
X eval.obj: eval.c plot.h
X
X
X--- 52,58 -----
X bitmap.obj: bitmap.c bitmap.h plot.h
X
X command.obj: command.c plot.h setshow.h help.h
X! $(BIN)\tcc $(CFLAGS) -DHELPFILE="$(HELPFILE)" command.c
X
X eval.obj: eval.c plot.h
X
X***************
X*** 67,74
X
X standard.obj: standard.c plot.h
X
X! term.obj: term.c term.h plot.h $(CSOURCE5) $(CSOURCE6)
X! tcc $(CFLAGS) $(TERMFLAGS) -Iterm term.c
X
X util.obj: util.c plot.h
X
X
X--- 74,81 -----
X
X standard.obj: standard.c plot.h
X
X! term.obj: term.c term.h plot.h setshow.c bitmap.h $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
X! $(BIN)\tcc $(CFLAGS) $(TERMFLAGS) -Iterm term.c
X
X util.obj: util.c plot.h
X
X***************
X*** 79,85
X doc2gih docs\gnuplot.doc $(HELPFILE)
X
X doc2gih.exe: docs\doc2gih.c
X! tcc -I$(TC)\include -L$(TC)\lib docs\doc2gih.c
X
X # convert Borland Graphics Interface files to object for linking
X cga.obj: $(BGI)\cga.bgi
X
X--- 86,92 -----
X doc2gih docs\gnuplot.doc $(HELPFILE)
X
X doc2gih.exe: docs\doc2gih.c
X! $(BIN)\tcc -I$(TC)\include -L$(TC)\lib docs\doc2gih.c
X
X # convert Borland Graphics Interface files to object for linking
X cgaf.obj: $(BGI)\cga.bgi
X***************
X*** 82,89
X tcc -I$(TC)\include -L$(TC)\lib docs\doc2gih.c
X
X # convert Borland Graphics Interface files to object for linking
X! cga.obj: $(BGI)\cga.bgi
X! $(BGI)\bgiobj $(BGI)\cga
X
X egavga.obj: $(BGI)\egavga.bgi
X $(BGI)\bgiobj $(BGI)\egavga
X
X--- 89,96 -----
X $(BIN)\tcc -I$(TC)\include -L$(TC)\lib docs\doc2gih.c
X
X # convert Borland Graphics Interface files to object for linking
X! cgaf.obj: $(BGI)\cga.bgi
X! $(BGI)\bgiobj /F $(BGI)\cga
X
X egavgaf.obj: $(BGI)\egavga.bgi
X $(BGI)\bgiobj /F $(BGI)\egavga
X***************
X*** 85,92
X cga.obj: $(BGI)\cga.bgi
X $(BGI)\bgiobj $(BGI)\cga
X
X! egavga.obj: $(BGI)\egavga.bgi
X! $(BGI)\bgiobj $(BGI)\egavga
X
X herc.obj: $(BGI)\herc.bgi
X $(BGI)\bgiobj $(BGI)\herc
X
X--- 92,99 -----
X cgaf.obj: $(BGI)\cga.bgi
X $(BGI)\bgiobj /F $(BGI)\cga
X
X! egavgaf.obj: $(BGI)\egavga.bgi
X! $(BGI)\bgiobj /F $(BGI)\egavga
X
X hercf.obj: $(BGI)\herc.bgi
X $(BGI)\bgiobj /F $(BGI)\herc
X***************
X*** 88,95
X egavga.obj: $(BGI)\egavga.bgi
X $(BGI)\bgiobj $(BGI)\egavga
X
X! herc.obj: $(BGI)\herc.bgi
X! $(BGI)\bgiobj $(BGI)\herc
X
X att.obj: $(BGI)\att.bgi
X $(BGI)\bgiobj $(BGI)\att
X
X--- 95,102 -----
X egavgaf.obj: $(BGI)\egavga.bgi
X $(BGI)\bgiobj /F $(BGI)\egavga
X
X! hercf.obj: $(BGI)\herc.bgi
X! $(BGI)\bgiobj /F $(BGI)\herc
X
X attf.obj: $(BGI)\att.bgi
X $(BGI)\bgiobj /F $(BGI)\att
X***************
X*** 91,95
X herc.obj: $(BGI)\herc.bgi
X $(BGI)\bgiobj $(BGI)\herc
X
X! att.obj: $(BGI)\att.bgi
X! $(BGI)\bgiobj $(BGI)\att
X
X--- 98,102 -----
X hercf.obj: $(BGI)\herc.bgi
X $(BGI)\bgiobj /F $(BGI)\herc
X
X! attf.obj: $(BGI)\att.bgi
X! $(BGI)\bgiobj /F $(BGI)\att
Xdiff -cr ./makefile.unx ../gnuplot2.02/makefile.unx
X*** ./makefile.unx Tue Sep 18 14:56:51 1990
X--- ../gnuplot2.02/makefile.unx Tue Dec 11 16:42:00 1990
X***************
X*** 16,22
X # -DBCOPY if your memcpy() is called bcopy() (a Berkeleyism, right?)
X # -DBZERO if you need to use bzero() (another BSD feature) instead of memset()
X # -DNOCOPY if you don't have a memcpy() by any name
X! # -DGAMMA if you've got gamma(3)
X # -fswitch if you are compiling on a Sun3 (or even -f68881)
X # (but -fswitch is buggy on some systems, so watch out)
X # -O if you trust your compiler's optimizer
X
X--- 16,27 -----
X # -DBCOPY if your memcpy() is called bcopy() (a Berkeleyism, right?)
X # -DBZERO if you need to use bzero() (another BSD feature) instead of memset()
X # -DNOCOPY if you don't have a memcpy() by any name
X! # -DGAMMA=gamma if you've got gamma(3)
X! # -DNOCWDRC to inhibit check of ".gnuplot" in current directory
X! # (for security reasons)
X! # -DGETCWD if your unix uses getcwd() instead of getcd()
X! # this is needed by HP-UX and Cray Unicos systems.
X! # -Dunix is required to explicitly define "unix" for SCO
X # -fswitch if you are compiling on a Sun3 (or even -f68881)
X # (but -fswitch is buggy on some systems, so watch out)
X # -O if you trust your compiler's optimizer
X***************
X*** 20,26
X # -fswitch if you are compiling on a Sun3 (or even -f68881)
X # (but -fswitch is buggy on some systems, so watch out)
X # -O if you trust your compiler's optimizer
X! CFLAGS = -DVFORK -DBCOPY -DBZERO -DGAMMA #-gx #-O
X
X # -lplot if you have -DUNIXPLOT
X # -lsuntool -lsunwindow -lpixrect if you have -DSUN
X
X--- 25,31 -----
X # -fswitch if you are compiling on a Sun3 (or even -f68881)
X # (but -fswitch is buggy on some systems, so watch out)
X # -O if you trust your compiler's optimizer
X! CFLAGS = -DVFORK -DBCOPY -DBZERO -DGAMMA=gamma #-gx #-O
X
X # -lplot if you have -DUNIXPLOT
X # -lsuntool -lsunwindow -lpixrect if you have -DSUN
X***************
X*** 25,30
X # -lplot if you have -DUNIXPLOT
X # -lsuntool -lsunwindow -lpixrect if you have -DSUN
X # -lgl_s if IRIS4D
X LIBS = -lm -lplot
X
X # -D<terminal> in TERMFLAGS iff you wish to support <terminal>
X
X--- 30,36 -----
X # -lplot if you have -DUNIXPLOT
X # -lsuntool -lsunwindow -lpixrect if you have -DSUN
X # -lgl_s if IRIS4D
X+ # -lccgi if -DCGI
X LIBS = -lm -lplot
X
X # -D<terminal> in TERMFLAGS iff you wish to support <terminal>
X***************
X*** 29,34
X
X # -D<terminal> in TERMFLAGS iff you wish to support <terminal>
X # see other terminal defines in term.h
X # -DFIG Fig graphics language (requires object.h from TransFig)
X # -DIRIS4D IRIS4D series computer
X # -DSUN Sun Microsystems Workstation
X
X--- 35,41 -----
X
X # -D<terminal> in TERMFLAGS iff you wish to support <terminal>
X # see other terminal defines in term.h
X+ # -DCGI SCO CGI
X # -DFIG Fig graphics language (requires object.h from TransFig)
X # -DIRIS4D IRIS4D series computer
X # -DSUN Sun Microsystems Workstation
X***************
X*** 36,42
X
X TERMFLAGS = -Iterm -DUNIXPLOT
X
X! OBJS = command.o eval.o graphics.o help.o internal.o misc.o parse.o\
X plot.o scanner.o setshow.o standard.o term.o util.o
X
X DIRS = term demo bugtest docs docs/latextut translate
X
X--- 43,49 -----
X
X TERMFLAGS = -Iterm -DUNIXPLOT
X
X! OBJS = bitmap.o command.o eval.o graphics.o help.o internal.o misc.o parse.o\
X plot.o scanner.o setshow.o standard.o term.o util.o
X
X DIRS = term demo bugtest docs docs/latextut translate
X***************
X*** 43,56
X CSOURCE1 = command.c setshow.c
X CSOURCE2 = help.c graphics.c internal.c
X CSOURCE3 = misc.c eval.c parse.c plot.c scanner.c standard.c
X! CSOURCE4 = term.c util.c version.c
X! CSOURCE5 = term/aed.trm term/dxy.trm term/eps60.trm term/epson.trm \
X! term/font5x7.trm term/hp26.trm term/hp2648.trm term/hpgl.trm \
X! term/hpljet.trm term/iris4d.trm term/latex.trm term/sun.trm
X! CSOURCE6 = term/post.trm term/pc.trm term/qms.trm term/regis.trm \
X! term/tek.trm term/unixpc.trm term/unixplot.trm term/v384.trm
X! CSOURCE7 = term/imPcodes.h term/imagen.trm term/object.h term/fig.trm \
X! term/latex.trm term/eepic.trm term/x11.trm gnuplot_x11.c
X # not C code, but still needed
X ETC = Copyright README README.gnutex makefile.unx makefile.vms \
X README.x11 makefile.x11 \
X
X--- 50,64 -----
X CSOURCE1 = command.c setshow.c
X CSOURCE2 = help.c graphics.c internal.c
X CSOURCE3 = misc.c eval.c parse.c plot.c scanner.c standard.c
X! CSOURCE4 = bitmap.c term.c util.c version.c
X! CSOURCE5 = term/aed.trm term/cgi.trm term/dxy.trm term/eepic.trm \
X! term/epson.trm term/fig.trm term/hp26.trm term/hp2648.trm \
X! term/hpgl.trm term/hpljii.trm
X! CSOURCE6 = term/imPcodes.h term/imagen.trm term/object.h \
X! term/iris4d.trm term/kyo.trm term/latex.trm term/pc.trm
X! CSOURCE7 = term/post.trm term/qms.trm term/regis.trm term/sun.trm \
X! term/t410x.trm term/tek.trm term/unixpc.trm term/unixplot.trm \
X! term/v384.trm term/x11.trm gnuplot_x11.c
X # not C code, but still needed
X ETC = Copyright README README.gnutex makefile.unx makefile.vms \
X README.x11 makefile.x11 \
X***************
X*** 54,60
X # not C code, but still needed
X ETC = Copyright README README.gnutex makefile.unx makefile.vms \
X README.x11 makefile.x11 \
X! makefile.3b1 plot.h help.h setshow.h term.h lasergnu \
X demo/1.dat demo/2.dat demo/3.dat demo/controls.demo \
X demo/simple.demo demo/polar.demo demo/electron.demo \
X bugtest/README bugtest/printf.c bugtest/scanf.c \
X
X--- 62,68 -----
X # not C code, but still needed
X ETC = Copyright README README.gnutex makefile.unx makefile.vms \
X README.x11 makefile.x11 \
X! makefile.3b1 plot.h help.h setshow.h bitmap.h term.h lasergnu \
X demo/1.dat demo/2.dat demo/3.dat demo/controls.demo \
X demo/simple.demo demo/polar.demo demo/electron.demo \
X demo/param.demo demo/using.demo demo/using.dat \
X***************
X*** 57,62
X makefile.3b1 plot.h help.h setshow.h term.h lasergnu \
X demo/1.dat demo/2.dat demo/3.dat demo/controls.demo \
X demo/simple.demo demo/polar.demo demo/electron.demo \
X bugtest/README bugtest/printf.c bugtest/scanf.c \
X bugtest/mscbug.c term/README \
X linkopt.vms buildvms.com
X
X--- 65,71 -----
X makefile.3b1 plot.h help.h setshow.h bitmap.h term.h lasergnu \
X demo/1.dat demo/2.dat demo/3.dat demo/controls.demo \
X demo/simple.demo demo/polar.demo demo/electron.demo \
X+ demo/param.demo demo/using.demo demo/using.dat \
X bugtest/README bugtest/printf.c bugtest/scanf.c \
X bugtest/mscbug.c term/README \
X linkopt.vms buildvms.com
X***************
X*** 100,106
X man_install: docs/gnuplot.1 docs/lasergnu.1
X cp docs/gnuplot.1 docs/lasergnu.1 $(MANDEST)
X
X! term.o: term.h $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
X $(CC) $(CFLAGS) $(TERMFLAGS) -c term.c
X
X version.o:
X
X--- 109,115 -----
X man_install: docs/gnuplot.1 docs/lasergnu.1
X cp docs/gnuplot.1 docs/lasergnu.1 $(MANDEST)
X
X! term.o: term.h term.c $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
X $(CC) $(CFLAGS) $(TERMFLAGS) -c term.c
X
X version.o:
X***************
X*** 113,119
X
X command.o help.o misc.o: help.h
X
X! command.o graphics.o misc.o plot.o setshow.o: setshow.h
X
X SOURCES=plot.h help.h setshow.h $(CSOURCE1) $(CSOURCE2) $(CSOURCE3) \
X $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
X
X--- 122,128 -----
X
X command.o help.o misc.o: help.h
X
X! command.o graphics.o misc.o plot.o setshow.o term.o: setshow.h
X
X bitmap.o term.o: bitmap.h
X
X***************
X*** 115,122
X
X command.o graphics.o misc.o plot.o setshow.o: setshow.h
X
X! SOURCES=plot.h help.h setshow.h $(CSOURCE1) $(CSOURCE2) $(CSOURCE3) \
X! $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
X
X lint:
X lint -hx $(CSOURCE1) $(CSOURCE2) $(CSOURCE3) $(CSOURCE4)
X
X--- 124,130 -----
X
X command.o graphics.o misc.o plot.o setshow.o term.o: setshow.h
X
X! bitmap.o term.o: bitmap.h
X
X SOURCES=plot.h help.h setshow.h bitmap.h term.h $(CSOURCE1) $(CSOURCE2) \
X $(CSOURCE3) $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
X***************
X*** 118,123
X SOURCES=plot.h help.h setshow.h $(CSOURCE1) $(CSOURCE2) $(CSOURCE3) \
X $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
X
X lint:
X lint -hx $(CSOURCE1) $(CSOURCE2) $(CSOURCE3) $(CSOURCE4)
X
X
X--- 126,134 -----
X
X bitmap.o term.o: bitmap.h
X
X+ SOURCES=plot.h help.h setshow.h bitmap.h term.h $(CSOURCE1) $(CSOURCE2) \
X+ $(CSOURCE3) $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
X+
X lint:
X lint -hx $(SOURCES)
X
X***************
X*** 119,125
X $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
X
X lint:
X! lint -hx $(CSOURCE1) $(CSOURCE2) $(CSOURCE3) $(CSOURCE4)
X
X clean:
X rm -f *.o *~ term/*~
X
X--- 130,136 -----
X $(CSOURCE3) $(CSOURCE4) $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
X
X lint:
X! lint -hx $(SOURCES)
X
X clean:
X rm -f *.o *~ term/*~
Xdiff -cr ./makefile.vms ../gnuplot2.02/makefile.vms
X*** ./makefile.vms Tue Sep 18 14:56:53 1990
X--- ../gnuplot2.02/makefile.vms Fri Dec 14 15:48:48 1990
X***************
X*** 14,20
X
X TERMFLAGS =
X
X! OBJS = command.obj,eval.obj,graphics.obj,internal.obj, \
X misc.obj,parse.obj,plot.obj,scanner.obj,setshow.obj, \
X standard.obj,term.obj,util.obj,version.obj
X
X
X--- 14,20 -----
X
X TERMFLAGS =
X
X! OBJS = bitmap.obj,command.obj,eval.obj,graphics.obj,internal.obj, \
X misc.obj,parse.obj,plot.obj,scanner.obj,setshow.obj, \
X standard.obj,term.obj,util.obj,version.obj
X
X***************
X*** 18,33
X misc.obj,parse.obj,plot.obj,scanner.obj,setshow.obj, \
X standard.obj,term.obj,util.obj,version.obj
X
X! CSOURCE1 = command.c setshow.c
X! CSOURCE2 = help.c graphics.c internal.c
X! CSOURCE3 = misc.c eval.c parse.c plot.c scanner.c standard.c
X! CSOURCE4 = term.c util.c version.c
X! CSOURCE5 = [.term]aed.trm [.term]dxy.trm [.term]eps60.trm [.term]epson.trm \
X! [.term]font5x7.trm [.term]hp26.trm [.term]hp2648.trm [.term]hpgl.trm \
X! [.term]hpljet.trm [.term]iris4d.trm [.term]latex.trm
X! CSOURCE6 = [.term]post.trm [.term]pc.trm [.term]qms.trm [.term]regis.trm \
X! [.term]tek.trm [.term]unixpc.trm [.term]unixplot.trm [.term]v384.trm \
X! [.term]imPcodes.h [.term]imagen.trm [.term]object.h [.term]fig.trm
X
X
X all : gnuplot.exe gnuplot.hlp gnuplot.hlb
X
X--- 18,35 -----
X misc.obj,parse.obj,plot.obj,scanner.obj,setshow.obj, \
X standard.obj,term.obj,util.obj,version.obj
X
X! CSOURCE1 = command.c setshow.c
X! CSOURCE2 = help.c graphics.c internal.c
X! CSOURCE3 = misc.c eval.c parse.c plot.c scanner.c standard.c
X! CSOURCE4 = bitmap.c term.c util.c version.c
X! CSOURCE5 = [.term]aed.trm [.term]cgi.trm [.term]dxy.trm [.term]eepic.trm \
X! [.term]epson.trm [.term]fig.trm [.term]hp26.trm [.term]hp2648.trm \
X! [.term]hpgl.trm [.term]hpljii.trm
X! CSOURCE6 = [.term]imPcodes.h [.term]imagen.trm [.term]object.h \
X! [.term]iris4d.trm [.term]kyo.trm [.term]latex.trm [.term]pc.trm
X! CSOURCE7 = [.term]post.trm [.term]qms.trm [.term]regis.trm [.term]sun.trm \
X! [.term]t410x.trm [.term]tek.trm [.term]unixpc.trm [.term]unixplot.trm \
X! [.term]v384.trm [.term]x11.trm gnuplot_x11.c
X
X all : gnuplot.exe gnuplot.hlp gnuplot.hlb
X
X***************
X*** 29,35
X [.term]tek.trm [.term]unixpc.trm [.term]unixplot.trm [.term]v384.trm \
X [.term]imPcodes.h [.term]imagen.trm [.term]object.h [.term]fig.trm
X
X-
X all : gnuplot.exe gnuplot.hlp gnuplot.hlb
X
X
X
X--- 31,36 -----
X [.term]t410x.trm [.term]tek.trm [.term]unixpc.trm [.term]unixplot.trm \
X [.term]v384.trm [.term]x11.trm gnuplot_x11.c
X
X all : gnuplot.exe gnuplot.hlp gnuplot.hlb
X
X
X***************
X*** 46,53
X cc [.docs]doc2hlp.c
X link doc2hlp,linkopt.vms/opt
X
X! term.obj : term.h $(CSOURCE4) $(CSOURCE5) $(CSOURCE6)
X! cc $(CFLAGS) $(TERMFLAGS) term.c
X
X $(OBJS) : plot.h
X
X
X--- 47,54 -----
X cc [.docs]doc2hlp.c
X link doc2hlp,linkopt.vms/opt
X
X! term.obj: term.h term.c $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
X! $(CC) $(CFLAGS) $(TERMFLAGS) term.c
X
X $(OBJS): plot.h
X
X***************
X*** 49,55
X term.obj : term.h $(CSOURCE4) $(CSOURCE5) $(CSOURCE6)
X cc $(CFLAGS) $(TERMFLAGS) term.c
X
X! $(OBJS) : plot.h
X
X command.obj help.obj misc.obj : help.h
X
X
X--- 50,56 -----
X term.obj: term.h term.c $(CSOURCE5) $(CSOURCE6) $(CSOURCE7)
X $(CC) $(CFLAGS) $(TERMFLAGS) term.c
X
X! $(OBJS): plot.h
X
X command.obj help.obj misc.obj: help.h
X
X***************
X*** 51,57
X
X $(OBJS) : plot.h
X
X! command.obj help.obj misc.obj : help.h
X
X command.obj graphics.obj misc.obj plot.obj setshow.obj : setshow.h
X
X
X--- 52,58 -----
X
X $(OBJS): plot.h
X
X! command.obj help.obj misc.obj: help.h
X
X command.obj graphics.obj misc.obj plot.obj setshow.obj term.obj: setshow.h
X
X***************
X*** 53,59
X
X command.obj help.obj misc.obj : help.h
X
X! command.obj graphics.obj misc.obj plot.obj setshow.obj : setshow.h
X
X clean :
X purge/log
X
X--- 54,62 -----
X
X command.obj help.obj misc.obj: help.h
X
X! command.obj graphics.obj misc.obj plot.obj setshow.obj term.obj: setshow.h
X!
X! bitmap.obj term.obj: bitmap.h
X
X clean :
X purge/log
END_OF_patch2c
if test 50960 -ne `wc -c <patch2c`; then
echo shar: \"patch2c\" unpacked with wrong size!
fi
# end of overwriting check
fi
echo shar: End of shell archive.
exit 0
exit 0 # Just in case...
--
Kent Landfield INTERNET: kent@sparky.IMD.Sterling.COM
Sterling Software, IMD UUCP: uunet!sparky!kent
Phone: (402) 291-8300 FAX: (402) 291-4362
Please send comp.sources.misc-related mail to kent@uunet.uu.net.