X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2FMakefile.in;h=a7958bb401e2f48fc43c37f71808033766ced4e3;hb=6cee540bdbb571485cd5e519f89f389faebd0495;hp=49e42729c68894463f09a74c9dcd96b8482e441d;hpb=13dbc569cdc6e29019722c0ef9b932a925efbcad;p=xscreensaver

diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in
index 49e42729..a7958bb4 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,14 @@ 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
+		  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
 
 OBJS		= xscreensaver-gl-helper.o \
 		  atlantis.o b_draw.o b_lockglue.o b_sphere.o bubble3d.o \
@@ -99,13 +110,22 @@ 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
+		  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
 
 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
+		  glforestfire sballs cubenetic spheremonics lavalite queens \
+		  endgame glblur flurry atunnel flyingtoasters bouncingcow \
+		  glslideshow jigglypuff klein
 GLE_EXES	= extrusion
 GL_UTIL_EXES	= xscreensaver-gl-helper
 HACK_EXES	= @GL_EXES@ @GLE_EXES@
@@ -121,7 +141,8 @@ 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 marching.h rotator.h trackball.h gltrackball.h
+		  glut_roman.h marching.h rotator.h trackball.h gltrackball.h \
+		  chessmodels.h chessgames.h gllist.h flurry.h tunnel_draw.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 \
@@ -129,9 +150,12 @@ GL_MEN		= atlantis.man boxed.man bubble3d.man cage.man circuit.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
+		  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
 MEN		= @GL_MEN@
-EXTRAS		= README Makefile.in
+EXTRAS		= README Makefile.in dxf2gl.pl
 
 TARFILES	= $(SRCS) $(HDRS) $(MEN) $(EXTRAS)
 
@@ -175,7 +199,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 ;								\
@@ -205,7 +229,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 ;				\
@@ -348,9 +372,19 @@ 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)
 
+ATUNNEL_OBJS = $(HACK_OBJS) tunnel_draw.o xpm-ximage.o
+atunnel:	atunnel.o $(ATUNNEL_OBJS)
+	$(CC_HACK) -o $@ $@.o   $(ATUNNEL_OBJS) $(HACK_LIBS) $(XPM_LIBS)
+
 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)
+
+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)
 
@@ -373,7 +407,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)
@@ -401,8 +435,8 @@ extrusion:	$(EXTRUSION_OBJS) $(HACK_OBJS)
 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)
@@ -422,11 +456,11 @@ 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)
+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)
@@ -453,6 +487,37 @@ lavalite:	lavalite.o	$(LLOBJS)
 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)
+
+
 # This one works differently (it's not xlock-like.)
 #
 STONER_OBJS=stonerview.o stonerview-move.o stonerview-osc.o stonerview-view.o \
@@ -486,10 +551,21 @@ atlantis.o: $(srcdir)/atlantis.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: $(srcdir)/tunnel_draw.h
+atunnel.o: $(srcdir)/xpm-ximage.h
 b_draw.o: $(srcdir)/bubble3d.h
 b_draw.o: ../../config.h
 b_lockglue.o: $(srcdir)/bubble3d.h
 b_lockglue.o: ../../config.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
@@ -499,8 +575,15 @@ 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
@@ -510,7 +593,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
@@ -522,24 +611,54 @@ extrusion-screw.o: ../../config.h
 extrusion-taper.o: ../../config.h
 extrusion-twistoid.o: ../../config.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: $(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
+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
 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
 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
@@ -555,6 +674,13 @@ glut_stroke.o: $(srcdir)/glutstroke.h
 glut_swidth.o: ../../config.h
 glut_swidth.o: $(srcdir)/glutstroke.h
 grab-ximage.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)/gltrackball.h
 lament.o: $(HACK_SRC)/images/lament.xpm
@@ -591,13 +717,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
@@ -610,8 +736,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
@@ -631,10 +757,22 @@ 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
+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