X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2FMakefile.in;h=a824037eefc27f2cfa438a54af207fb75c50db2e;hb=8eb2873d7054e705c4e83f22d18c40946a9e2529;hp=ba97c32963007ff0332a88d8d1ddd4faef3453ad;hpb=3c58fb6311db49c46f1670922933b27c6ea0c065;p=xscreensaver

diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in
index ba97c329..a824037e 100644
--- a/hacks/glx/Makefile.in
+++ b/hacks/glx/Makefile.in
@@ -77,7 +77,8 @@ SRCS		= xscreensaver-gl-helper.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
+		  gltext.c molecule.c dangerball.c sphere.c tube.c circuit.c \
+		  menger.c engine.c flipscreen3d.c font-ximage.c grab-ximage.c
 
 OBJS		= xscreensaver-gl-helper.o \
 		  atlantis.o b_draw.o b_lockglue.o b_sphere.o bubble3d.o \
@@ -91,15 +92,17 @@ OBJS		= xscreensaver-gl-helper.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 sphere.o tube.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
 
 GL_EXES		= cage gears moebius pipes sproingies stairs superquadrics \
 		  morph3d rubik atlantis lament bubble3d glplanet pulsar \
 		  sierpinski3d gflux stonerview starwars gltext molecule \
-		  dangerball
+		  dangerball circuit menger engine flipscreen3d
 GLE_EXES	= extrusion
 GL_UTIL_EXES	= xscreensaver-gl-helper
 HACK_EXES	= @GL_EXES@ @GLE_EXES@
+GRAB_OBJS	= $(UTILS_BIN)/grabclient.o grab-ximage.o
 EXES		= @GL_UTIL_EXES@ $(HACK_EXES)
 
 HACK_OBJS	= screenhack-gl.o xlock-gl.o fps.o $(HACK_BIN)/xlockmore.o \
@@ -109,8 +112,8 @@ HACK_OBJS	= screenhack-gl.o xlock-gl.o fps.o $(HACK_BIN)/xlockmore.o \
 		  $(UTILS_BIN)/colors.o
 
 HDRS		= atlantis.h bubble3d.h buildlwo.h e_textures.h xpm-ximage.h \
-		  tube.h sphere.h stonerview-move.h stonerview-osc.h \
-		  glutstroke.h glut_roman.h
+		  grab-ximage.h font-ximage.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@
@@ -144,7 +147,7 @@ install-program:: $(EXES)
 
 # the xscreensaver-gl-helper program, in $bindir
 install-program:: $(EXES)
-	@exes="$(GL_UTIL_EXES)" ;					\
+	@exes="@GL_UTIL_EXES@" ;					\
 	 idir="$(install_prefix)$(bindir)" ;				\
 	 if [ "$$exes" != "" ]; then					\
 	   if [ ! -d $$idir ]; then					\
@@ -340,8 +343,8 @@ extrusion:	$(EXTRUSION_OBJS) $(HACK_OBJS)
 sierpinski3d:	sierpinski3d.o	$(HACK_OBJS)
 	$(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(HACK_LIBS)
 
-gflux:		gflux.o		$(HACK_OBJS)
-	$(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(HACK_LIBS)
+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)
@@ -354,6 +357,19 @@ gltext:	$(GLT_OBJS) $(HACK_OBJS)
 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)
+
+
 # This one works differently (it's not xlock-like.)
 #
 STONER_OBJS=stonerview.o stonerview-move.o stonerview-osc.o stonerview-view.o \
@@ -375,6 +391,8 @@ 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)
 
 ##############################################################################
 #
@@ -444,6 +462,7 @@ extrusion-taper.o: ../../config.h
 extrusion-twistoid.o: ../../config.h
 sierpinski3d.o: ../../config.h
 gflux.o: ../../config.h
+gflux.o: $(srcdir)/grab-ximage.h
 stonerview.o: ../../config.h
 stonerview.o: $(srcdir)/stonerview-move.h
 stonerview-move.o: ../../config.h
@@ -476,4 +495,12 @@ 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