--- pgplot/makemake Tue May 4 16:35:43 1999 +++ pgplot/makemake Thu May 9 05:53:33 2002 @@ -68,8 +68,8 @@ # By default the PGPLOT library is initially placed in the current # The demos should be explicitly linked against this library. -PGPLOT_LIB="-L\`pwd\` -lpgplot" -CPGPLOT_LIB="-L\`pwd\` -lcpgplot -lpgplot" +PGPLOT_LIB="-L`pwd` -lpgplot" +CPGPLOT_LIB="-L`pwd` -lcpgplot -lpgplot" # List the default make targets. @@ -160,6 +160,7 @@ XADRIV="xadriv.o pgxwin.o" TKDRIV="tkdriv.o pgxwin.o" RVDRIV="rvdriv.o pgxwin.o" +AQDRIV="aqdriv.o" # We need a drivers.list file in the current directory, from which to # determine the drivers to be compiled. @@ -221,8 +222,8 @@ # PNDRIV requires extra libraries and include files if (echo $DRIV_LIST | grep -s pndriv 2>&1 1>/dev/null); then - PGPLOT_LIB="$PGPLOT_LIB -lpng -lz" - CPGPLOT_LIB="$CPGPLOT_LIB -lpng -lz" + PGPLOT_LIB="$PGPLOT_LIB -L/lib -lpng -lz" + CPGPLOT_LIB="$CPGPLOT_LIB -L/lib -lpng -lz" fi # Create a new grexec.f that calls the above drivers. @@ -1025,7 +1026,7 @@ grivas.o : $(DRVDIR)/gadef.h grtv00.o : $(DRVDIR)/imdef.h pgxwin.o : $(DRVDIR)/pgxwin.h -pndriv.o : ./png.h ./pngconf.h ./zlib.h ./zconf.h +pndriv.o : /include/png.h /include/pngconf.h /usr/include/zlib.h /usr/include/zconf.h x2driv.o figdisp_comm.o: $(DRVDIR)/commands.h --- pgplot/pgplot.csh Thu May 9 05:55:35 2002 +++ pgplot/pgplot.csh Thu May 9 05:50:37 2002 @@ -0,0 +1,3 @@ +# pgplot.csh + +setenv PGPLOT_DIR /lib/pgplot --- pgplot/pgplot.sh Thu May 9 05:55:35 2002 +++ pgplot/pgplot.sh Thu May 9 05:50:37 2002 @@ -0,0 +1,4 @@ +# pgplot.sh + +PGPLOT_DIR=/lib/pgplot +export PGPLOT_DIR --- pgplot/g77_cc_AQT.conf.orig Thu May 9 06:11:54 2002 +++ pgplot/g77_cc_AQT.conf Thu May 9 06:11:39 2002 @@ -0,0 +1,144 @@ +# MacOS X/AQT using g77 and cc. +#----------------------------------------------------------------------- + +# Optional: Needed by XWDRIV (/xwindow and /xserve) and +# X2DRIV (/xdisp and /figdisp). +# The arguments needed by the C compiler to locate X-window include files. + + XINCL="-I/include -I/usr/X11R6/include" + +# Optional: Needed by XMDRIV (/xmotif). +# The arguments needed by the C compiler to locate Motif, Xt and +# X-window include files. + + MOTIF_INCL="-I//include" + +# Optional: Needed by XADRIV (/xathena). +# The arguments needed by the C compiler to locate Xaw, Xt and +# X-window include files. + + ATHENA_INCL="$XINCL" + +# Optional: Needed by TKDRIV (/xtk). +# The arguments needed by the C compiler to locate Tcl, Tk and +# X-window include files. + + TK_INCL="-I/include " + +# Optional: Needed by RVDRIV (/xrv). +# The arguments needed by the C compiler to locate Rivet, Tcl, Tk and +# X-window include files. + +# RV_INCL="" + +# Mandatory. +# The FORTRAN compiler to use. + + FCOMPL="g77" + +# Mandatory. +# The FORTRAN compiler flags to use when compiling the pgplot library. +# (NB. makemake prepends -c to $FFLAGC where needed) + + FFLAGC="-O" + +# Mandatory. +# The FORTRAN compiler flags to use when compiling fortran demo programs. +# This may need to include a flag to tell the compiler not to treat +# backslash characters as C-style escape sequences + + FFLAGD="-fno-backslash" + +# Mandatory. +# The C compiler to use. + + CCOMPL="cc" + +# Mandatory. +# The C compiler flags to use when compiling the pgplot library. + + CFLAGC="-DPG_PPU -O2" + +# Mandatory. +# The C compiler flags to use when compiling C demo programs. + + CFLAGD="-O2" + +# Optional: Only needed if the cpgplot library is to be compiled. +# The flags to use when running pgbind to create the C pgplot wrapper +# library. (See pgplot/cpg/pgbind.usage) + + PGBIND_FLAGS="bsd" + +# Mandatory. +# The library-specification flags to use when linking normal pgplot +# demo programs. + + LIBS="-L/usr/X11R6/lib -lX11 /System/Library/Frameworks/Foundation.framework/Versions/Current/Foundation /System/Library/Frameworks/AppKit.framework/Versions/Current/AppKit -lcc_dynamic" + + +# Optional: Needed by XMDRIV (/xmotif). +# The library-specification flags to use when linking motif +# demo programs. + + MOTIF_LIBS="-lXm -lXt $LIBS" + +# Optional: Needed by XADRIV (/xathena). +# The library-specification flags to use when linking athena +# demo programs. + + ATHENA_LIBS="-lXaw -lXt -lXmu -lXext $LIBS" + +# Optional: Needed by TKDRIV (/xtk). +# The library-specification flags to use when linking Tk demo programs. +# Note that you may need to append version numbers to -ltk and -ltcl. + + TK_LIBS="-L/lib -ltk -ltcl $LIBS -ldl" + +# Mandatory. +# On systems that have a ranlib utility, put "ranlib" here. On other +# systems put ":" here (Colon is the Bourne-shell do-nothing command). + + RANLIB="ranlib" + +# Optional: Needed on systems that support shared libraries. +# The name to give the shared pgplot library. + + SHARED_LIB="" + +# Optional: Needed if SHARED_LIB is set. +# How to create a shared library from a trailing list of object files. + + SHARED_LD="" + +# Optional: +# On systems such as Solaris 2.x, that allow specification of the +# libraries that a shared library needs to be linked with when a +# program that uses it is run, this variable should contain the +# library-specification flags used to specify these libraries to +# $SHARED_LD + + SHARED_LIB_LIBS="" + +# Optional: +# Compiler name used on Next systems to compile objective-C files. + + MCOMPL="cc" + +# Optional: +# Compiler flags used with MCOMPL when compiling objective-C files. + + MFLAGC="-DPG_PPU -O2 -I." + +# Optional: (Actually mandatory, but already defined by makemake). +# Where to look for any system-specific versions of the files in +# pgplot/sys. Before evaluating this script, makemake sets SYSDIR to +# /wherever/pgplot/sys_$OS, where $OS is the operating-system name +# given by the second command-line argument of makemake. If the +# present configuration is one of many for this OS, and it needs +# different modifications to files in pgplot/sys than the other +# configurations, then you should create a subdirectory of SYSDIR, +# place the modified files in it and change the following line to +# $SYSDIR="$SYSDIR/subdirectory_name". + + SYSDIR="$SYSDIR" --- pgplot/drivers.list Mon May 3 23:02:15 1999 +++ pgplot-new/drivers.list Thu May 9 05:52:49 2002 @@ -37,14 +37,14 @@ ! NEDRIV 0 /NEXT Computers running NeXTstep operating system NUDRIV 0 /NULL Null device (no output) Std F77 ! PGDRIV 0 /PGMF PGPLOT metafile (new format, experimental) Std F77 -! PNDRIV 1 /PNG Portable Network Graphics file C -! PNDRIV 2 /TPNG Portable Network Graphics file - transparent background C + PNDRIV 1 /PNG Portable Network Graphics file C + PNDRIV 2 /TPNG Portable Network Graphics file - transparent background C ! PPDRIV 1 /PPM Portable Pixel Map file, landscape ! PPDRIV 2 /VPPM Portable PIxel Map file, portrait -! PSDRIV 1 /PS PostScript printers, monochrome, landscape Std F77 -! PSDRIV 2 /VPS Postscript printers, monochrome, portrait Std F77 -! PSDRIV 3 /CPS PostScript printers, color, landscape Std F77 -! PSDRIV 4 /VCPS PostScript printers, color, portrait Std F77 + PSDRIV 1 /PS PostScript printers, monochrome, landscape Std F77 + PSDRIV 2 /VPS Postscript printers, monochrome, portrait Std F77 + PSDRIV 3 /CPS PostScript printers, color, landscape Std F77 + PSDRIV 4 /VCPS PostScript printers, color, portrait Std F77 ! PXDRIV 0 /PRINTRONI Printronix P300 or P600 dot-matrix printer ! QMDRIV 1 /QMS QUIC devices (QMS and Talaris), landscape Std F77 ! QMDRIV 2 /VQMS QUIC devices (QMS and Talaris), portrait Std F77 @@ -68,8 +68,8 @@ ! WDDRIV 2 /VWD X Window dump file, portrait ! WSDRIV 0 /WS VAX workstations running VWS software VMS ! X2DRIV 0 /XDISP PGDISP or FIGDISP server for X workstations C -! XWDRIV 1 /XWINDOW Workstations running X Window System C -! XWDRIV 2 /XSERVE Persistent window on X Window System C + XWDRIV 1 /XWINDOW Workstations running X Window System C + XWDRIV 2 /XSERVE Persistent window on X Window System C ! ZEDRIV 0 /ZETA Zeta 8 Digital Plotter ! ! The following drivers can only be used in PGPLOT installations on MS-DOS @@ -112,3 +112,4 @@ ! The following driver is included solely for use by the aips++ team. ! ! RVDRIV 0 /XRV X-window Rivet/Tk programs with pgplot widgets. C + AQDRIV 0 /AQT AquaTerm.app MacOSX C