X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2FMakefile.in;h=48382559afb98773cbe580eac8d45e0402fbf239;hb=4cecfc89e5e889c7232693897c06168fb378bd5c;hp=25ddc2ca98a8af4e60bc32949845428746d63b32;hpb=723c9eeee862766a1534b2ce17b78adbfac1c3be;p=xscreensaver

diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in
index 25ddc2ca..48382559 100644
--- a/hacks/glx/Makefile.in
+++ b/hacks/glx/Makefile.in
@@ -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@
@@ -81,7 +85,9 @@ SRCS		= xscreensaver-gl-helper.c \
 		  menger.c engine.c flipscreen3d.c font-ximage.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
+		  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
 
 OBJS		= xscreensaver-gl-helper.o \
 		  atlantis.o b_draw.o b_lockglue.o b_sphere.o bubble3d.o \
@@ -99,14 +105,16 @@ OBJS		= xscreensaver-gl-helper.o \
 		  menger.o engine.o flipscreen3d.o font-ximage.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
+		  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
 
 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 cubenetic spheremonics lavalite queens \
-		  endgame
+		  endgame glblur flurry
 GLE_EXES	= extrusion
 GL_UTIL_EXES	= xscreensaver-gl-helper
 HACK_EXES	= @GL_EXES@ @GLE_EXES@
@@ -123,7 +131,7 @@ 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 marching.h rotator.h trackball.h gltrackball.h \
-		  chessmodels.h
+		  chessmodels.h chessgames.h gllist.h flurry.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 \
@@ -132,7 +140,7 @@ GL_MEN		= atlantis.man boxed.man bubble3d.man cage.man circuit.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
+		  endgame.man flurry.man glblur.man
 MEN		= @GL_MEN@
 EXTRAS		= README Makefile.in
 
@@ -178,7 +186,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 ;								\
@@ -208,7 +216,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 ;				\
@@ -354,6 +362,12 @@ atlantis:	atlantis.o	$(ATLANTIS_OBJS)
 cage:		cage.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) $(TRACK_OBJS)
+
+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)
 
@@ -376,7 +390,7 @@ 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)
@@ -425,8 +439,8 @@ circuit:	circuit.o	$(HACK_OBJS) font-ximage.o
 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)
@@ -460,6 +474,10 @@ 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)
+
+
 # This one works differently (it's not xlock-like.)
 #
 STONER_OBJS=stonerview.o stonerview-move.o stonerview-osc.o stonerview-view.o \
@@ -518,10 +536,13 @@ 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
@@ -534,6 +555,22 @@ extrusion-taper.o: ../../config.h
 extrusion-twistoid.o: ../../config.h
 flipscreen3d.o: ../../config.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: $(srcdir)/flurry.h
+flurry-smoke.o: $(srcdir)/gltrackball.h
+flurry-smoke.o: $(srcdir)/rotator.h
+flurry-spark.o: $(srcdir)/flurry.h
+flurry-spark.o: $(srcdir)/gltrackball.h
+flurry-spark.o: $(srcdir)/rotator.h
+flurry-star.o: $(srcdir)/flurry.h
+flurry-star.o: $(srcdir)/gltrackball.h
+flurry-star.o: $(srcdir)/rotator.h
+flurry-texture.o: $(srcdir)/flurry.h
+flurry-texture.o: $(srcdir)/gltrackball.h
+flurry-texture.o: $(srcdir)/rotator.h
 font-ximage.o: ../../config.h
 fps.o: ../../config.h
 gears.o: ../../config.h
@@ -541,10 +578,14 @@ gears.o: $(srcdir)/gltrackball.h
 gears.o: $(srcdir)/rotator.h
 gflux.o: ../../config.h
 gflux.o: $(srcdir)/grab-ximage.h
+glblur.o: ../../config.h
+glblur.o: $(srcdir)/gltrackball.h
+glblur.o: $(srcdir)/rotator.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
+gllist.o: $(srcdir)/gllist.h
 glplanet.o: ../../config.h
 glplanet.o: $(srcdir)/gltrackball.h
 glplanet.o: $(HACK_SRC)/images/earth.xpm
@@ -602,13 +643,13 @@ 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
@@ -621,8 +662,8 @@ spheremonics.o: ../../config.h
 spheremonics.o: $(srcdir)/gltrackball.h
 spheremonics.o: $(srcdir)/rotator.h
 sphere.o: ../../config.h
-sproingies.o: $(srcdir)/buildlwo.h
 sproingies.o: ../../config.h
+sproingies.o: $(srcdir)/gllist.h
 sproingiewrap.o: ../../config.h
 stairs.o: ../../config.h
 stairs.o: $(srcdir)/e_textures.h