X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2FMakefile.in;h=619d9bd0c0be7e24e19851b3bcb1d67dae516357;hb=5f9c47ca98dd43d8f59b7c27d3fde6edfde4fe21;hp=3ea3bdc1e0a21e21fdce53ea0f624e68b904da82;hpb=7b34ef992563d7bcbb64cc5597dc45fa24470b05;p=xscreensaver

diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in
index 3ea3bdc1..619d9bd0 100644
--- a/hacks/glx/Makefile.in
+++ b/hacks/glx/Makefile.in
@@ -1,4 +1,4 @@
-# hacks/glx/Makefile.in --- xscreensaver, Copyright (c) 1999-2005
+# hacks/glx/Makefile.in --- xscreensaver, Copyright (c) 1999-2010
 #  by Jamie Zawinski.
 # the `../../configure' script generates `hacks/glx/Makefile' from this file.
 
@@ -64,7 +64,8 @@ HACK_BIN	= ..
 UTILS_SRC	= $(HACK_SRC)/../utils
 UTILS_BIN	= $(HACK_BIN)/../utils
 
-INCLUDES	= -I. -I$(srcdir) -I$(UTILS_SRC) -I$(HACK_SRC) -I../.. @INCLUDES@
+INCLUDES_1	= -I. -I$(srcdir) -I$(UTILS_SRC) -I$(HACK_SRC) -I../..
+INCLUDES	= $(INCLUDES_1) @INCLUDES@
 
 UTIL_SRCS	= $(UTILS_SRC)/colors.c $(UTILS_SRC)/hsv.c \
 		  $(UTILS_SRC)/resources.c $(UTILS_SRC)/usleep.c \
@@ -109,7 +110,7 @@ SRCS		= xscreensaver-gl-helper.c normals.c glxfonts.c fps-gl.c \
 		  glschool_gl.c glschool_alg.c glcells.c voronoi.c \
 		  moebiusgears.c lockward.c cubicgrid.c hypnowheel.c \
 		  skytentacles.c teapot.c sonar.c sonar-sim.c sonar-icmp.c \
-		  jigsaw.c photopile.c
+		  jigsaw.c photopile.c dropshadow.c rubikblocks.c surfaces.c
 
 OBJS		= xscreensaver-gl-helper.o normals.o glxfonts.o fps-gl.o \
 		  atlantis.o b_draw.o b_lockglue.o b_sphere.o bubble3d.o \
@@ -145,7 +146,7 @@ OBJS		= xscreensaver-gl-helper.o normals.o glxfonts.o fps-gl.o \
 		  glschool_gl.o glschool_alg.o glcells.o voronoi.o \
 		  moebiusgears.o lockward.o cubicgrid.o hypnowheel.o \
 		  skytentacles.o teapot.o sonar.o sonar-sim.o sonar-icmp.o \
-		  jigsaw.o photopile.o
+		  jigsaw.o photopile.o dropshadow.o rubikblocks.o surfaces.o
 
 GL_EXES		= cage gears moebius pipes sproingies stairs superquadrics \
 		  morph3d rubik atlantis lament bubble3d glplanet pulsar \
@@ -159,7 +160,8 @@ GL_EXES		= cage gears moebius pipes sproingies stairs superquadrics \
 		  antinspect providence pinion boing carousel fliptext \
 		  antmaze tangram crackberg glhanoi cube21 timetunnel \
 		  juggler3d topblock glschool glcells voronoi moebiusgears \
-		  lockward cubicgrid hypnowheel skytentacles jigsaw photopile
+		  lockward cubicgrid hypnowheel skytentacles jigsaw photopile \
+		  rubikblocks surfaces
 GLE_EXES	= extrusion
 SUID_EXES	= sonar
 GL_UTIL_EXES	= xscreensaver-gl-helper
@@ -169,8 +171,8 @@ XSHM_OBJS	= $(UTILS_BIN)/xshm.o
 GRAB_OBJS	= $(UTILS_BIN)/grabclient.o grab-ximage.o $(XSHM_OBJS)
 EXES		= @GL_UTIL_EXES@ $(HACK_EXES)
 
-RETIRED_EXES	= glforestfire
-RETIRED_GL_EXES	= @RETIRED_GL_EXES@
+RETIRED_EXES	= @RETIRED_GL_EXES@
+RETIRED_GL_EXES	= glforestfire
 
 HACK_OBJS	= $(HACK_BIN)/screenhack.o $(HACK_BIN)/fps.o \
 		  xlockmore-gl.o xlock-gl-utils.o glxfonts.o fps-gl.o \
