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

diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in
index e82ec781..5b8f0280 100644
--- a/hacks/glx/Makefile.in
+++ b/hacks/glx/Makefile.in
@@ -38,11 +38,12 @@ X_CFLAGS	= @X_CFLAGS@
 X_LIBS		= @X_LIBS@
 X_PRE_LIBS	= @X_PRE_LIBS@
 X_EXTRA_LIBS	= @X_EXTRA_LIBS@
+XMU_LIBS	= @XMU_LIBS@
 
 # Note: see comment in ../../driver/Makefile.in for explanation of X_LIBS, etc.
 #
 HACK_PRE	= $(LIBS) $(X_LIBS)
-HACK_POST	= $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) -lm
+HACK_POST     = $(X_PRE_LIBS) -lXt -lX11 $(XMU_LIBS) -lXext $(X_EXTRA_LIBS) -lm
 HACK_POST2	= @GL_LIBS@ @HACK_LIBS@ $(HACK_POST)
 HACK_LIBS	= $(HACK_PRE)                       $(HACK_POST2)
 XPM_LIBS	= $(HACK_PRE)            @XPM_LIBS@ $(HACK_POST2)
@@ -53,7 +54,7 @@ HACK_BIN	= ..
 UTILS_SRC	= $(HACK_SRC)/../utils
 UTILS_BIN	= $(HACK_BIN)/../utils
 
-INCLUDES	= -I$(srcdir) -I$(UTILS_SRC) -I$(HACK_SRC) -I../.. @INCLUDES@
+INCLUDES	= -I. -I$(srcdir) -I$(UTILS_SRC) -I$(HACK_SRC) -I../.. @INCLUDES@
 
 UTIL_SRCS	= $(UTILS_SRC)/colors.c $(UTILS_SRC)/hsv.c \
 		  $(UTILS_SRC)/resources.c $(UTILS_SRC)/usleep.c \
@@ -70,10 +71,15 @@ SRCS		= xscreensaver-gl-helper.c \
 		  morph3d.c pipeobjs.c pipes.c rubik.c s1_1.c s1_2.c s1_3.c \
 		  s1_4.c s1_5.c s1_6.c s1_b.c shark.c sproingies.c \
 		  sproingiewrap.c stairs.c superquadrics.c swim.c whale.c \
-		  xlock-gl.c xpm-ximage.c glplanet.c pulsar.c \
+		  xlock-gl.c fps.c xpm-ximage.c glplanet.c pulsar.c \
 		  extrusion.c extrusion-helix2.c extrusion-helix3.c \
 		  extrusion-helix4.c extrusion-joinoffset.c extrusion-screw.c \
-		  extrusion-taper.c extrusion-twistoid.c sierpinski3d.c gflux.c
+		  extrusion-taper.c extrusion-twistoid.c sierpinski3d.c \
+		  gflux.c stonerview.c stonerview-move.c stonerview-osc.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
 
 OBJS		= xscreensaver-gl-helper.o \
 		  atlantis.o b_draw.o b_lockglue.o b_sphere.o bubble3d.o \
@@ -81,28 +87,39 @@ OBJS		= xscreensaver-gl-helper.o \
 		  morph3d.o pipeobjs.o pipes.o rubik.o s1_1.o s1_2.o s1_3.o \
 		  s1_4.o s1_5.o s1_6.o s1_b.o shark.o sproingies.o \
 		  sproingiewrap.o stairs.o superquadrics.o swim.o whale.o \
-		  xlock-gl.o xpm-ximage.o glplanet.o pulsar.o \
+		  xlock-gl.o fps.o xpm-ximage.o glplanet.o pulsar.o \
 		  extrusion.o extrusion-helix2.o extrusion-helix3.o \
 		  extrusion-helix4.o extrusion-joinoffset.o extrusion-screw.o \
-		  extrusion-taper.o extrusion-twistoid.o sierpinski3d.o gflux.o
-
-UTIL_EXES	= xscreensaver-gl-helper
-GL_EXES		= $(UTIL_EXES) \
-		  cage gears moebius pipes sproingies stairs superquadrics \
+		  extrusion-taper.o extrusion-twistoid.o sierpinski3d.o \
+		  gflux.o stonerview.o stonerview-move.o stonerview-osc.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
+
+GL_EXES		= cage gears moebius pipes sproingies stairs superquadrics \
 		  morph3d rubik atlantis lament bubble3d glplanet pulsar \
