$NetBSD: patch-ah,v 1.1 2001/05/26 06:37:46 jlam Exp $

--- test/Makefile.orig	Mon Jan 22 10:13:41 2001
+++ test/Makefile
@@ -56,52 +56,52 @@
 .fl:
 	echo Generating, compiling, and linking $@...
 	../fluid/fluid -c $<
-	$(CXX) -I.. -L../lib $(CXXFLAGS) $@.cxx -lfltk $(LDLIBS) -o $@
+	$(CXX) -I.. $(CXXFLAGS) $@.cxx $(LINKFLTK) $(LDLIBS) -o $@
 
 
-$(ALL):  ../lib/$(LIBNAME)
+$(ALL):  $(LIBFLTK)
 
 # Other programs needing special "help"...
 CubeView: CubeMain.o CubeView.o CubeViewUI.o
 	echo Compiling and linking $@...
-	$(CXX) -I.. -L../lib $(CXXFLAGS) CubeMain.o CubeView.o CubeViewUI.o \
-		-lfltk $(GLDLIBS) -o $@
+	$(CXX) -I.. $(CXXFLAGS) CubeMain.o CubeView.o CubeViewUI.o \
+		$(LINKFLTK) $(GLDLIBS) -o $@
 CubeMain.o: CubeViewUI.h CubeView.h
 CubeView.o: CubeView.h
 
 cube: cube.cxx
 	echo Compiling and linking $@...
-	$(CXX) -I.. -L../lib $(CXXFLAGS) cube.cxx -lfltk $(GLDLIBS) -o $@
+	$(CXX) -I.. $(CXXFLAGS) cube.cxx $(LINKFLTK) $(GLDLIBS) -o $@
 fractals: fractals.cxx
 	echo Compiling and linking $@...
-	$(CXX) -I.. -L../lib $(CXXFLAGS) fractals.cxx -lfltk $(GLDLIBS) -o $@
+	$(CXX) -I.. $(CXXFLAGS) fractals.cxx $(LINKFLTK) $(GLDLIBS) -o $@
 fullscreen: fullscreen.cxx
 	echo Compiling and linking $@...
-	$(CXX) -I.. -L../lib $(CXXFLAGS) fullscreen.cxx -lfltk $(GLDLIBS) -o $@
+	$(CXX) -I.. $(CXXFLAGS) fullscreen.cxx $(LINKFLTK) $(GLDLIBS) -o $@
 glpuzzle: glpuzzle.cxx
 	echo Compiling and linking $@...
-	$(CXX) -I.. -L../lib $(CXXFLAGS) glpuzzle.cxx -lfltk $(GLDLIBS) -o $@
+	$(CXX) -I.. $(CXXFLAGS) glpuzzle.cxx $(LINKFLTK) $(GLDLIBS) -o $@
 gl_overlay: gl_overlay.cxx
 	echo Compiling and linking $@...
-	$(CXX) -I.. -L../lib $(CXXFLAGS) gl_overlay.cxx -lfltk $(GLDLIBS) -o $@
+	$(CXX) -I.. $(CXXFLAGS) gl_overlay.cxx $(LINKFLTK) $(GLDLIBS) -o $@
 shiny: shiny.cxx shiny_panel.cxx
 	echo Compiling and linking $@...
-	$(CXX) -I.. -L../lib $(CXXFLAGS) shiny.cxx -lfltk $(GLDLIBS) -o $@
+	$(CXX) -I.. $(CXXFLAGS) shiny.cxx $(LINKFLTK) $(GLDLIBS) -o $@
 keyboard: keyboard.cxx keyboard_ui.cxx
 	echo Compiling and linking $@...
-	$(CXX) -I.. -L../lib $(CXXFLAGS) keyboard.cxx -lfltk $(LDLIBS) -o $@
+	$(CXX) -I.. $(CXXFLAGS) keyboard.cxx $(LINKFLTK) $(LDLIBS) -o $@
 mandelbrot: mandelbrot.cxx mandelbrot_ui.cxx
 	echo Compiling and linking $@...
-	$(CXX) -I.. -L../lib $(CXXFLAGS) mandelbrot.cxx -lfltk $(LDLIBS) -o $@
+	$(CXX) -I.. $(CXXFLAGS) mandelbrot.cxx $(LINKFLTK) $(LDLIBS) -o $@
 shape: shape.cxx
 	echo Compiling and linking $@...
-	$(CXX) -I.. -L../lib $(CXXFLAGS) shape.cxx -lfltk $(GLDLIBS) -o $@
+	$(CXX) -I.. $(CXXFLAGS) shape.cxx $(LINKFLTK) $(GLDLIBS) -o $@
 
 # If you have libjpeg installed, you might want to try this test program:
 
 jpeg_image: jpeg_image.cxx
 	echo Compiling and linking $@...
-	$(CXX) -I.. -L../lib $(CXXFLAGS) -I../../../local/jpeg-6b -L../../../local/jpeg-6b jpeg_image.cxx -lfltk $(LDLIBS) -ljpeg -lXext -o $@
+	$(CXX) -I.. $(CXXFLAGS) -I../../../local/jpeg-6b -L../../../local/jpeg-6b jpeg_image.cxx $(LINKFLTK) $(LDLIBS) -ljpeg -lXext -o $@
 
 depend:
 	$(MAKEDEPEND) -I.. $(CXXFLAGS) $(CPPFILES) > makedepend