@@ -187,7 +189,7 @@ HDRS		= atlantis.h bubble3d.h buildlwo.h e_textures.h xpm-ximage.h \
 		  tunnel_draw.h ants.h polyhedra.h normals.h glxfonts.h \
 		  texfont.h tangram_shapes.h sproingies.h extrusion.h \
 		  glschool.h glschool_gl.h glschool_alg.h topblock.h \
-		  involute.h teapot.h sonar.h
+		  involute.h teapot.h sonar.h dropshadow.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 \
@@ -208,12 +210,13 @@ GL_MEN		= atlantis.man boxed.man bubble3d.man cage.man circuit.man \
 		  juggler3d.man topblock.man glschool.man glcells.man \
 		  voronoi.man moebiusgears.man lockward.man cubicgrid.man \
 		  hypnowheel.man skytentacles.man sonar.man jigsaw.man \
-		  photopile.man
+		  photopile.man rubikblocks.man surfaces.man
 MEN		= @GL_MEN@
 RETIRED_MEN	= glforestfire.man
-EXTRAS		= README Makefile.in dxf2gl.pl molecules.sh starwars.txt
+EXTRAS		= README Makefile.in dxf2gl.pl wfront2gl.pl \
+		  molecules.sh starwars.txt
 
-TARFILES	= $(SRCS) $(HDRS) $(MEN) $(EXTRAS)
+TARFILES	= $(SRCS) $(HDRS) $(MEN) $(RETIRED_MEN) $(EXTRAS)
 
 
 default: all
@@ -327,7 +330,7 @@ install-xml:
 
 # the hacks, in $HACKDIR
 uninstall-program::
-	@exes="$(HACK_EXES)" ;						\
+	@exes="$(HACK_EXES) $(RETIRED_EXES)" ;				\
 	 idir="$(install_prefix)$(HACKDIR)" ;				\
 	 for program in $$exes; do					\
 	   echo rm -f $$idir/$$program ;				\
@@ -344,7 +347,7 @@ uninstall-program::
 	done
 
 uninstall-man:
-	@men="$(MEN)" ;							\
+	@men="$(MEN) $(RETIRED_MEN)" ;					\
 	for man in $$men; do						\
 	  instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ;	\
 	  echo rm -f $(install_prefix)$(manNdir)/$$instname* ;		\
@@ -353,13 +356,13 @@ uninstall-man:
 
 uninstall-xml:
 	@dest=$(install_prefix)$(HACK_CONF_DIR) ;			\
-	 for file in $(EXES) $(SCRIPTS) ; do				\
+	 for file in $(EXES) $(RETIRED_EXES) $(SCRIPTS) ; do		\
 	     echo rm -f $$dest/$$file.xml ;				\
 	          rm -f $$dest/$$file.xml ;				\
 	done
 
 clean:
-	-rm -f *.o a.out core $(EXES) molecules.h
+	-rm -f *.o a.out core $(EXES) $(RETIRED_EXES) molecules.h
 
 distclean: clean
 	-rm -f Makefile TAGS *~ "#"*
@@ -379,7 +382,7 @@ distdepend:: molecules.h
 	@echo updating dependencies in `pwd`/Makefile.in... ;		    \
 	$(DEPEND) -w 0 -f - 						    \
 	-s '# DO NOT DELETE: updated by make distdepend' $(DEPEND_FLAGS) -- \