-		  sierpinski3d gflux
+		  sierpinski3d gflux stonerview starwars gltext molecule \
+		  dangerball circuit menger engine flipscreen3d glsnake boxed \
+		  glforestfire sballs
 GLE_EXES	= extrusion
+GL_UTIL_EXES	= xscreensaver-gl-helper
 HACK_EXES	= @GL_EXES@ @GLE_EXES@
-EXES		= $(HACK_EXES)
+GRAB_OBJS	= $(UTILS_BIN)/grabclient.o grab-ximage.o
+EXES		= @GL_UTIL_EXES@ $(HACK_EXES)
 
-HACK_OBJS	= screenhack-gl.o xlock-gl.o $(HACK_BIN)/xlockmore.o \
+HACK_OBJS	= screenhack-gl.o xlock-gl.o fps.o $(HACK_BIN)/xlockmore.o \
 		  $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \
 		  $(UTILS_BIN)/visual-gl.o $(UTILS_BIN)/usleep.o \
 		  $(UTILS_BIN)/yarandom.o $(UTILS_BIN)/hsv.o \
 		  $(UTILS_BIN)/colors.o
 
-HDRS		= atlantis.h bubble3d.h buildlwo.h e_textures.h xpm-ximage.h
-GL_MEN		= lament.man xscreensaver-gl-helper.man gflux.man
+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
 MEN		= @GL_MEN@
 EXTRAS		= README Makefile.in
 
@@ -119,70 +136,74 @@ install-strip:
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 
 # the hacks, in $HACKDIR
-install-program:: $(HACK_EXES)
-	@if [ ! -d $(install_prefix)$(HACKDIR) ]; then			\
-	  $(INSTALL_DIRS) $(install_prefix)$(HACKDIR) ;			\
-	 fi ;								\
-	exes="$(HACK_EXES)" ;						\
-	for program in $$exes; do					\
-	  echo $(INSTALL_PROGRAM) $$program				\
-	    $(install_prefix)$(HACKDIR)/$$program ;			\
-	  $(INSTALL_PROGRAM) $$program					\
-	    $(install_prefix)$(HACKDIR)/$$program ;			\
-	done
+install-program:: $(EXES)
+	@exes="$(HACK_EXES)" ;						\
+	 idir="$(install_prefix)$(HACKDIR)" ;				\
+	 if [ "$$exes" != "" ]; then					\
+	   if [ ! -d $$idir ]; then					\
+	     $(INSTALL_DIRS) $$idir ;					\
+	   fi ;								\
+	   for program in $$exes; do					\
+	     echo $(INSTALL_PROGRAM) $$program $$idir/$$program ;	\
+		  $(INSTALL_PROGRAM) $$program $$idir/$$program ;	\
+	   done ;							\
+	 fi
 
 # the xscreensaver-gl-helper program, in $bindir
-install-program:: $(HACK_EXES)
-	@if [ ! -d $(install_prefix)$(bindir) ]; then			\
-	  $(INSTALL_DIRS) $(install_prefix)$(bindir) ;			\
-	 fi ;								\
-	exes="$(UTIL_EXES)" ;						\
-	for program in $$exes; do					\
-	  echo $(INSTALL_PROGRAM) $$program				\
-	    $(install_prefix)$(bindir)/$$program ;			\
-	  $(INSTALL_PROGRAM) $$program					\
-	    $(install_prefix)$(bindir)/$$program ;			\
-	done
+install-program:: $(EXES)
+	@exes="@GL_UTIL_EXES@" ;					\
+	 idir="$(install_prefix)$(bindir)" ;				\
+	 if [ "$$exes" != "" ]; then					\
+	   if [ ! -d $$idir ]; then					\
+	     $(INSTALL_DIRS) $$idir ;					\
+	   fi ;								\
+	   for program in $$exes; do					\
+	     echo $(INSTALL_PROGRAM) $$program $$idir/$$program ;	\
+		  $(INSTALL_PROGRAM) $$program $$idir/$$program ;	\
+	   done ;							\
+	 fi
 
 install-man: $(MEN)
 	@men="$(MEN)" ;							\
-	if [ ! -d $(install_prefix)$(man1dir) ]; then			\
-	  $(INSTALL_DIRS) $(install_prefix)$(man1dir) ;			\
+	 idir="$(install_prefix)$(man1dir)" ;				\
+	 if [ ! -d $$idir ]; then					\
+	  $(INSTALL_DIRS) $$idir ;					\
 	 fi ;								\
