X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2FMakefile.in;h=b4d1bbf00846183eb3e645f374210562a640e497;hp=5b8f028063a2498462d27823826e75a2cc6f03e0;hb=ffd8c0873576a9e3065696a624dce6b766b77062;hpb=a94197e76a5dea5cb60542840809d6c20d0abbf3

diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in
index 5b8f0280..b4d1bbf0 100644
--- a/hacks/glx/Makefile.in
+++ b/hacks/glx/Makefile.in
@@ -1,4 +1,4 @@
-# hacks/glx/Makefile.in --- xscreensaver, Copyright (c) 1999, 2000
+# hacks/glx/Makefile.in --- xscreensaver, Copyright (c) 1999-2004
 #  by Jamie Zawinski.
 # the `../../configure' script generates `hacks/glx/Makefile' from this file.
 
@@ -14,7 +14,11 @@ prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 bindir		= @bindir@
 mandir		= @mandir@
-man1dir		= $(mandir)/man1
+# maybe this should be 6 (games)?
+mansuffix	= 1
+manNdir		= $(mandir)/man$(mansuffix)
+
+# maybe this should be 6 (games)?
 mansuffix	= 1
 
 CC		= @CC@
@@ -79,7 +83,20 @@ SRCS		= xscreensaver-gl-helper.c \
 		  stonerview-view.c starwars.c glut_stroke.c glut_swidth.c \
 		  gltext.c molecule.c dangerball.c sphere.c tube.c circuit.c \
 		  menger.c engine.c flipscreen3d.c font-ximage.c \
-		  grab-ximage.c glsnake.c boxed.c glforestfire.c sballs.c
+		  grab-ximage.c glsnake.c boxed.c glforestfire.c sballs.c \
+		  cubenetic.c spheremonics.c marching.c lavalite.c rotator.c \
+		  trackball.c gltrackball.c queens.c endgame.c chessmodels.c \
+		  glblur.c gllist.c flurry.c flurry-smoke.c flurry-spark.c \
+		  flurry-star.c flurry-texture.c atunnel.c tunnel_draw.c \
+		  flyingtoasters.c toaster.c toaster_base.c toaster_handle.c \
+		  toaster_handle2.c toaster_jet.c toaster_knob.c \
+		  toaster_slots.c toaster_wing.c toast.c toast2.c \
+		  bouncingcow.c cow_face.c cow_hide.c cow_hoofs.c cow_horns.c \
+		  cow_tail.c cow_udder.c glslideshow.c jigglypuff.c klein.c \
+		  hypertorus.c glmatrix.c cubestorm.c glknots.c blocktube.c \
+		  flipflop.c antspotlight.c polytopes.c gleidescope.c \
+		  mirrorblob.c blinkbox.c noof.c polyhedra.c polyhedra-gl.c \
+		  antinspect.c providence.c
 
 OBJS		= xscreensaver-gl-helper.o \
 		  atlantis.o b_draw.o b_lockglue.o b_sphere.o bubble3d.o \
@@ -95,13 +112,31 @@ OBJS		= xscreensaver-gl-helper.o \
 		  stonerview-view.o starwars.o glut_stroke.o glut_swidth.o \
 		  gltext.o molecule.o dangerball.o sphere.o tube.o circuit.o \
 		  menger.o engine.o flipscreen3d.o font-ximage.o \
-	          grab-ximage.o glsnake.o boxed.o glforestfire.o sballs.o
+	          grab-ximage.o glsnake.o boxed.o glforestfire.o sballs.o \
+		  cubenetic.o spheremonics.o marching.o lavalite.o rotator.o \
+		  trackball.o gltrackball.o queens.o endgame.o chessmodels.o \
+		  glblur.o gllist.o flurry.o flurry-smoke.o flurry-spark.o \
+		  flurry-star.o flurry-texture.o atunnel.o tunnel_draw.o \
+		  flyingtoasters.o toaster.o toaster_base.o toaster_handle.o \
+		  toaster_handle2.o toaster_jet.o toaster_knob.o \
+		  toaster_slots.o toaster_wing.o toast.o toast2.o \
+		  bouncingcow.o cow_face.o cow_hide.o cow_hoofs.o cow_horns.o \
+		  cow_tail.o cow_udder.o glslideshow.o jigglypuff.o klein.o \
+		  hypertorus.o glmatrix.o cubestorm.o glknots.o blocktube.o \
+		  flipflop.o antspotlight.o polytopes.o gleidescope.o \
+		  mirrorblob.o blinkbox.o noof.o polyhedra.o polyhedra-gl.o \
+		  antinspect.o providence.o
 
 GL_EXES		= cage gears moebius pipes sproingies stairs superquadrics \
 		  morph3d rubik atlantis lament bubble3d glplanet pulsar \
 		  sierpinski3d gflux stonerview starwars gltext molecule \
 		  dangerball circuit menger engine flipscreen3d glsnake boxed \
-		  glforestfire sballs
+		  glforestfire sballs cubenetic spheremonics lavalite queens \
+		  endgame glblur flurry atunnel flyingtoasters bouncingcow \
+		  glslideshow jigglypuff klein hypertorus glmatrix cubestorm \
+		  glknots blocktube flipflop antspotlight polytopes \
+		  gleidescope mirrorblob blinkbox noof polyhedra \
+		  antinspect providence
 GLE_EXES	= extrusion
 GL_UTIL_EXES	= xscreensaver-gl-helper
 HACK_EXES	= @GL_EXES@ @GLE_EXES@
@@ -116,12 +151,27 @@ HACK_OBJS	= screenhack-gl.o xlock-gl.o fps.o $(HACK_BIN)/xlockmore.o \
 
 HDRS		= atlantis.h bubble3d.h buildlwo.h e_textures.h xpm-ximage.h \
 		  grab-ximage.h font-ximage.h tube.h sphere.h boxed.h \