-	$(INCLUDES) $(DEFS) $(DEPEND_DEFINES) $(CFLAGS) $(X_CFLAGS) --	    \
+	$(INCLUDES_1) $(DEFS) $(DEPEND_DEFINES) $(CFLAGS) $(X_CFLAGS) --    \
 	$(SRCS) 2>/dev/null |						    \
 	sort -d |							    \
 	(								    \
@@ -631,6 +634,9 @@ jigglypuff:	jigglypuff.o	xpm-ximage.o $(HACK_TRACK_OBJS)
 klein:		klein.o		$(HACK_TRACK_OBJS)
 	$(CC_HACK) -o $@ $@.o	$(HACK_TRACK_OBJS) $(HACK_LIBS)
 
+surfaces:	surfaces.o	$(HACK_TRACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(HACK_TRACK_OBJS) $(HACK_LIBS)
+
 hypertorus:	hypertorus.o	$(HACK_TRACK_OBJS)
 	$(CC_HACK) -o $@ $@.o	$(HACK_TRACK_OBJS) $(HACK_LIBS)
 
@@ -666,6 +672,7 @@ molecules.h:
 	$(srcdir)/molecules.sh molecules.h $(HACK_SRC)/images/molecules/*.pdb
 
 MOLECULE_OBJS=sphere.o tube.o $(HACK_TRACK_OBJS)
+molecule.o:	molecules.h
 molecule:	molecule.o	$(MOLECULE_OBJS)
 	$(CC_HACK) -o $@ $@.o   $(MOLECULE_OBJS) $(HACK_LIBS)
 
@@ -726,8 +733,9 @@ TIMETUNNEL_OBJS = xpm-ximage.o  $(HACK_TRACK_OBJS)
 timetunnel:	timetunnel.o	$(TIMETUNNEL_OBJS)
 	$(CC_HACK) -o $@ $@.o   $(TIMETUNNEL_OBJS) $(XPM_LIBS)
 
-juggler3d:	juggler3d.o	$(HACK_TRACK_OBJS)
-	$(CC_HACK) -o $@ $@.o	$(HACK_TRACK_OBJS) $(HACK_LIBS)
+JUGG_OBJS=sphere.o tube.o $(HACK_TRACK_OBJS)
+juggler3d:	juggler3d.o	$(JUGG_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(JUGG_OBJS) $(HACK_LIBS)
 
 dnalogo:	dnalogo.o      tube.o normals.o $(HACK_TRACK_OBJS)
 	$(CC_HACK) -o $@ $@.o  tube.o normals.o $(HACK_TRACK_OBJS) $(HACK_LIBS)
@@ -735,7 +743,7 @@ dnalogo:	dnalogo.o      tube.o normals.o $(HACK_TRACK_OBJS)
 topblock:	topblock.o	sphere.o $(HACK_TRACK_OBJS)
 	$(CC_HACK) -o $@ $@.o	sphere.o $(HACK_TRACK_OBJS) $(HACK_LIBS)
 
-SCHOOL_OBJS=glschool.o glschool_alg.o glschool_gl.o sphere.o tube.o $(HACK_OBJS)
+SCHOOL_OBJS=glschool.o glschool_alg.o glschool_gl.o $(HACK_OBJS)
 glschool: $(SCHOOL_OBJS)
 	$(CC_HACK) -o $@ $(SCHOOL_OBJS) $(HACK_LIBS)
 
@@ -766,8 +774,12 @@ JIGSAW_OBJS=normals.o $(UTILS_BIN)/spline.o $(HACK_TRACK_GRAB_OBJS)
 jigsaw:		jigsaw.o	$(JIGSAW_OBJS)
 	$(CC_HACK) -o $@ $@.o	$(JIGSAW_OBJS) $(HACK_LIBS)
 
-photopile:	photopile.o	texfont.o $(HACK_GRAB_OBJS)
-	$(CC_HACK) -o $@ $@.o	texfont.o $(HACK_GRAB_OBJS) $(HACK_LIBS)
+PHOTOPILE_OBJS=texfont.o dropshadow.o  $(HACK_GRAB_OBJS)
+photopile:	photopile.o	$(PHOTOPILE_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(PHOTOPILE_OBJS) $(HACK_LIBS)
+
+rubikblocks:	rubikblocks.o	$(HACK_TRACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(HACK_TRACK_OBJS) $(HACK_LIBS)
 
 ##############################################################################
 #
@@ -1153,6 +1165,7 @@ dolphin.o: $(UTILS_SRC)/resources.h
 dolphin.o: $(UTILS_SRC)/usleep.h
 dolphin.o: $(UTILS_SRC)/visual.h
 dolphin.o: $(UTILS_SRC)/yarandom.h
+dropshadow.o: $(srcdir)/dropshadow.h
 endgame.o: $(srcdir)/chessgames.h
 endgame.o: $(srcdir)/chessmodels.h
 endgame.o: ../../config.h
@@ -1651,7 +1664,11 @@ jigsaw.o: $(HACK_SRC)/xlockmore.h
 juggler3d.o: ../../config.h
 juggler3d.o: $(HACK_SRC)/fps.h
 juggler3d.o: $(srcdir)/gltrackball.h
+juggler3d.o: $(srcdir)/glxfonts.h
+juggler3d.o: $(srcdir)/rotator.h
 juggler3d.o: $(HACK_SRC)/screenhackI.h
+juggler3d.o: $(srcdir)/sphere.h
+juggler3d.o: $(srcdir)/tube.h
 juggler3d.o: $(UTILS_SRC)/colors.h
 juggler3d.o: $(UTILS_SRC)/grabscreen.h
 juggler3d.o: $(UTILS_SRC)/hsv.h
@@ -1665,7 +1682,6 @@ juggler3d.o: $(HACK_SRC)/xlockmore.h
 klein.o: ../../config.h
 klein.o: $(HACK_SRC)/fps.h
 klein.o: $(srcdir)/gltrackball.h
-klein.o: $(srcdir)/rotator.h
 klein.o: $(HACK_SRC)/screenhackI.h
 klein.o: $(UTILS_SRC)/colors.h
 klein.o: $(UTILS_SRC)/grabscreen.h
@@ -1839,6 +1855,7 @@ noof.o: $(HACK_SRC)/xlockmore.h
 normals.o: ../../config.h
 normals.o: $(srcdir)/normals.h
 photopile.o: ../../config.h
+photopile.o: $(srcdir)/dropshadow.h
 photopile.o: $(HACK_SRC)/fps.h
 photopile.o: $(srcdir)/grab-ximage.h
 photopile.o: $(HACK_SRC)/screenhackI.h
@@ -1966,6 +1983,21 @@ queens.o: $(HACK_SRC)/xlockmore.h
 rotator.o: ../../config.h
 rotator.o: $(srcdir)/rotator.h
 rotator.o: $(UTILS_SRC)/yarandom.h
+rubikblocks.o: ../../config.h
+rubikblocks.o: $(HACK_SRC)/fps.h
+rubikblocks.o: $(srcdir)/gltrackball.h
+rubikblocks.o: $(srcdir)/rotator.h
+rubikblocks.o: $(HACK_SRC)/screenhackI.h
+rubikblocks.o: $(UTILS_SRC)/colors.h
+rubikblocks.o: $(UTILS_SRC)/grabscreen.h
+rubikblocks.o: $(UTILS_SRC)/hsv.h
+rubikblocks.o: $(UTILS_SRC)/resources.h
+rubikblocks.o: $(UTILS_SRC)/usleep.h
+rubikblocks.o: $(UTILS_SRC)/visual.h
+rubikblocks.o: $(UTILS_SRC)/xshm.h
+rubikblocks.o: $(UTILS_SRC)/yarandom.h
+rubikblocks.o: $(HACK_SRC)/xlockmoreI.h
+rubikblocks.o: $(HACK_SRC)/xlockmore.h
 rubik.o: ../../config.h
 rubik.o: $(HACK_SRC)/fps.h
 rubik.o: $(HACK_SRC)/screenhackI.h
@@ -2210,6 +2242,21 @@ superquadrics.o: $(UTILS_SRC)/xshm.h
 superquadrics.o: $(UTILS_SRC)/yarandom.h
 superquadrics.o: $(HACK_SRC)/xlockmoreI.h
 superquadrics.o: $(HACK_SRC)/xlockmore.h
+surfaces.o: ../../config.h
+surfaces.o: $(HACK_SRC)/fps.h
+surfaces.o: $(srcdir)/gltrackball.h
+surfaces.o: $(srcdir)/rotator.h
+surfaces.o: $(HACK_SRC)/screenhackI.h
+surfaces.o: $(UTILS_SRC)/colors.h
+surfaces.o: $(UTILS_SRC)/grabscreen.h
+surfaces.o: $(UTILS_SRC)/hsv.h
+surfaces.o: $(UTILS_SRC)/resources.h
+surfaces.o: $(UTILS_SRC)/usleep.h
+surfaces.o: $(UTILS_SRC)/visual.h
+surfaces.o: $(UTILS_SRC)/xshm.h
+surfaces.o: $(UTILS_SRC)/yarandom.h
+surfaces.o: $(HACK_SRC)/xlockmoreI.h
+surfaces.o: $(HACK_SRC)/xlockmore.h
 swim.o: $(srcdir)/atlantis.h
 swim.o: ../../config.h
 swim.o: $(HACK_SRC)/fps.h