-	for man in $$men; do						\
-	  instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ;	\
-	  echo $(INSTALL_DATA) $(srcdir)/$$man				\
-	   $(install_prefix)$(man1dir)/$$instname ;			\
-	  $(INSTALL_DATA) $(srcdir)/$$man				\
-	    $(install_prefix)$(man1dir)/$$instname ;			\
-	done
+	 for man in $$men; do						\
+	   instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ;	\
+	   echo $(INSTALL_DATA) $(srcdir)/$$man $$idir/$$instname ;	\
+		$(INSTALL_DATA) $(srcdir)/$$man $$idir/$$instname ;	\
+	 done
 
 # the hacks, in $HACKDIR
 uninstall-program::
 	@exes="$(HACK_EXES)" ;						\
-	for program in $$exes; do					\
-	  echo rm -f $(install_prefix)$(HACKDIR)/$$program ;		\
-	  rm -f $(install_prefix)$(HACKDIR)/$$program ;			\
-	done
+	 idir="$(install_prefix)$(HACKDIR)" ;				\
+	 for program in $$exes; do					\
+	   echo rm -f $$idir/$$program ;				\
+		rm -f $$idir/$$program ;				\
+	 done
 
 # the xscreensaver-gl-helper program, in $bindir
 uninstall-program::
-	@exes="$(UTIL_EXES)" ;						\
-	for program in $$exes; do					\
-	  echo rm -f $(install_prefix)$(bindir)/$$program ;		\
-	  rm -f $(install_prefix)$(bindir)/$$program ;			\
+	@exes="$(GL_UTIL_EXES)" ;					\
+	 idir="$(install_prefix)$(bindir)" ;				\
+	 for program in $$exes; do					\
+	   echo rm -f $$idir/$$program ;				\
+		rm -f $$idir/$$program ;				\
 	done
 
 uninstall-man:
 	@men="$(MEN)" ;							\
-	for man in $$men; do						\
-	  instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ;	\
-	  echo rm -f $(install_prefix)$(man1dir)/$$instname ;		\
-	  rm -f $(install_prefix)$(man1dir)/$$instname ;		\
+	 idir="$(install_prefix)$(man1dir)" ;				\
+	 for man in $$men; do						\
+	   instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ;	\
+	   echo rm -f $$idir/$$instname ;				\
+		rm -f $$idir/$$instname ;				\
 	done
 
 clean:
-	-rm -f *.o a.out core $(EXES)
+	-rm -f *.o a.out core $(EXES) molecules.h
 
 distclean: clean
 	-rm -f Makefile TAGS *~ "#"*
@@ -198,7 +219,7 @@ depend:
 # close.  This excludes dependencies on files in /usr/include, etc.  It tries
 # to include only dependencies on files which are themselves a part of this
 # package.
-distdepend::
+distdepend:: molecules.h
 	@echo updating dependencies in `pwd`/Makefile.in... ;		    \
 	$(DEPEND) -w 0 -f - 						    \
 	-s '# DO NOT DELETE: updated by make distdepend' $(DEPEND_FLAGS) -- \
@@ -212,7 +233,8 @@ distdepend::
 	      -e 's@ \.\./@ $$(HACK_SRC)/@g'				    \
 	      -e 's@ \([^$$]\)@ $$(srcdir)/\1@g'			    \
 	      -e 's@ $$(srcdir)/\(.*config.h\)@ \1@g'			    \
-	      -e 's@ $$(HACK_SRC)/\(.*config.h\)@ ../\1@g' ;		    \
+	      -e 's@ $$(HACK_SRC)/\(.*config.h\)@ ../\1@g'		    \
+	      -e 's@ $$(srcdir)/\(.*molecules.h\)@ \1@g' ;		    \
 	  echo ''							    \
 	) > /tmp/distdepend.$$$$ &&					    \
 	mv Makefile.in Makefile.in.bak &&				    \
@@ -269,9 +291,9 @@ screenhack-gl.o: $(HACK_SRC)/screenhack.c
 
 CC_HACK		= $(CC) $(LDFLAGS)
 
-atlantis:	atlantis.o	$(HACK_OBJS) dolphin.o shark.o swim.o whale.o
-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) dolphin.o shark.o swim.o whale.o \
-				$(HACK_LIBS)
+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)
 
 cage:		cage.o		$(HACK_OBJS)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HACK_LIBS)