-		  stonerview-move.h stonerview-osc.h glutstroke.h glut_roman.h
-GL_MEN		= gflux.man lament.man starwars.man gltext.man \
-		  molecule.man xscreensaver-gl-helper.man glsnake.man \
-		  glforestfire.man sballs.man
+		  stonerview-move.h stonerview-osc.h glutstroke.h \
+		  glut_roman.h marching.h rotator.h trackball.h gltrackball.h \
+		  chessmodels.h chessgames.h gllist.h flurry.h tunnel_draw.h \
+		  ants.h polyhedra.h
+GL_MEN		= atlantis.man boxed.man bubble3d.man cage.man circuit.man \
+		  cubenetic.man dangerball.man engine.man extrusion.man \
+		  flipscreen3d.man gears.man gflux.man glforestfire.man \
+		  glplanet.man glsnake.man gltext.man lament.man lavalite.man \
+		  menger.man moebius.man molecule.man morph3d.man pipes.man \
+		  pulsar.man queens.man rubik.man sballs.man sierpinski3d.man \
+		  spheremonics.man sproingies.man stairs.man starwars.man \
+		  stonerview.man superquadrics.man xscreensaver-gl-helper.man \
+		  endgame.man flurry.man glblur.man atunnel.man \
+		  flyingtoasters.man bouncingcow.man glslideshow.man \
+		  jigglypuff.man klein.man hypertorus.man glmatrix.man \
+		  cubestorm.man glknots.man blocktube.man flipflop.man \
+		  antspotlight.man polytopes.man gleidescope.man \
+		  mirrorblob.man blinkbox.man noof.man polyhedra.man \
+		  antinspect.man providence.man
 MEN		= @GL_MEN@
-EXTRAS		= README Makefile.in
+EXTRAS		= README Makefile.in dxf2gl.pl
 
 TARFILES	= $(SRCS) $(HDRS) $(MEN) $(EXTRAS)
 
@@ -165,7 +215,7 @@ install-program:: $(EXES)
 
 install-man: $(MEN)
 	@men="$(MEN)" ;							\
-	 idir="$(install_prefix)$(man1dir)" ;				\
+	 idir="$(install_prefix)$(manNdir)" ;				\
 	 if [ ! -d $$idir ]; then					\
 	  $(INSTALL_DIRS) $$idir ;					\
 	 fi ;								\
@@ -195,7 +245,7 @@ uninstall-program::
 
 uninstall-man:
 	@men="$(MEN)" ;							\
-	 idir="$(install_prefix)$(man1dir)" ;				\
+	 idir="$(install_prefix)$(manNdir)" ;				\
 	 for man in $$men; do						\
 	   instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ;	\
 	   echo rm -f $$idir/$$instname ;				\
@@ -224,10 +274,12 @@ distdepend:: molecules.h
 	$(DEPEND) -w 0 -f - 						    \
 	-s '# DO NOT DELETE: updated by make distdepend' $(DEPEND_FLAGS) -- \
 	$(INCLUDES) $(DEFS) $(DEPEND_DEFINES) $(CFLAGS) $(X_CFLAGS) --	    \
-	$(SRCS) | 							    \
+	$(SRCS) 2>/dev/null |						    \
+	sort -d |							    \
 	(								    \
 	  awk '/^# .*Makefile.in ---/,/^# DO .*distdepend/' < Makefile.in ; \
-	  sed -e 's@ \./@ @g;s@ /[^ ]*@@g;/^.*:$$/d'			    \
+	  sed -e '/^#.*/d'						    \
+	      -e 's@ \./@ @g;s@ /[^ ]*@@g;/^.*:$$/d'			    \
 	      -e 's@\.\./\.\./utils@$$(UTILS_SRC)@g'			    \
 	      -e 's@\.\./glx/@@g'					    \
 	      -e 's@ \.\./@ $$(HACK_SRC)/@g'				    \
@@ -240,6 +292,7 @@ distdepend:: molecules.h
 	mv Makefile.in Makefile.in.bak &&				    \
 	mv /tmp/distdepend.$$$$ Makefile.in
 
+
 TAGS: tags
 tags:
 	find $(srcdir) -name '*.[chly]' -print | xargs etags -a
@@ -247,6 +300,44 @@ tags:
 echo_tarfiles:
 	@echo $(TARFILES)
 
+check_men:
+	@badmen="" ;							\
+	 for exe in $(EXES); do						\
+	   if ! [ -f $(srcdir)/$$exe.man ]; then			\
+	     badmen="$$badmen $$exe" ;					\
+	   fi ;								\
+	 done ;								\
+	 if [ -n "$$badmen" ]; then					\
+	   echo "" ;							\
+	   echo "Warning: The following programs have no manuals:" ;	\
+	   echo "" ;							\
+	   for m in $$badmen ; do					\
+	     echo "    $$m" ;						\
+	   done ;							\
+	 fi
+
+check_xml:
+	@badxml="" ;							\
+	 for exe in $(EXES); do						\
+	   if ! [ -f $(srcdir)/../config/$$exe.xml -o			\
+		  "$$exe" = xscreensaver-gl-helper ]; then		\
+	     badxml="$$badxml $$exe" ;					\
+	   fi ;								\
+	 done ;								\
+	 if [ -n "$$badxml" ]; then					\
+	   echo "" ;							\
+	   echo "Warning: The following programs have no configurators:" ; \
+	   echo "" ;							\
+	   for m in $$badxml ; do					\
+	     echo "    $$m" ;						\
+	   done ;							\
+	   echo "" ;							\
+	 fi
+
+distdepend:: check_men check_xml
+
+
+
 
 # Rules for noticing when the objects from the utils directory are out of
 # date with respect to their sources, and going and building them according
@@ -291,18 +382,30 @@ screenhack-gl.o: $(HACK_SRC)/screenhack.c
 
 CC_HACK		= $(CC) $(LDFLAGS)
 
+TRACK_OBJS=rotator.o trackball.o gltrackball.o
+
 ATLANTIS_OBJS = $(HACK_OBJS) dolphin.o shark.o swim.o whale.o xpm-ximage.o
 atlantis:	atlantis.o	$(ATLANTIS_OBJS)
-	$(CC_HACK) -o $@ $@.o	$(ATLANTIS_OBJS) $(HACK_LIBS) $(XPM_LIBS)
+	$(CC_HACK) -o $@ $@.o	$(ATLANTIS_OBJS) $(XPM_LIBS)
+
+ATUNNEL_OBJS = $(HACK_OBJS) tunnel_draw.o xpm-ximage.o
+atunnel:	atunnel.o $(ATUNNEL_OBJS)
+	$(CC_HACK) -o $@ $@.o   $(ATUNNEL_OBJS) $(XPM_LIBS)
 
 cage:		cage.o		$(HACK_OBJS)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HACK_LIBS)
 
