diff -up tachyon/unix/Make-arch.r tachyon/unix/Make-arch
--- tachyon/unix/Make-arch.r 2007-02-13 10:00:36.000000000 +0100
+++ tachyon/unix/Make-arch 2007-12-13 22:08:06.000000000 +0100
@@ -15,7 +15,7 @@ MPILIB=$(MPIDIR)/lib
MISCDEFS=$(USEJPEG) $(USEPNG) $(FLT) $(MBOX)
MISCINC=$(JPEGINC) $(PNGINC) $(SPACEBALLINC)
-MISCFLAGS=$(MISCDEFS) $(MISCINC)
+MISCFLAGS=$(MISCDEFS) $(MISCINC) $(OPTFLAGS)
MISCLIB=$(JPEGLIB) $(PNGLIB) $(SPACEBALLLIB)
default:
@@ -983,7 +983,7 @@ linux:
"CFLAGS = -m32 -Wall -O6 -g -ffast-math -DLinux $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
- "STRIP = strip" \
+ "STRIP = touch" \
"RANLIB = ranlib" \
"LIBS = -L. -ltachyon $(MISCLIB) -lm"
@@ -1007,7 +1007,7 @@ linux-64:
"CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DLP64 $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
- "STRIP = strip" \
+ "STRIP = touch" \
"RANLIB = ranlib" \
"LIBS = -L. -ltachyon $(MISCLIB) -lm"
@@ -1029,10 +1029,10 @@ linux-64-thr:
$(MAKE) all \
"ARCH = linux-64-thr" \
"CC = gcc" \
- "CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DLP64 -DTHR -D_REENTRANT $(MISCFLAGS)" \
+ "CFLAGS = -m64 -Wall -O2 -DLinux -DLP64 -DTHR -D_REENTRANT $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
- "STRIP = strip" \
+ "STRIP = touch" \
"RANLIB = ranlib" \
"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
@@ -1128,10 +1128,10 @@ linux-thr:
$(MAKE) all \
"ARCH = linux-thr" \
"CC = gcc" \
- "CFLAGS = -m32 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
+ "CFLAGS = -m32 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
- "STRIP = strip" \
+ "STRIP = touch" \
"RANLIB = ranlib" \
"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
@@ -1140,7 +1140,7 @@ linux-thr-ogl:
$(MAKE) all \
"ARCH = linux-thr-ogl" \
"CC = cc" \
- "CFLAGS = -m32 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux -DTHR -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
+ "CFLAGS = -m32 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
"AR = ar" \
"ARFLAGS = r" \
"STRIP = touch" \
@@ -1174,44 +1174,68 @@ linux-beowulf-mpi:
linux-lam:
$(MAKE) all \
"ARCH = linux-lam" \
- "CC = hcc" \
- "CFLAGS = -m486 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI $(MISCFLAGS)" \
+ "CC = mpicc" \
+ "CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
- "STRIP = strip" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
+
+# Linux x86 using LAM MPI, with OpenGL display
+linux-lam-ogl:
+ $(MAKE) all \
+ "ARCH = linux-lam-ogl" \
+ "CC = mpicc" \
+ "CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
"RANLIB = ranlib" \
- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm"
+ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
# Linux AMD64/EM64T using LAM MPI
-linux-lam-64:
+linux-64-lam:
$(MAKE) all \
- "ARCH = linux-lam-64" \
- "CC = hcc" \
- "CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI -DLP64 $(MISCFLAGS)" \
+ "ARCH = linux-64-lam" \
+ "CC = mpicc" \
+ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DLP64 $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
- "STRIP = strip" \
+ "STRIP = touch" \
"RANLIB = ranlib" \
- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(MISCLIB) -lm"
+ "LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
# Linux AMD64/EM64T using LAM MPI, with OpenGL display
-linux-lam-64-ogl:
+linux-64-lam-ogl:
$(MAKE) all \
- "ARCH = linux-lam-64-ogl" \
- "CC = hcc" \
- "CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+ "ARCH = linux-64-lam-ogl" \
+ "CC = mpicc" \
+ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
- "STRIP = strip" \
+ "STRIP = touch" \
"RANLIB = ranlib" \
- "LIBS = -L. -L$(LAMHOME)/lib -ltachyon -lmpi $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+
+# Linux AMD64/EM64T using threads with OpenGL display
+linux-64-thr-ogl:
+ $(MAKE) all \
+ "ARCH = linux-64-thr-ogl" \
+ "CC = gcc" \
+ "CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT -DLP64 -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
# Linux x86 using LAM MPI and threads
linux-lam-thr:
$(MAKE) all \
"ARCH = linux-lam-thr" \
"CC = hcc" \
- "CFLAGS = -m486 -Wall -O6 -fomit-frame-pointer -ffast-math -I$(LAMHOME)/h -DLinux -DMPI -DTHR -D_REENTRANT $(MISCFLAGS)" \
+ "CFLAGS = -m486 -Wall -O6 -fomit-frame-pointer -ffast-math $(LAMFLAGS) -DLinux -DMPI -DTHR -D_REENTRANT $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
"STRIP = strip" \
@@ -1242,6 +1266,234 @@ linux-ppc:
"RANLIB = ranlib" \
"LIBS = -L. -ltachyon $(MISCLIB) -lm"
+# Linux PPC using gcc and threads
+linux-ppc-thr:
+ $(MAKE) all \
+ "ARCH = linux-ppc-thr" \
+ "CC = gcc" \
+ "CFLAGS = -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
+
+# Linux PPC using threads with OpenGL display
+linux-ppc-thr-ogl:
+ $(MAKE) all \
+ "ARCH = linux-ppc-thr-ogl" \
+ "CC = gcc" \
+ "CFLAGS = -Wall -O2 -DLinux -DTHR -D_REENTRANT -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
+
+# Linux PPC using LAM MPI
+linux-ppc-lam:
+ $(MAKE) all \
+ "ARCH = linux-ppc-lam" \
+ "CC = mpicc" \
+ "CFLAGS = -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
+
+# Linux PPC using LAM MPI, with OpenGL display
+linux-ppc-lam-ogl:
+ $(MAKE) all \
+ "ARCH = linux-ppc-lam-ogl" \
+ "CC = mpicc" \
+ "CFLAGS = -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+
+# Linux PPC64 using gcc
+linux-ppc64:
+ $(MAKE) all \
+ "ARCH = linux-ppc64" \
+ "CC = gcc" \
+ "CFLAGS = -m64 -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = strip" \
+ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(MISCLIB) -lm"
+
+# Linux PPC64 using gcc and threads
+linux-ppc64-thr:
+ $(MAKE) all \
+ "ARCH = linux-ppc64-thr" \
+ "CC = gcc" \
+ "CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
+
+# Linux PPC64 using threads with OpenGL display
+linux-ppc64-thr-ogl:
+ $(MAKE) all \
+ "ARCH = linux-ppc64-thr-ogl" \
+ "CC = gcc" \
+ "CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
+
+# Linux PPC64 using LAM MPI
+linux-ppc64-lam:
+ $(MAKE) all \
+ "ARCH = linux-ppc64-lam" \
+ "CC = mpicc" \
+ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
+
+# Linux PPC64 using LAM MPI, with OpenGL display
+linux-ppc64-lam-ogl:
+ $(MAKE) all \
+ "ARCH = linux-ppc64-lam-ogl" \
+ "CC = mpicc" \
+ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+
+# Linux SPARC using gcc
+linux-sparc:
+ $(MAKE) all \
+ "ARCH = linux-sparc" \
+ "CC = gcc" \
+ "CFLAGS = -m32 -Wall -O2 -DLinux $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = strip" \
+ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(MISCLIB) -lm"
+
+# Linux SPARC using gcc and threads
+linux-sparc-thr:
+ $(MAKE) all \
+ "ARCH = linux-sparc-thr" \
+ "CC = gcc" \
+ "CFLAGS = -m32 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
+
+# Linux SPARC using threads with OpenGL display
+linux-sparc-thr-ogl:
+ $(MAKE) all \
+ "ARCH = linux-sparc-thr-ogl" \
+ "CC = gcc" \
+ "CFLAGS = -m32 -Wall -O2 -DLinux -DTHR -D_REENTRANT -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
+
+# Linux SPARC using LAM MPI
+linux-sparc-lam:
+ $(MAKE) all \
+ "ARCH = linux-sparc-lam" \
+ "CC = mpicc" \
+ "CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
+
+# Linux SPARC using LAM MPI, with OpenGL display
+linux-sparc-lam-ogl:
+ $(MAKE) all \
+ "ARCH = linux-sparc-lam-ogl" \
+ "CC = mpicc" \
+ "CFLAGS = -m32 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+
+# Linux SPARC64 using gcc
+linux-sparc64:
+ $(MAKE) all \
+ "ARCH = linux-sparc64" \
+ "CC = gcc" \
+ "CFLAGS = -m64 -Wall -O2 -DLinux $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = strip" \
+ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(MISCLIB) -lm"
+
+# Linux SPARC64 using gcc and threads
+linux-sparc64-thr:
+ $(MAKE) all \
+ "ARCH = linux-sparc64-thr" \
+ "CC = gcc" \
+ "CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
+
+# Linux SPARC64 using threads with OpenGL display
+linux-sparc64-thr-ogl:
+ $(MAKE) all \
+ "ARCH = linux-sparc64-thr-ogl" \
+ "CC = gcc" \
+ "CFLAGS = -m64 -Wall -O2 -DLinux -DTHR -D_REENTRANT -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
+
+# Linux SPARC64 using LAM MPI
+linux-sparc64-lam:
+ $(MAKE) all \
+ "ARCH = linux-sparc64-lam" \
+ "CC = mpicc" \
+ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
+
+# Linux SPARC64 using LAM MPI, with OpenGL display
+linux-sparc64-lam-ogl:
+ $(MAKE) all \
+ "ARCH = linux-sparc64-lam-ogl" \
+ "CC = mpicc" \
+ "CFLAGS = -m64 -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+
# Linux PPC using gcc
linux-ps2:
$(MAKE) all \
@@ -1259,13 +1511,61 @@ linux-alpha:
$(MAKE) all \
"ARCH = linux-alpha" \
"CC = gcc" \
- "CFLAGS = -Wall -O6 -fomit-frame-pointer -ffast-math -DLinux $(MISCFLAGS)" \
+ "CFLAGS = -Wall -O2 -DLinux $(MISCFLAGS)" \
"AR = ar" \
"ARFLAGS = r" \
"STRIP = strip" \
"RANLIB = ranlib" \
"LIBS = -L. -ltachyon $(MISCLIB) -lm"
+# Linux Alpha using gcc and threads
+linux-alpha-thr:
+ $(MAKE) all \
+ "ARCH = linux-alpha-thr" \
+ "CC = gcc" \
+ "CFLAGS = -Wall -O2 -DLinux -DTHR -D_REENTRANT $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
+
+# Linux Alpha using threads with OpenGL display
+linux-alpha-thr-ogl:
+ $(MAKE) all \
+ "ARCH = linux-alpha-thr-ogl" \
+ "CC = gcc" \
+ "CFLAGS = -Wall -O2 -DLinux -DTHR -D_REENTRANT -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(LINUX_GLX_LIBS) $(MISCLIB) -lm -lpthread"
+
+# Linux Alpha using LAM MPI
+linux-alpha-lam:
+ $(MAKE) all \
+ "ARCH = linux-alpha-lam" \
+ "CC = mpicc" \
+ "CFLAGS = -Wall -O2 $(LAMFLAGS) -DLinux -DMPI $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(LAMLIBS) $(MISCLIB) -lm"
+
+# Linux Alpha using LAM MPI, with OpenGL display
+linux-alpha-lam-ogl:
+ $(MAKE) all \
+ "ARCH = linux-alpha-lam-ogl" \
+ "CC = mpicc" \
+ "CFLAGS = -Wall -O2 $(LAMFLAGS) -DLinux -DMPI -DUSEOPENGL $(LINUX_GLX_INCS) $(MISCFLAGS)" \
+ "AR = ar" \
+ "ARFLAGS = r" \
+ "STRIP = touch" \
+ "RANLIB = ranlib" \
+ "LIBS = -L. -ltachyon $(LAMLIBS) $(LINUX_GLX_LIBS) $(MISCLIB) -lm"
+
# Linux Alpha using Compaq's compilers
linux-alpha-ccc:
$(MAKE) all \
diff -up tachyon/unix/Make-config.r tachyon/unix/Make-config
--- tachyon/unix/Make-config.r 2007-01-24 09:35:44.000000000 +0100
+++ tachyon/unix/Make-config 2007-12-13 22:08:20.000000000 +0100
@@ -57,7 +57,7 @@ X11LIB= -lX11
##########################################################################
# Standard MPICH installation location
-MPIDIR=/usr/local/mpi
+MPIDIR=/usr
# UMR CS Dept
#MPIDIR=/software/all/mpi
@@ -68,6 +68,10 @@ MPIDIR=/usr/local/mpi
# Cornell Theory Center SP-2 splogin.tc.cornell.edu
#MPIDIR=/usr/local/app/mpich
+# LAM
+LAMFLAGS=`pkg-config --cflags lam`
+LAMLIBS=`pkg-config --libs lam`
+
##########################################################################
# Floating point configuration:
@@ -108,14 +112,14 @@ MBOX=
# http://www.ijg.org/files/
##########################################################################
# Uncomment the following lines to disable JPEG support
-USEJPEG=
-JPEGINC=
-JPEGLIB=
+#USEJPEG=
+#JPEGINC=
+#JPEGLIB=
# Uncomment the following lines to enable JPEG support
-#USEJPEG= -DUSEJPEG
-#JPEGINC= -I/usr/local/include
-#JPEGLIB= -L/usr/local/lib -ljpeg
+USEJPEG= -DUSEJPEG
+JPEGINC=
+JPEGLIB= -ljpeg
##########################################################################
@@ -128,14 +132,14 @@ JPEGLIB=
# http://www.libpng.org/
##########################################################################
# Uncomment the following lines to disable PNG support
-USEPNG=
-PNGINC=
-PNGLIB=
+#USEPNG=
+#PNGINC=
+#PNGLIB=
# Uncomment the following lines to enable PNG support
-#USEPNG= -DUSEPNG
-#PNGINC= -I/usr/local/include
-#PNGLIB= -L/usr/local/lib -lpng -lz
+USEPNG= -DUSEPNG
+PNGINC= `pkg-config --cflags libpng`
+PNGLIB= `pkg-config --libs libpng`
##########################################################################
diff -up tachyon/unix/Make-opengl.r tachyon/unix/Make-opengl
--- tachyon/unix/Make-opengl.r 2007-01-24 09:35:44.000000000 +0100
+++ tachyon/unix/Make-opengl 2007-12-13 21:54:04.000000000 +0100
@@ -9,8 +9,8 @@
#
# Generic Mesa OpenGL / GLX include and link specs, for most platforms
#
-MESA_GLX_INCS = -I/usr/local/include
-MESA_GLX_LIBS = -L/usr/local/lib -lMesaGL -lMesaGLU
+MESA_GLX_INCS =
+MESA_GLX_LIBS = -lGL -lGLU -lX11
#
@@ -37,8 +37,8 @@ HP_GLX_LIBS = -L/usr/lib/X11R6 -L/opt/gr
#
# Linux OpenGL / GLX include and link specs
#
-LINUX_GLX_INCS = -I/usr/X11R6/include
-LINUX_GLX_LIBS = -L/usr/X11R6/lib -lGL -lGLU -lX11
+LINUX_GLX_INCS =
+LINUX_GLX_LIBS = -lGL -lGLU -lX11
#