@@ -310,8 +332,8 @@ 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	$(HACK_OBJS) xpm-ximage.o
-	$(CC_HACK) -o $@ $@.o   $(HACK_OBJS) xpm-ximage.o $(XPM_LIBS)
+glplanet:	glplanet.o	sphere.o xpm-ximage.o $(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o   sphere.o xpm-ximage.o $(HACK_OBJS) $(XPM_LIBS)
 
 pulsar:		pulsar.o	$(HACK_OBJS)
 	$(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(HACK_LIBS)
@@ -325,171 +347,101 @@ extrusion:	$(EXTRUSION_OBJS) $(HACK_OBJS)
 sierpinski3d:	sierpinski3d.o	$(HACK_OBJS)
 	$(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(HACK_LIBS)
 
-gflux:		gflux.o		$(HACK_OBJS)
+gflux:		gflux.o		$(HACK_OBJS) $(GRAB_OBJS)
+	$(CC_HACK) -o $@ $@.o   $(HACK_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
+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)
+
+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)
+
+engine:		engine.o	$(HACK_OBJS)
 	$(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(HACK_LIBS)
 
+flipscreen3d:	flipscreen3d.o	$(HACK_OBJS) $(GRAB_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(GRAB_OBJS) $(HACK_LIBS)
+
+glsnake:	glsnake.o	$(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HACK_LIBS)
+
+boxed:		boxed.o		$(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HACK_LIBS)
+
+glforestfire:	glforestfire.o	$(HACK_OBJS) xpm-ximage.o
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) xpm-ximage.o $(XPM_LIBS)
+
+sballs:		sballs.o	$(HACK_OBJS) xpm-ximage.o
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) xpm-ximage.o $(XPM_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
+stonerview:	$(STONER_OBJS)
+	$(CC_HACK) -o $@ $(STONER_OBJS) $(HACK_LIBS)
+
+molecules.h:
+	@tmp=molecules.h.$$$$ ;						\
+	rm -f $$tmp ;							\
+	echo "building molecules.h from $(HACK_SRC)/images/molecules/*.pdb" ; \
+	for f in $(HACK_SRC)/images/molecules/*.pdb ; do		\
+	  $(SHELL) $(UTILS_SRC)/ad2c "$$f" |				\
+	    sed 's/",$$/\\n"/' >> $$tmp ;				\
+	  echo ',' >> $$tmp ;						\
+	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)
+
+dnalogo:	dnalogo.o	tube.o $(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o   tube.o $(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: $(UTILS_SRC)/utils.h
 xscreensaver-gl-helper.o: ../../config.h
-xscreensaver-gl-helper.o: $(UTILS_SRC)/visual.h
-atlantis.o: $(HACK_SRC)/xlockmore.h
 atlantis.o: ../../config.h
-atlantis.o: $(HACK_SRC)/xlockmoreI.h
-atlantis.o: $(HACK_SRC)/screenhack.h
-atlantis.o: $(UTILS_SRC)/yarandom.h
-atlantis.o: $(UTILS_SRC)/usleep.h
-atlantis.o: $(UTILS_SRC)/resources.h
-atlantis.o: $(UTILS_SRC)/hsv.h
-atlantis.o: $(UTILS_SRC)/colors.h
-atlantis.o: $(UTILS_SRC)/grabscreen.h
-atlantis.o: $(UTILS_SRC)/visual.h
-atlantis.o: $(UTILS_SRC)/xshm.h
 atlantis.o: $(srcdir)/atlantis.h
+atlantis.o: $(srcdir)/xpm-ximage.h
+atlantis.o: $(HACK_SRC)/images/sea-texture.xpm
 b_draw.o: $(srcdir)/bubble3d.h
-b_draw.o: $(HACK_SRC)/xlockmoreI.h
-b_draw.o: $(HACK_SRC)/screenhack.h
 b_draw.o: ../../config.h
-b_draw.o: $(UTILS_SRC)/yarandom.h
-b_draw.o: $(UTILS_SRC)/usleep.h
-b_draw.o: $(UTILS_SRC)/resources.h
-b_draw.o: $(UTILS_SRC)/hsv.h
-b_draw.o: $(UTILS_SRC)/colors.h
-b_draw.o: $(UTILS_SRC)/grabscreen.h
-b_draw.o: $(UTILS_SRC)/visual.h
-b_draw.o: $(UTILS_SRC)/xshm.h
 b_lockglue.o: $(srcdir)/bubble3d.h
-b_lockglue.o: $(HACK_SRC)/xlockmoreI.h
-b_lockglue.o: $(HACK_SRC)/screenhack.h
 b_lockglue.o: ../../config.h
-b_lockglue.o: $(UTILS_SRC)/yarandom.h
-b_lockglue.o: $(UTILS_SRC)/usleep.h
-b_lockglue.o: $(UTILS_SRC)/resources.h
-b_lockglue.o: $(UTILS_SRC)/hsv.h
-b_lockglue.o: $(UTILS_SRC)/colors.h
-b_lockglue.o: $(UTILS_SRC)/grabscreen.h
-b_lockglue.o: $(UTILS_SRC)/visual.h
-b_lockglue.o: $(UTILS_SRC)/xshm.h
-b_lockglue.o: $(HACK_SRC)/xlockmore.h
 b_sphere.o: $(srcdir)/bubble3d.h
-b_sphere.o: $(HACK_SRC)/xlockmoreI.h
-b_sphere.o: $(HACK_SRC)/screenhack.h
 b_sphere.o: ../../config.h
-b_sphere.o: $(UTILS_SRC)/yarandom.h
-b_sphere.o: $(UTILS_SRC)/usleep.h
-b_sphere.o: $(UTILS_SRC)/resources.h
-b_sphere.o: $(UTILS_SRC)/hsv.h
-b_sphere.o: $(UTILS_SRC)/colors.h
-b_sphere.o: $(UTILS_SRC)/grabscreen.h
-b_sphere.o: $(UTILS_SRC)/visual.h
-b_sphere.o: $(UTILS_SRC)/xshm.h
 bubble3d.o: $(srcdir)/bubble3d.h
-bubble3d.o: $(HACK_SRC)/xlockmoreI.h
-bubble3d.o: $(HACK_SRC)/screenhack.h
 bubble3d.o: ../../config.h
-bubble3d.o: $(UTILS_SRC)/yarandom.h
-bubble3d.o: $(UTILS_SRC)/usleep.h
-bubble3d.o: $(UTILS_SRC)/resources.h
-bubble3d.o: $(UTILS_SRC)/hsv.h
-bubble3d.o: $(UTILS_SRC)/colors.h
-bubble3d.o: $(UTILS_SRC)/grabscreen.h
-bubble3d.o: $(UTILS_SRC)/visual.h
-bubble3d.o: $(UTILS_SRC)/xshm.h
 buildlwo.o: $(srcdir)/buildlwo.h
-cage.o: $(HACK_SRC)/xlockmore.h
 cage.o: ../../config.h
-cage.o: $(HACK_SRC)/xlockmoreI.h
-cage.o: $(HACK_SRC)/screenhack.h
-cage.o: $(UTILS_SRC)/yarandom.h
-cage.o: $(UTILS_SRC)/usleep.h
-cage.o: $(UTILS_SRC)/resources.h
-cage.o: $(UTILS_SRC)/hsv.h
-cage.o: $(UTILS_SRC)/colors.h
-cage.o: $(UTILS_SRC)/grabscreen.h
-cage.o: $(UTILS_SRC)/visual.h
-cage.o: $(UTILS_SRC)/xshm.h
 cage.o: $(srcdir)/e_textures.h
 dolphin.o: $(srcdir)/atlantis.h
-gears.o: $(HACK_SRC)/xlockmore.h
 gears.o: ../../config.h
-gears.o: $(HACK_SRC)/xlockmoreI.h
-gears.o: $(HACK_SRC)/screenhack.h
-gears.o: $(UTILS_SRC)/yarandom.h
-gears.o: $(UTILS_SRC)/usleep.h
-gears.o: $(UTILS_SRC)/resources.h
-gears.o: $(UTILS_SRC)/hsv.h
-gears.o: $(UTILS_SRC)/colors.h
-gears.o: $(UTILS_SRC)/grabscreen.h
-gears.o: $(UTILS_SRC)/visual.h
-gears.o: $(UTILS_SRC)/xshm.h
-lament.o: $(HACK_SRC)/xlockmore.h
 lament.o: ../../config.h
-lament.o: $(HACK_SRC)/xlockmoreI.h
-lament.o: $(HACK_SRC)/screenhack.h
-lament.o: $(UTILS_SRC)/yarandom.h
-lament.o: $(UTILS_SRC)/usleep.h
-lament.o: $(UTILS_SRC)/resources.h
-lament.o: $(UTILS_SRC)/hsv.h
-lament.o: $(UTILS_SRC)/colors.h
-lament.o: $(UTILS_SRC)/grabscreen.h
-lament.o: $(UTILS_SRC)/visual.h
-lament.o: $(UTILS_SRC)/xshm.h
 lament.o: $(srcdir)/xpm-ximage.h
 lament.o: $(HACK_SRC)/images/lament.xpm
-moebius.o: $(HACK_SRC)/xlockmore.h
 moebius.o: ../../config.h
-moebius.o: $(HACK_SRC)/xlockmoreI.h
-moebius.o: $(HACK_SRC)/screenhack.h
-moebius.o: $(UTILS_SRC)/yarandom.h
-moebius.o: $(UTILS_SRC)/usleep.h
-moebius.o: $(UTILS_SRC)/resources.h
-moebius.o: $(UTILS_SRC)/hsv.h
-moebius.o: $(UTILS_SRC)/colors.h
-moebius.o: $(UTILS_SRC)/grabscreen.h
-moebius.o: $(UTILS_SRC)/visual.h
-moebius.o: $(UTILS_SRC)/xshm.h
 moebius.o: $(srcdir)/e_textures.h
-morph3d.o: $(HACK_SRC)/xlockmore.h
 morph3d.o: ../../config.h
-morph3d.o: $(HACK_SRC)/xlockmoreI.h
-morph3d.o: $(HACK_SRC)/screenhack.h
-morph3d.o: $(UTILS_SRC)/yarandom.h
-morph3d.o: $(UTILS_SRC)/usleep.h
-morph3d.o: $(UTILS_SRC)/resources.h
-morph3d.o: $(UTILS_SRC)/hsv.h
-morph3d.o: $(UTILS_SRC)/colors.h
-morph3d.o: $(UTILS_SRC)/grabscreen.h
-morph3d.o: $(UTILS_SRC)/visual.h
-morph3d.o: $(UTILS_SRC)/xshm.h
 pipeobjs.o: $(srcdir)/buildlwo.h
-pipes.o: $(HACK_SRC)/xlockmore.h
 pipes.o: ../../config.h
-pipes.o: $(HACK_SRC)/xlockmoreI.h
-pipes.o: $(HACK_SRC)/screenhack.h
-pipes.o: $(UTILS_SRC)/yarandom.h
-pipes.o: $(UTILS_SRC)/usleep.h
-pipes.o: $(UTILS_SRC)/resources.h
-pipes.o: $(UTILS_SRC)/hsv.h
-pipes.o: $(UTILS_SRC)/colors.h
-pipes.o: $(UTILS_SRC)/grabscreen.h
-pipes.o: $(UTILS_SRC)/visual.h
-pipes.o: $(UTILS_SRC)/xshm.h
 pipes.o: $(srcdir)/buildlwo.h
-rubik.o: $(HACK_SRC)/xlockmore.h
 rubik.o: ../../config.h
-rubik.o: $(HACK_SRC)/xlockmoreI.h
-rubik.o: $(HACK_SRC)/screenhack.h
-rubik.o: $(UTILS_SRC)/yarandom.h
-rubik.o: $(UTILS_SRC)/usleep.h
-rubik.o: $(UTILS_SRC)/resources.h
-rubik.o: $(UTILS_SRC)/hsv.h
-rubik.o: $(UTILS_SRC)/colors.h
-rubik.o: $(UTILS_SRC)/grabscreen.h
-rubik.o: $(UTILS_SRC)/visual.h
-rubik.o: $(UTILS_SRC)/xshm.h
 s1_1.o: $(srcdir)/buildlwo.h
 s1_2.o: $(srcdir)/buildlwo.h
 s1_3.o: $(srcdir)/buildlwo.h
@@ -498,118 +450,24 @@ s1_5.o: $(srcdir)/buildlwo.h
 s1_6.o: $(srcdir)/buildlwo.h
 s1_b.o: $(srcdir)/buildlwo.h
 shark.o: $(srcdir)/atlantis.h
-sproingies.o: $(HACK_SRC)/xlockmoreI.h
-sproingies.o: $(HACK_SRC)/screenhack.h
 sproingies.o: ../../config.h
-sproingies.o: $(UTILS_SRC)/yarandom.h
-sproingies.o: $(UTILS_SRC)/usleep.h
-sproingies.o: $(UTILS_SRC)/resources.h
-sproingies.o: $(UTILS_SRC)/hsv.h
-sproingies.o: $(UTILS_SRC)/colors.h
-sproingies.o: $(UTILS_SRC)/grabscreen.h
-sproingies.o: $(UTILS_SRC)/visual.h
-sproingies.o: $(UTILS_SRC)/xshm.h
 sproingies.o: $(srcdir)/buildlwo.h
-sproingiewrap.o: $(HACK_SRC)/xlockmore.h
 sproingiewrap.o: ../../config.h
-sproingiewrap.o: $(HACK_SRC)/xlockmoreI.h
-sproingiewrap.o: $(HACK_SRC)/screenhack.h
-sproingiewrap.o: $(UTILS_SRC)/yarandom.h
-sproingiewrap.o: $(UTILS_SRC)/usleep.h
-sproingiewrap.o: $(UTILS_SRC)/resources.h
-sproingiewrap.o: $(UTILS_SRC)/hsv.h
-sproingiewrap.o: $(UTILS_SRC)/colors.h
-sproingiewrap.o: $(UTILS_SRC)/grabscreen.h
-sproingiewrap.o: $(UTILS_SRC)/visual.h
-sproingiewrap.o: $(UTILS_SRC)/xshm.h
-stairs.o: $(HACK_SRC)/xlockmore.h
 stairs.o: ../../config.h
-stairs.o: $(HACK_SRC)/xlockmoreI.h
-stairs.o: $(HACK_SRC)/screenhack.h
-stairs.o: $(UTILS_SRC)/yarandom.h
-stairs.o: $(UTILS_SRC)/usleep.h
-stairs.o: $(UTILS_SRC)/resources.h
-stairs.o: $(UTILS_SRC)/hsv.h
-stairs.o: $(UTILS_SRC)/colors.h
-stairs.o: $(UTILS_SRC)/grabscreen.h
-stairs.o: $(UTILS_SRC)/visual.h
-stairs.o: $(UTILS_SRC)/xshm.h
 stairs.o: $(srcdir)/e_textures.h
-superquadrics.o: $(HACK_SRC)/xlockmore.h
 superquadrics.o: ../../config.h
-superquadrics.o: $(HACK_SRC)/xlockmoreI.h
-superquadrics.o: $(HACK_SRC)/screenhack.h
-superquadrics.o: $(UTILS_SRC)/yarandom.h
-superquadrics.o: $(UTILS_SRC)/usleep.h
-superquadrics.o: $(UTILS_SRC)/resources.h
-superquadrics.o: $(UTILS_SRC)/hsv.h
-superquadrics.o: $(UTILS_SRC)/colors.h
-superquadrics.o: $(UTILS_SRC)/grabscreen.h
-superquadrics.o: $(UTILS_SRC)/visual.h
-superquadrics.o: $(UTILS_SRC)/xshm.h
-swim.o: $(HACK_SRC)/xlockmoreI.h
-swim.o: $(HACK_SRC)/screenhack.h
 swim.o: ../../config.h
-swim.o: $(UTILS_SRC)/yarandom.h
-swim.o: $(UTILS_SRC)/usleep.h
-swim.o: $(UTILS_SRC)/resources.h
-swim.o: $(UTILS_SRC)/hsv.h
-swim.o: $(UTILS_SRC)/colors.h
-swim.o: $(UTILS_SRC)/grabscreen.h
-swim.o: $(UTILS_SRC)/visual.h
-swim.o: $(UTILS_SRC)/xshm.h
 swim.o: $(srcdir)/atlantis.h
 whale.o: $(srcdir)/atlantis.h
-xlock-gl.o: $(HACK_SRC)/screenhack.h
 xlock-gl.o: ../../config.h
-xlock-gl.o: $(UTILS_SRC)/yarandom.h
-xlock-gl.o: $(UTILS_SRC)/usleep.h
-xlock-gl.o: $(UTILS_SRC)/resources.h
-xlock-gl.o: $(UTILS_SRC)/hsv.h
-xlock-gl.o: $(UTILS_SRC)/colors.h
-xlock-gl.o: $(UTILS_SRC)/grabscreen.h
-xlock-gl.o: $(UTILS_SRC)/visual.h
-xlock-gl.o: $(HACK_SRC)/xlockmoreI.h
-xlock-gl.o: $(UTILS_SRC)/xshm.h
+fps.o: ../../config.h
 xpm-ximage.o: ../../config.h
-glplanet.o: $(HACK_SRC)/xlockmore.h
 glplanet.o: ../../config.h
-glplanet.o: $(HACK_SRC)/xlockmoreI.h
-glplanet.o: $(HACK_SRC)/screenhack.h
-glplanet.o: $(UTILS_SRC)/yarandom.h
-glplanet.o: $(UTILS_SRC)/usleep.h
-glplanet.o: $(UTILS_SRC)/resources.h
-glplanet.o: $(UTILS_SRC)/hsv.h
-glplanet.o: $(UTILS_SRC)/colors.h
-glplanet.o: $(UTILS_SRC)/grabscreen.h
-glplanet.o: $(UTILS_SRC)/visual.h
-glplanet.o: $(UTILS_SRC)/xshm.h
+glplanet.o: $(srcdir)/sphere.h
 glplanet.o: $(HACK_SRC)/images/earth.xbm
 glplanet.o: $(srcdir)/xpm-ximage.h
-pulsar.o: $(HACK_SRC)/xlockmore.h
 pulsar.o: ../../config.h
-pulsar.o: $(HACK_SRC)/xlockmoreI.h
-pulsar.o: $(HACK_SRC)/screenhack.h
-pulsar.o: $(UTILS_SRC)/yarandom.h
-pulsar.o: $(UTILS_SRC)/usleep.h
-pulsar.o: $(UTILS_SRC)/resources.h
-pulsar.o: $(UTILS_SRC)/hsv.h
-pulsar.o: $(UTILS_SRC)/colors.h
-pulsar.o: $(UTILS_SRC)/grabscreen.h
-pulsar.o: $(UTILS_SRC)/visual.h
-pulsar.o: $(UTILS_SRC)/xshm.h
 extrusion.o: ../../config.h
-extrusion.o: $(HACK_SRC)/xlockmore.h
-extrusion.o: $(HACK_SRC)/xlockmoreI.h
-extrusion.o: $(HACK_SRC)/screenhack.h
-extrusion.o: $(UTILS_SRC)/yarandom.h
-extrusion.o: $(UTILS_SRC)/usleep.h
-extrusion.o: $(UTILS_SRC)/resources.h
-extrusion.o: $(UTILS_SRC)/hsv.h
-extrusion.o: $(UTILS_SRC)/colors.h
-extrusion.o: $(UTILS_SRC)/grabscreen.h
-extrusion.o: $(UTILS_SRC)/visual.h
-extrusion.o: $(UTILS_SRC)/xshm.h
 extrusion-helix2.o: ../../config.h
 extrusion-helix3.o: ../../config.h
 extrusion-helix4.o: ../../config.h
@@ -617,28 +475,58 @@ extrusion-joinoffset.o: ../../config.h
 extrusion-screw.o: ../../config.h
 extrusion-taper.o: ../../config.h
 extrusion-twistoid.o: ../../config.h
-sierpinski3d.o: $(HACK_SRC)/xlockmore.h
 sierpinski3d.o: ../../config.h
-sierpinski3d.o: $(HACK_SRC)/xlockmoreI.h
-sierpinski3d.o: $(HACK_SRC)/screenhack.h
-sierpinski3d.o: $(UTILS_SRC)/yarandom.h
-sierpinski3d.o: $(UTILS_SRC)/usleep.h
-sierpinski3d.o: $(UTILS_SRC)/resources.h
-sierpinski3d.o: $(UTILS_SRC)/hsv.h
-sierpinski3d.o: $(UTILS_SRC)/colors.h
-sierpinski3d.o: $(UTILS_SRC)/grabscreen.h
-sierpinski3d.o: $(UTILS_SRC)/visual.h
-sierpinski3d.o: $(UTILS_SRC)/xshm.h
-gflux.o: $(HACK_SRC)/xlockmore.h
 gflux.o: ../../config.h
-gflux.o: $(HACK_SRC)/xlockmoreI.h
-gflux.o: $(HACK_SRC)/screenhack.h
-gflux.o: $(UTILS_SRC)/yarandom.h
-gflux.o: $(UTILS_SRC)/usleep.h
-gflux.o: $(UTILS_SRC)/resources.h
-gflux.o: $(UTILS_SRC)/hsv.h
-gflux.o: $(UTILS_SRC)/colors.h
-gflux.o: $(UTILS_SRC)/grabscreen.h
-gflux.o: $(UTILS_SRC)/visual.h
-gflux.o: $(UTILS_SRC)/xshm.h
+gflux.o: $(srcdir)/grab-ximage.h
+stonerview.o: ../../config.h
+stonerview.o: $(srcdir)/stonerview-move.h
+stonerview-move.o: ../../config.h
+stonerview-move.o: $(srcdir)/stonerview-osc.h
+stonerview-move.o: $(srcdir)/stonerview-move.h
+stonerview-osc.o: ../../config.h
+stonerview-osc.o: $(srcdir)/stonerview-osc.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
+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