-gears:		gears.o		$(HACK_OBJS)
-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HACK_LIBS)
+FLURRY_OBJS_1 = flurry-smoke.o flurry-spark.o flurry-star.o flurry-texture.o
+FLURRY_OBJS = $(FLURRY_OBJS_1) $(HACK_OBJS)
 
-moebius:	moebius.o		$(HACK_OBJS)
-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HACK_LIBS)
+flurry:		flurry.o $(FLURRY_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(FLURRY_OBJS) $(HACK_LIBS) -lm
+
+gears:		gears.o		$(HACK_OBJS) $(TRACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(TRACK_OBJS) $(HACK_LIBS)
+
+moebius:	moebius.o	$(TRACK_OBJS) $(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(TRACK_OBJS) $(HACK_OBJS) $(HACK_LIBS)
 
 pipes:		pipes.o		$(HACK_OBJS) pipeobjs.o buildlwo.o
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) pipeobjs.o buildlwo.o \
@@ -320,58 +423,60 @@ rubik:		rubik.o	$(HACK_OBJS)
 stairs:		stairs.o	$(HACK_OBJS)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HACK_LIBS)
 
-SPROINGIES = sproingiewrap.o buildlwo.o \
+SPROINGIES = sproingiewrap.o gllist.o \
 	     s1_1.o s1_2.o s1_3.o s1_4.o s1_5.o s1_6.o s1_b.o
 sproingies: sproingies.o $(HACK_OBJS) $(SPROINGIES)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(SPROINGIES) $(HACK_LIBS)
 
-lament:		lament.o	$(HACK_OBJS) xpm-ximage.o
-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) xpm-ximage.o $(XPM_LIBS)
+lament:		lament.o	$(TRACK_OBJS) xpm-ximage.o $(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(TRACK_OBJS) xpm-ximage.o $(HACK_OBJS) $(XPM_LIBS)
 
 B3D = b_sphere.o b_draw.o b_lockglue.o
 bubble3d:	bubble3d.o	$(HACK_OBJS) $(B3D)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(B3D) $(HACK_LIBS)
 
-glplanet:	glplanet.o	sphere.o xpm-ximage.o $(HACK_OBJS)
-	$(CC_HACK) -o $@ $@.o   sphere.o xpm-ximage.o $(HACK_OBJS) $(XPM_LIBS)
+PLANETHACKS=sphere.o xpm-ximage.o $(TRACK_OBJS)
+glplanet:	glplanet.o	$(PLANETHACKS) $(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o   $(PLANETHACKS) $(HACK_OBJS) $(XPM_LIBS)
 
-pulsar:		pulsar.o	$(HACK_OBJS)
-	$(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(HACK_LIBS)
+pulsar:		pulsar.o	$(HACK_OBJS) xpm-ximage.o
+	$(CC_HACK) -o $@ $@.o   $(HACK_OBJS) xpm-ximage.o $(XPM_LIBS)
 
 EXTRUSION_OBJS=extrusion.o extrusion-helix2.o extrusion-helix3.o    \
 	extrusion-helix4.o extrusion-joinoffset.o extrusion-screw.o \
-	extrusion-taper.o extrusion-twistoid.o
+	extrusion-taper.o extrusion-twistoid.o xpm-ximage.o $(TRACK_OBJS)
 extrusion:	$(EXTRUSION_OBJS) $(HACK_OBJS)
-	$(CC_HACK) -o $@ $(EXTRUSION_OBJS) $(HACK_OBJS) $(GLE_LIBS)
+	$(CC_HACK) -o $@ $(EXTRUSION_OBJS) $(HACK_OBJS) $(XPM_LIBS) $(GLE_LIBS)
 
-sierpinski3d:	sierpinski3d.o	$(HACK_OBJS)
-	$(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(HACK_LIBS)
+sierpinski3d:	sierpinski3d.o	$(HACK_OBJS) $(TRACK_OBJS)
+	$(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(TRACK_OBJS) $(HACK_LIBS)
 
-gflux:		gflux.o		$(HACK_OBJS) $(GRAB_OBJS)
-	$(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(GRAB_OBJS) $(HACK_LIBS)
+gflux:		gflux.o		$(HACK_OBJS) $(TRACK_OBJS) $(GRAB_OBJS)
+	$(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(TRACK_OBJS) $(GRAB_OBJS) $(HACK_LIBS)
 
 SW_OBJS=starwars.o glut_stroke.o glut_swidth.o
 starwars:	$(SW_OBJS) $(HACK_OBJS)
 	$(CC_HACK) -o $@ $(SW_OBJS) $(HACK_OBJS) $(HACK_LIBS)
 
-GLT_OBJS=gltext.o glut_stroke.o glut_swidth.o tube.o
+GLT_OBJS=gltext.o glut_stroke.o glut_swidth.o tube.o $(TRACK_OBJS)
 gltext:	$(GLT_OBJS) $(HACK_OBJS)
 	$(CC_HACK) -o $@ $(GLT_OBJS) $(HACK_OBJS) $(HACK_LIBS)
 
-dangerball:	dangerball.o	sphere.o tube.o $(HACK_OBJS)
-	$(CC_HACK) -o $@ $@.o   sphere.o tube.o $(HACK_OBJS) $(HACK_LIBS)
+DB_OBJS=sphere.o tube.o $(TRACK_OBJS)
+dangerball:	dangerball.o	$(DB_OBJS) $(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(DB_OBJS) $(HACK_OBJS) $(HACK_LIBS)
 
 circuit:	circuit.o	$(HACK_OBJS) font-ximage.o
 	$(CC_HACK) -o $@ $@.o   $(HACK_OBJS) font-ximage.o $(HACK_LIBS)
 
-menger:		menger.o	$(HACK_OBJS)
-	$(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(HACK_LIBS)
+menger:		menger.o	$(HACK_OBJS) $(TRACK_OBJS)
+	$(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(TRACK_OBJS) $(HACK_LIBS)
 
-engine:		engine.o	$(HACK_OBJS)
-	$(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(HACK_LIBS)
+engine:		engine.o	$(HACK_OBJS) $(TRACK_OBJS)
+	$(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(TRACK_OBJS) $(HACK_LIBS)
 
-flipscreen3d:	flipscreen3d.o	$(HACK_OBJS) $(GRAB_OBJS)
-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(GRAB_OBJS) $(HACK_LIBS)
+flipscreen3d:	flipscreen3d.o	$(HACK_OBJS) $(GRAB_OBJS) $(TRACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(GRAB_OBJS) $(TRACK_OBJS) $(HACK_LIBS)
 
 glsnake:	glsnake.o	$(HACK_OBJS)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HACK_LIBS)
@@ -385,10 +490,77 @@ glforestfire:	glforestfire.o	$(HACK_OBJS) xpm-ximage.o
 sballs:		sballs.o	$(HACK_OBJS) xpm-ximage.o
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) xpm-ximage.o $(XPM_LIBS)
 
+cubenetic:	cubenetic.o	$(HACK_OBJS) $(TRACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(TRACK_OBJS) $(HACK_LIBS)
+
+spheremonics:	spheremonics.o	$(HACK_OBJS) $(TRACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(TRACK_OBJS) $(HACK_LIBS)
+
+LLOBJS=marching.o xpm-ximage.o $(TRACK_OBJS) $(HACK_OBJS)
+lavalite:	lavalite.o	$(LLOBJS)
+	$(CC_HACK) -o $@ $@.o	$(LLOBJS)  $(XPM_LIBS)
+
+queens:		queens.o	$(TRACK_OBJS) $(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o   $(TRACK_OBJS) $(HACK_OBJS) $(HACK_LIBS)
+
+CHESSOBJS=chessmodels.o $(TRACK_OBJS) $(HACK_OBJS)
+endgame:	endgame.o	$(CHESSOBJS)
+	$(CC_HACK) -o $@ $@.o   $(CHESSOBJS) $(HACK_LIBS)
+
+glblur:	glblur.o		$(HACK_OBJS) $(TRACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(TRACK_OBJS) $(HACK_LIBS)
+
+TOASTOBJS1=\
+  toaster.o toaster_base.o toaster_handle.o toaster_handle2.o \
+  toaster_jet.o toaster_knob.o toaster_slots.o toaster_wing.o \
+  toast.o toast2.o
+TOASTOBJS=flyingtoasters.o gllist.o $(TOASTOBJS1) xpm-ximage.o
+flyingtoasters:	$(TOASTOBJS)	      $(TRACK_OBJS) $(HACK_OBJS)
+	$(CC_HACK) -o $@ $(TOASTOBJS) $(TRACK_OBJS) $(HACK_OBJS) $(XPM_LIBS)
+
+COWOBJS1=\
+  cow_face.o cow_hide.o cow_hoofs.o cow_horns.o cow_tail.o cow_udder.o
+COWOBJS=bouncingcow.o gllist.o $(COWOBJS1) xpm-ximage.o
+bouncingcow:	$(COWOBJS)	    $(TRACK_OBJS) $(HACK_OBJS)
+	$(CC_HACK) -o $@ $(COWOBJS) $(TRACK_OBJS) $(HACK_OBJS) $(XPM_LIBS)
+
+glslideshow:	glslideshow.o	$(HACK_OBJS) $(GRAB_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(GRAB_OBJS) $(HACK_LIBS)
+
+jigglypuff:	jigglypuff.o	xpm-ximage.o $(HACK_OBJS) $(TRACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	xpm-ximage.o $(HACK_OBJS) $(TRACK_OBJS) $(XPM_LIBS)
+
+klein:		klein.o		$(HACK_OBJS) $(TRACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(TRACK_OBJS) $(HACK_LIBS)
+
+hypertorus:	hypertorus.o	$(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HACK_LIBS)
+
+glmatrix:	glmatrix.o	$(HACK_OBJS) xpm-ximage.o
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) xpm-ximage.o $(XPM_LIBS)
+
+cubestorm:	cubestorm.o	$(TRACK_OBJS) $(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(TRACK_OBJS) $(HACK_OBJS) $(HACK_LIBS)
+
+glknots:	glknots.o	tube.o $(TRACK_OBJS) $(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	tube.o $(TRACK_OBJS) $(HACK_OBJS) $(HACK_LIBS)
+
+blocktube:	blocktube.o	$(HACK_OBJS) xpm-ximage.o
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) xpm-ximage.o $(XPM_LIBS)
+
+flipflop:	flipflop.o	$(TRACK_OBJS) $(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(TRACK_OBJS) $(HACK_OBJS) $(HACK_LIBS)
+
+antspotlight:	antspotlight.o	$(TRACK_OBJS) $(GRAB_OBJS) $(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(TRACK_OBJS) $(GRAB_OBJS) $(HACK_OBJS) $(HACK_LIBS)
+
+polytopes:	polytopes.o	$(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HACK_LIBS)
+
 # This one works differently (it's not xlock-like.)
 #
 STONER_OBJS=stonerview.o stonerview-move.o stonerview-osc.o stonerview-view.o \
-	    $(UTILS_BIN)/yarandom.o
+	    $(UTILS_BIN)/yarandom.o $(UTILS_BIN)/usleep.o
 stonerview:	$(STONER_OBJS)
 	$(CC_HACK) -o $@ $(STONER_OBJS) $(HACK_LIBS)
 
@@ -403,26 +575,75 @@ molecules.h:
 	done ;								\
 	mv $$tmp molecules.h
 
-molecule:	molecule.o	sphere.o tube.o $(HACK_OBJS)
-	$(CC_HACK) -o $@ $@.o   sphere.o tube.o $(HACK_OBJS) $(HACK_LIBS)
+MOLECULEOBJS=sphere.o tube.o $(TRACK_OBJS)
+molecule:	molecule.o	$(MOLECULEOBJS) $(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o   $(MOLECULEOBJS) $(HACK_OBJS) $(HACK_LIBS)
+
+gleidescope:	gleidescope.o xpm-ximage.o $(HACK_OBJS) $(GRAB_OBJS)
+	$(CC_HACK) -o $@ $@.o xpm-ximage.o $(HACK_OBJS) $(GRAB_OBJS) $(XPM_LIBS)
+
+mirrorblob:	mirrorblob.o	$(HACK_OBJS) $(GRAB_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(GRAB_OBJS) $(XPM_LIBS)
 
-dnalogo:	dnalogo.o	tube.o $(HACK_OBJS)
-	$(CC_HACK) -o $@ $@.o   tube.o $(HACK_OBJS) $(HACK_LIBS)
+blinkbox:	blinkbox.o	sphere.o $(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	sphere.o $(HACK_OBJS) $(HACK_LIBS)
+
+noof:	noof.o			$(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HACK_LIBS)
+
+PH_OBJS=polyhedra-gl.o $(TRACK_OBJS)
+polyhedra:	polyhedra.o 	$(PH_OBJS) $(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(PH_OBJS) $(HACK_OBJS) $(HACK_LIBS)
+
+antinspect:	antinspect.o	$(TRACK_OBJS) $(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(TRACK_OBJS) $(HACK_OBJS) $(HACK_LIBS)
+
+providence:	providence.o	$(TRACK_OBJS) $(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(TRACK_OBJS) $(HACK_OBJS) $(HACK_LIBS)
+
+dnalogo:	dnalogo.o	tube.o $(TRACK_OBJS) $(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o   tube.o $(TRACK_OBJS) $(HACK_OBJS) $(HACK_LIBS)
 
 ##############################################################################
 #
 # DO NOT DELETE: updated by make distdepend
-# $(srcdir)/DO $(srcdir)/NOT $(srcdir)/DELETE: $(srcdir)/updated $(srcdir)/by $(srcdir)/make $(srcdir)/distdepend
 
-xscreensaver-gl-helper.o: ../../config.h
-atlantis.o: ../../config.h
+antinspect.o: ../../config.h
+antinspect.o: $(srcdir)/gltrackball.h
+antspotlight.o: $(srcdir)/ants.h
+antspotlight.o: ../../config.h
+antspotlight.o: $(srcdir)/gltrackball.h
+antspotlight.o: $(srcdir)/grab-ximage.h
+antspotlight.o: $(srcdir)/rotator.h
 atlantis.o: $(srcdir)/atlantis.h
-atlantis.o: $(srcdir)/xpm-ximage.h
+atlantis.o: ../../config.h
 atlantis.o: $(HACK_SRC)/images/sea-texture.xpm
+atlantis.o: $(srcdir)/xpm-ximage.h
+atunnel.o: ../../config.h
+atunnel.o: $(HACK_SRC)/images/tunnel0.xpm
+atunnel.o: $(HACK_SRC)/images/tunnel1.xpm
+atunnel.o: $(HACK_SRC)/images/tunnel2.xpm
+atunnel.o: $(HACK_SRC)/images/tunnel3.xpm
+atunnel.o: $(HACK_SRC)/images/tunnel4.xpm
+atunnel.o: $(HACK_SRC)/images/tunnel5.xpm
+atunnel.o: $(srcdir)/tunnel_draw.h
+atunnel.o: $(srcdir)/xpm-ximage.h
 b_draw.o: $(srcdir)/bubble3d.h
 b_draw.o: ../../config.h
+blinkbox.o: ../../config.h
+blinkbox.o: $(srcdir)/sphere.h
 b_lockglue.o: $(srcdir)/bubble3d.h
 b_lockglue.o: ../../config.h
+blocktube.o: ../../config.h
+blocktube.o: $(HACK_SRC)/images/blocktube.xpm
+blocktube.o: $(srcdir)/xpm-ximage.h
+bouncingcow.o: ../../config.h
+bouncingcow.o: $(srcdir)/gllist.h
+bouncingcow.o: $(srcdir)/gltrackball.h
+bouncingcow.o: $(srcdir)/rotator.h
+bouncingcow.o: $(srcdir)/xpm-ximage.h
+boxed.o: $(srcdir)/boxed.h
+boxed.o: ../../config.h
 b_sphere.o: $(srcdir)/bubble3d.h
 b_sphere.o: ../../config.h
 bubble3d.o: $(srcdir)/bubble3d.h
@@ -430,103 +651,239 @@ bubble3d.o: ../../config.h
 buildlwo.o: $(srcdir)/buildlwo.h
 cage.o: ../../config.h
 cage.o: $(srcdir)/e_textures.h
+chessmodels.o: $(srcdir)/chessmodels.h
+circuit.o: ../../config.h
+circuit.o: $(srcdir)/font-ximage.h
+cow_face.o: $(srcdir)/gllist.h
+cow_hide.o: $(srcdir)/gllist.h
+cow_hoofs.o: $(srcdir)/gllist.h
+cow_horns.o: $(srcdir)/gllist.h
+cow_tail.o: $(srcdir)/gllist.h
+cow_udder.o: $(srcdir)/gllist.h
+cubenetic.o: ../../config.h
+cubenetic.o: $(srcdir)/gltrackball.h
+cubenetic.o: $(srcdir)/rotator.h
+cubestorm.o: ../../config.h
+cubestorm.o: $(srcdir)/gltrackball.h
+cubestorm.o: $(srcdir)/rotator.h
+dangerball.o: ../../config.h
+dangerball.o: $(srcdir)/gltrackball.h
+dangerball.o: $(srcdir)/rotator.h
+dangerball.o: $(srcdir)/sphere.h
+dangerball.o: $(srcdir)/tube.h
 dolphin.o: $(srcdir)/atlantis.h
+endgame.o: $(srcdir)/chessgames.h
+endgame.o: $(srcdir)/chessmodels.h
+endgame.o: ../../config.h
+endgame.o: $(srcdir)/gltrackball.h
+engine.o: ../../config.h
+engine.o: $(srcdir)/gltrackball.h
+engine.o: $(srcdir)/rotator.h
+extrusion-helix2.o: ../../config.h
+extrusion-helix3.o: ../../config.h
+extrusion-helix4.o: ../../config.h
+extrusion-joinoffset.o: ../../config.h
+extrusion.o: ../../config.h
+extrusion.o: $(srcdir)/rotator.h
+extrusion.o: $(srcdir)/xpm-ximage.h
+extrusion-screw.o: ../../config.h
+extrusion-taper.o: ../../config.h
+extrusion-twistoid.o: ../../config.h
+flipflop.o: ../../config.h
+flipflop.o: $(srcdir)/gltrackball.h
+flipscreen3d.o: ../../config.h
+flipscreen3d.o: $(srcdir)/gltrackball.h
+flipscreen3d.o: $(srcdir)/grab-ximage.h
+flurry.o: ../../config.h
+flurry.o: $(srcdir)/flurry.h
+flurry.o: $(srcdir)/gltrackball.h
+flurry.o: $(srcdir)/rotator.h
+flurry-smoke.o: ../../config.h
+flurry-smoke.o: $(srcdir)/flurry.h
+flurry-smoke.o: $(srcdir)/gltrackball.h
+flurry-smoke.o: $(srcdir)/rotator.h
+flurry-spark.o: ../../config.h
+flurry-spark.o: $(srcdir)/flurry.h
+flurry-spark.o: $(srcdir)/gltrackball.h
+flurry-spark.o: $(srcdir)/rotator.h
+flurry-star.o: ../../config.h
+flurry-star.o: $(srcdir)/flurry.h
+flurry-star.o: $(srcdir)/gltrackball.h
+flurry-star.o: $(srcdir)/rotator.h
+flurry-texture.o: ../../config.h
+flurry-texture.o: $(srcdir)/flurry.h
+flurry-texture.o: $(srcdir)/gltrackball.h
+flurry-texture.o: $(srcdir)/rotator.h
+flyingtoasters.o: ../../config.h
+flyingtoasters.o: $(srcdir)/gllist.h
+flyingtoasters.o: $(srcdir)/gltrackball.h
+flyingtoasters.o: $(HACK_SRC)/images/chromesphere.xpm
+flyingtoasters.o: $(HACK_SRC)/images/toast.xpm
+flyingtoasters.o: $(srcdir)/xpm-ximage.h
+font-ximage.o: ../../config.h
+fps.o: ../../config.h
 gears.o: ../../config.h
+gears.o: $(srcdir)/gltrackball.h
+gears.o: $(srcdir)/rotator.h
+gflux.o: ../../config.h
+gflux.o: $(srcdir)/gltrackball.h
+gflux.o: $(srcdir)/grab-ximage.h
+glblur.o: ../../config.h
+glblur.o: $(srcdir)/gltrackball.h
+glblur.o: $(srcdir)/rotator.h
+gleidescope.o: ../../config.h
+gleidescope.o: $(srcdir)/grab-ximage.h
+gleidescope.o: $(srcdir)/xpm-ximage.h
+glforestfire.o: ../../config.h
+glforestfire.o: $(HACK_SRC)/images/ground.xpm
+glforestfire.o: $(HACK_SRC)/images/tree.xpm
+glforestfire.o: $(srcdir)/xpm-ximage.h
+glknots.o: ../../config.h
+glknots.o: $(srcdir)/gltrackball.h
+glknots.o: $(srcdir)/rotator.h
+glknots.o: $(srcdir)/tube.h
+gllist.o: $(srcdir)/gllist.h
+glmatrix.o: ../../config.h
+glmatrix.o: $(srcdir)/gllist.h
+glmatrix.o: $(HACK_SRC)/images/matrix3.xpm
+glmatrix.o: $(srcdir)/xpm-ximage.h
+glplanet.o: ../../config.h
+glplanet.o: $(srcdir)/gltrackball.h
+glplanet.o: $(HACK_SRC)/images/earth.xpm
+glplanet.o: $(srcdir)/rotator.h
+glplanet.o: $(srcdir)/sphere.h
+glplanet.o: $(srcdir)/xpm-ximage.h
+glslideshow.o: ../../config.h
+glslideshow.o: $(srcdir)/grab-ximage.h
+glsnake.o: ../../config.h
+gltext.o: ../../config.h
+gltext.o: $(srcdir)/gltrackball.h
+gltext.o: $(srcdir)/glut_roman.h
+gltext.o: $(srcdir)/glutstroke.h
+gltext.o: $(srcdir)/rotator.h
+gltext.o: $(srcdir)/tube.h
+gltrackball.o: ../../config.h
+gltrackball.o: $(srcdir)/gltrackball.h
+gltrackball.o: $(srcdir)/trackball.h
+glut_stroke.o: ../../config.h
+glut_stroke.o: $(srcdir)/glutstroke.h
+glut_swidth.o: ../../config.h
+glut_swidth.o: $(srcdir)/glutstroke.h
+grab-ximage.o: ../../config.h
+hypertorus.o: ../../config.h
+jigglypuff.o: ../../config.h
+jigglypuff.o: $(srcdir)/gltrackball.h
+jigglypuff.o: $(HACK_SRC)/images/jigglymap.xpm
+jigglypuff.o: $(srcdir)/xpm-ximage.h
+klein.o: ../../config.h
+klein.o: $(srcdir)/gltrackball.h
+klein.o: $(srcdir)/rotator.h
 lament.o: ../../config.h
-lament.o: $(srcdir)/xpm-ximage.h
+lament.o: $(srcdir)/gltrackball.h
 lament.o: $(HACK_SRC)/images/lament.xpm
+lament.o: $(srcdir)/rotator.h
+lament.o: $(srcdir)/xpm-ximage.h
+lavalite.o: ../../config.h
+lavalite.o: $(srcdir)/gltrackball.h
+lavalite.o: $(srcdir)/marching.h
+lavalite.o: $(srcdir)/rotator.h
+lavalite.o: $(srcdir)/xpm-ximage.h
+marching.o: ../../config.h
+marching.o: $(srcdir)/marching.h
+menger.o: ../../config.h
+menger.o: $(srcdir)/gltrackball.h
+menger.o: $(srcdir)/rotator.h
+mirrorblob.o: ../../config.h
+mirrorblob.o: $(srcdir)/grab-ximage.h
 moebius.o: ../../config.h
 moebius.o: $(srcdir)/e_textures.h
+moebius.o: $(srcdir)/gltrackball.h
+moebius.o: $(srcdir)/rotator.h
+molecule.o: ../../config.h
+molecule.o: $(srcdir)/gltrackball.h
+molecule.o: molecules.h
+molecule.o: $(srcdir)/rotator.h
+molecule.o: $(srcdir)/sphere.h
+molecule.o: $(srcdir)/tube.h
 morph3d.o: ../../config.h
+noof.o: ../../config.h
 pipeobjs.o: $(srcdir)/buildlwo.h
-pipes.o: ../../config.h
 pipes.o: $(srcdir)/buildlwo.h
+pipes.o: ../../config.h
+polyhedra-gl.o: ../../config.h
+polyhedra-gl.o: $(srcdir)/gltrackball.h
+polyhedra-gl.o: $(srcdir)/polyhedra.h
+polyhedra-gl.o: $(srcdir)/rotator.h
+polyhedra.o: ../../config.h
+polyhedra.o: $(srcdir)/polyhedra.h
+polytopes.o: ../../config.h
+providence.o: ../../config.h
+providence.o: $(srcdir)/gltrackball.h
+pulsar.o: ../../config.h
+pulsar.o: $(srcdir)/xpm-ximage.h
+queens.o: ../../config.h
+queens.o: $(srcdir)/gltrackball.h
+rotator.o: ../../config.h
+rotator.o: $(srcdir)/rotator.h
 rubik.o: ../../config.h
-s1_1.o: $(srcdir)/buildlwo.h
-s1_2.o: $(srcdir)/buildlwo.h
-s1_3.o: $(srcdir)/buildlwo.h
-s1_4.o: $(srcdir)/buildlwo.h
-s1_5.o: $(srcdir)/buildlwo.h
-s1_6.o: $(srcdir)/buildlwo.h
-s1_b.o: $(srcdir)/buildlwo.h
+s1_1.o: $(srcdir)/gllist.h
+s1_2.o: $(srcdir)/gllist.h
+s1_3.o: $(srcdir)/gllist.h
+s1_4.o: $(srcdir)/gllist.h
+s1_5.o: $(srcdir)/gllist.h
+s1_6.o: $(srcdir)/gllist.h
+s1_b.o: $(srcdir)/gllist.h
+sballs.o: ../../config.h
+sballs.o: $(HACK_SRC)/images/sball-bg.xpm
+sballs.o: $(HACK_SRC)/images/sball.xpm
+sballs.o: $(srcdir)/xpm-ximage.h
 shark.o: $(srcdir)/atlantis.h
+sierpinski3d.o: ../../config.h
+sierpinski3d.o: $(srcdir)/gltrackball.h
+sierpinski3d.o: $(srcdir)/rotator.h
+spheremonics.o: ../../config.h
+spheremonics.o: $(srcdir)/gltrackball.h
+spheremonics.o: $(srcdir)/rotator.h
+sphere.o: ../../config.h
 sproingies.o: ../../config.h
-sproingies.o: $(srcdir)/buildlwo.h
+sproingies.o: $(srcdir)/gllist.h
 sproingiewrap.o: ../../config.h
 stairs.o: ../../config.h
 stairs.o: $(srcdir)/e_textures.h
-superquadrics.o: ../../config.h
-swim.o: ../../config.h
-swim.o: $(srcdir)/atlantis.h
-whale.o: $(srcdir)/atlantis.h
-xlock-gl.o: ../../config.h
-fps.o: ../../config.h
-xpm-ximage.o: ../../config.h
-glplanet.o: ../../config.h
-glplanet.o: $(srcdir)/sphere.h
-glplanet.o: $(HACK_SRC)/images/earth.xbm
-glplanet.o: $(srcdir)/xpm-ximage.h
-pulsar.o: ../../config.h
-extrusion.o: ../../config.h
-extrusion-helix2.o: ../../config.h
-extrusion-helix3.o: ../../config.h
-extrusion-helix4.o: ../../config.h
-extrusion-joinoffset.o: ../../config.h
-extrusion-screw.o: ../../config.h
-extrusion-taper.o: ../../config.h
-extrusion-twistoid.o: ../../config.h
-sierpinski3d.o: ../../config.h
-gflux.o: ../../config.h
-gflux.o: $(srcdir)/grab-ximage.h
-stonerview.o: ../../config.h
-stonerview.o: $(srcdir)/stonerview-move.h
+starwars.o: ../../config.h
+starwars.o: $(srcdir)/glut_roman.h
+starwars.o: $(srcdir)/glutstroke.h
 stonerview-move.o: ../../config.h
-stonerview-move.o: $(srcdir)/stonerview-osc.h
 stonerview-move.o: $(srcdir)/stonerview-move.h
+stonerview-move.o: $(srcdir)/stonerview-osc.h
+stonerview.o: ../../config.h
 stonerview-osc.o: ../../config.h
 stonerview-osc.o: $(srcdir)/stonerview-osc.h
+stonerview.o: $(srcdir)/stonerview-move.h
 stonerview-view.o: ../../config.h
-stonerview-view.o: $(srcdir)/stonerview-osc.h
 stonerview-view.o: $(srcdir)/stonerview-move.h
-starwars.o: ../../config.h
-starwars.o: $(srcdir)/glutstroke.h
-starwars.o: $(srcdir)/glut_roman.h
-glut_stroke.o: ../../config.h
-glut_stroke.o: $(srcdir)/glutstroke.h
-glut_swidth.o: ../../config.h
-glut_swidth.o: $(srcdir)/glutstroke.h
-gltext.o: ../../config.h
-gltext.o: $(srcdir)/tube.h
-gltext.o: $(srcdir)/glutstroke.h
-gltext.o: $(srcdir)/glut_roman.h
-molecule.o: ../../config.h
-molecule.o: $(srcdir)/sphere.h
-molecule.o: $(srcdir)/tube.h
-molecule.o: molecules.h
-dangerball.o: ../../config.h
-dangerball.o: $(srcdir)/sphere.h
-dangerball.o: $(srcdir)/tube.h
-sphere.o: ../../config.h
-sphere.o: $(srcdir)/tube.h
+stonerview-view.o: $(srcdir)/stonerview-osc.h
+superquadrics.o: ../../config.h
+swim.o: $(srcdir)/atlantis.h
+swim.o: ../../config.h
+toast2.o: $(srcdir)/gllist.h
+toaster_base.o: $(srcdir)/gllist.h
+toaster_handle2.o: $(srcdir)/gllist.h
+toaster_handle.o: $(srcdir)/gllist.h
+toaster_jet.o: $(srcdir)/gllist.h
+toaster_knob.o: $(srcdir)/gllist.h
+toaster.o: $(srcdir)/gllist.h
+toaster_slots.o: $(srcdir)/gllist.h
+toaster_wing.o: $(srcdir)/gllist.h
+toast.o: $(srcdir)/gllist.h
+trackball.o: ../../config.h
+trackball.o: $(srcdir)/trackball.h
 tube.o: ../../config.h
 tube.o: $(srcdir)/tube.h
-circuit.o: ../../config.h
-circuit.o: $(srcdir)/font-ximage.h
-menger.o: ../../config.h
-engine.o: ../../config.h
-flipscreen3d.o: ../../config.h
-flipscreen3d.o: $(srcdir)/grab-ximage.h
-font-ximage.o: ../../config.h
-grab-ximage.o: ../../config.h
-glsnake.o: ../../config.h
-boxed.o: $(srcdir)/boxed.h
-boxed.o: ../../config.h
-glforestfire.o: ../../config.h
-glforestfire.o: $(srcdir)/xpm-ximage.h
-glforestfire.o: $(HACK_SRC)/images/ground.xpm
-glforestfire.o: $(HACK_SRC)/images/tree.xpm
-sballs.o: ../../config.h
-sballs.o: $(srcdir)/xpm-ximage.h
-sballs.o: $(HACK_SRC)/images/sball.xpm
-sballs.o: $(HACK_SRC)/images/sball-bg.xpm
+tunnel_draw.o: ../../config.h
+tunnel_draw.o: $(srcdir)/tunnel_draw.h
+whale.o: $(srcdir)/atlantis.h
+xlock-gl.o: ../../config.h
+xpm-ximage.o: ../../config.h
+xscreensaver-gl-helper.o: ../../config.h