X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2FMakefile.in;h=06b84f7884a33a714801900254ba738cff00440d;hp=0fb600971a1070144ee93181775bb2b045b15afb;hb=82c5080773aae5e72ec155327c075775e023d2ee;hpb=a445bdd3e3ba4abbee441844b6665b4c3c13d48c

diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in
index 0fb60097..06b84f78 100644
--- a/hacks/glx/Makefile.in
+++ b/hacks/glx/Makefile.in
@@ -70,13 +70,13 @@ 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 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
+		  gltext.c molecule.c dangerball.c sphere.c tube.c
 
 OBJS		= xscreensaver-gl-helper.o \
 		  atlantis.o b_draw.o b_lockglue.o b_sphere.o bubble3d.o \
@@ -84,13 +84,13 @@ 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 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
+		  gltext.o molecule.o dangerball.o sphere.o tube.o
 
 GL_EXES_1	= cage gears moebius pipes sproingies stairs superquadrics \
 		  morph3d rubik atlantis lament bubble3d glplanet pulsar \
@@ -102,14 +102,15 @@ GLE_EXES	= extrusion
 HACK_EXES	= @GL_EXES@ @GLE_EXES@
 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 \
-		  stonerview-move.h stonerview-osc.h glutstroke.h glut_roman.h
+		  tube.h sphere.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
 MEN		= @GL_MEN@
@@ -322,8 +323,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)
@@ -344,12 +345,12 @@ 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
+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	$(HACK_OBJS)
-	$(CC_HACK) -o $@ $@.o   $(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)
 
 # This one works differently (it's not xlock-like.)
 #
@@ -363,14 +364,14 @@ 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" |				\
+	  $(SHELL) $(UTILS_SRC)/ad2c "$$f" |				\
 	    sed 's/",$$/\\n"/' >> $$tmp ;				\
 	  echo ',' >> $$tmp ;						\
 	done ;								\
 	mv $$tmp molecules.h
 
-molecule:	molecule.o	$(HACK_OBJS)
-	$(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(HACK_LIBS)
+molecule:	molecule.o	sphere.o tube.o $(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o   sphere.o tube.o $(HACK_OBJS) $(HACK_LIBS)
 
 
 ##############################################################################
@@ -616,6 +617,17 @@ 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
+fps.o: $(HACK_SRC)/screenhack.h
+fps.o: $(UTILS_SRC)/yarandom.h
+fps.o: $(UTILS_SRC)/usleep.h
+fps.o: $(UTILS_SRC)/resources.h
+fps.o: $(UTILS_SRC)/hsv.h
+fps.o: $(UTILS_SRC)/colors.h
+fps.o: $(UTILS_SRC)/grabscreen.h
+fps.o: $(UTILS_SRC)/visual.h
+fps.o: $(HACK_SRC)/xlockmoreI.h
+fps.o: $(UTILS_SRC)/xshm.h
 xpm-ximage.o: ../../config.h
 glplanet.o: $(HACK_SRC)/xlockmore.h
 glplanet.o: ../../config.h
@@ -629,6 +641,7 @@ 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
@@ -732,6 +745,7 @@ gltext.o: $(UTILS_SRC)/colors.h
 gltext.o: $(UTILS_SRC)/grabscreen.h
 gltext.o: $(UTILS_SRC)/visual.h
 gltext.o: $(UTILS_SRC)/xshm.h
+gltext.o: $(srcdir)/tube.h
 gltext.o: $(srcdir)/glutstroke.h
 gltext.o: $(srcdir)/glut_roman.h
 molecule.o: $(HACK_SRC)/xlockmore.h
@@ -746,6 +760,8 @@ molecule.o: $(UTILS_SRC)/colors.h
 molecule.o: $(UTILS_SRC)/grabscreen.h
 molecule.o: $(UTILS_SRC)/visual.h
 molecule.o: $(UTILS_SRC)/xshm.h
+molecule.o: $(srcdir)/sphere.h
+molecule.o: $(srcdir)/tube.h
 molecule.o: molecules.h
 dangerball.o: $(HACK_SRC)/xlockmore.h
 dangerball.o: ../../config.h
@@ -759,6 +775,12 @@ dangerball.o: $(UTILS_SRC)/colors.h
 dangerball.o: $(UTILS_SRC)/grabscreen.h
 dangerball.o: $(UTILS_SRC)/visual.h
 dangerball.o: $(UTILS_SRC)/xshm.h
+dangerball.o: $(srcdir)/sphere.h
+dangerball.o: $(srcdir)/tube.h
 dangerball.o: $(srcdir)/glutstroke.h
 dangerball.o: $(srcdir)/glut_roman.h
+sphere.o: ../../config.h
+sphere.o: $(srcdir)/tube.h
+tube.o: ../../config.h
+tube.o: $(srcdir)/tube.h