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

diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in
index 8b7fd044..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.
 
@@ -94,7 +94,9 @@ SRCS		= xscreensaver-gl-helper.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
+		  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 \
@@ -121,7 +123,9 @@ OBJS		= xscreensaver-gl-helper.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
+		  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 \
@@ -130,7 +134,9 @@ GL_EXES		= cage gears moebius pipes sproingies stairs superquadrics \
 		  glforestfire sballs cubenetic spheremonics lavalite queens \
 		  endgame glblur flurry atunnel flyingtoasters bouncingcow \
 		  glslideshow jigglypuff klein hypertorus glmatrix cubestorm \
-		  glknots blocktube flipflop antspotlight polytopes
+		  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@
@@ -148,7 +154,7 @@ HDRS		= atlantis.h bubble3d.h buildlwo.h e_textures.h xpm-ximage.h \
 		  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
+		  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 \
@@ -161,7 +167,9 @@ GL_MEN		= atlantis.man boxed.man bubble3d.man cage.man circuit.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
+		  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 dxf2gl.pl
 
@@ -378,11 +386,11 @@ 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) $(HACK_LIBS) $(XPM_LIBS)
+	$(CC_HACK) -o $@ $@.o   $(ATUNNEL_OBJS) $(XPM_LIBS)
 
 cage:		cage.o		$(HACK_OBJS)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HACK_LIBS)
@@ -432,7 +440,7 @@ glplanet:	glplanet.o	$(PLANETHACKS) $(HACK_OBJS)
 	$(CC_HACK) -o $@ $@.o   $(PLANETHACKS) $(HACK_OBJS) $(XPM_LIBS)
 
 pulsar:		pulsar.o	$(HACK_OBJS) xpm-ximage.o
-	$(CC_HACK) -o $@ $@.o   $(HACK_OBJS) xpm-ximage.o $(HACK_LIBS) $(XPM_LIBS)
+	$(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 \
@@ -538,7 +546,7 @@ 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 $(HACK_LIBS) $(XPM_LIBS)
+	$(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)
@@ -552,7 +560,7 @@ polytopes:	polytopes.o	$(HACK_OBJS)
 # 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)
 
@@ -571,13 +579,37 @@ MOLECULEOBJS=sphere.o tube.o $(TRACK_OBJS)
 molecule:	molecule.o	$(MOLECULEOBJS) $(HACK_OBJS)
 	$(CC_HACK) -o $@ $@.o   $(MOLECULEOBJS) $(HACK_OBJS) $(HACK_LIBS)
 
-dnalogo:	dnalogo.o	tube.o $(HACK_OBJS)
-	$(CC_HACK) -o $@ $@.o   tube.o $(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)
+
+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
 
+antinspect.o: ../../config.h
+antinspect.o: $(srcdir)/gltrackball.h
 antspotlight.o: $(srcdir)/ants.h
 antspotlight.o: ../../config.h
 antspotlight.o: $(srcdir)/gltrackball.h
@@ -591,10 +623,15 @@ 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
@@ -694,6 +731,9 @@ 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
@@ -753,6 +793,8 @@ 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
@@ -764,10 +806,19 @@ 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: $(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
@@ -806,9 +857,9 @@ stonerview-move.o: ../../config.h
 stonerview-move.o: $(srcdir)/stonerview-move.h
 stonerview-move.o: $(srcdir)/stonerview-osc.h
 stonerview.o: ../../config.h
-stonerview.o: $(srcdir)/stonerview-move.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-move.h
 stonerview-view.o: $(srcdir)/stonerview-osc.h