X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2FMakefile.in;h=5b8f028063a2498462d27823826e75a2cc6f03e0;hb=a94197e76a5dea5cb60542840809d6c20d0abbf3;hp=650894822935a922fa1db0bfcfa9367266164cb0;hpb=585e1a6717d1dd9b90fbb53acaaae82106354d33;p=xscreensaver

diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in
index 65089482..5b8f0280 100644
--- a/hacks/glx/Makefile.in
+++ b/hacks/glx/Makefile.in
@@ -77,7 +77,9 @@ 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 glsnake.c boxed.c glforestfire.c sballs.c
 
 OBJS		= xscreensaver-gl-helper.o \
 		  atlantis.o b_draw.o b_lockglue.o b_sphere.o bubble3d.o \
@@ -91,17 +93,20 @@ 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 glsnake.o boxed.o glforestfire.o sballs.o
 
-GL_EXES_1	= cage gears moebius pipes sproingies stairs superquadrics \
+GL_EXES		= cage gears moebius pipes sproingies stairs superquadrics \
 		  morph3d rubik atlantis lament bubble3d glplanet pulsar \
 		  sierpinski3d gflux stonerview starwars gltext molecule \
-		  dangerball
-UTIL_EXES	= xscreensaver-gl-helper
-GL_EXES		= $(UTIL_EXES) $(GL_EXES_1)
+		  dangerball circuit menger engine flipscreen3d glsnake boxed \
+		  glforestfire sballs
 GLE_EXES	= extrusion
+GL_UTIL_EXES	= xscreensaver-gl-helper
 HACK_EXES	= @GL_EXES@ @GLE_EXES@
-EXES		= $(HACK_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 \
 		  $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \
@@ -110,10 +115,11 @@ 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 boxed.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
+		  molecule.man xscreensaver-gl-helper.man glsnake.man \
+		  glforestfire.man sballs.man
 MEN		= @GL_MEN@
 EXTRAS		= README Makefile.in
 
@@ -130,68 +136,70 @@ install-strip:
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 
 # the hacks, in $HACKDIR
-install-program:: $(HACK_EXES)
-	@if [ ! -d $(install_prefix)$(HACKDIR) ]; then			\
-	  $(INSTALL_DIRS) $(install_prefix)$(HACKDIR) ;			\
-	 fi ;								\
-	exes="$(HACK_EXES)" ;						\
-	for program in $$exes; do					\
-	  echo $(INSTALL_PROGRAM) $$program				\
-	    $(install_prefix)$(HACKDIR)/$$program ;			\
-	  $(INSTALL_PROGRAM) $$program					\
-	    $(install_prefix)$(HACKDIR)/$$program ;			\
-	done
+install-program:: $(EXES)
+	@exes="$(HACK_EXES)" ;						\
+	 idir="$(install_prefix)$(HACKDIR)" ;				\
+	 if [ "$$exes" != "" ]; then					\
+	   if [ ! -d $$idir ]; then					\
+	     $(INSTALL_DIRS) $$idir ;					\
+	   fi ;								\
+	   for program in $$exes; do					\
+	     echo $(INSTALL_PROGRAM) $$program $$idir/$$program ;	\
+		  $(INSTALL_PROGRAM) $$program $$idir/$$program ;	\
+	   done ;							\
+	 fi
 
 # the xscreensaver-gl-helper program, in $bindir
-install-program:: $(HACK_EXES)
-	@if [ "$(HACK_EXES)" != "" ]; then				\
-	   if [ ! -d $(install_prefix)$(bindir) ]; then			\
-	     $(INSTALL_DIRS) $(install_prefix)$(bindir) ;		\
+install-program:: $(EXES)
+	@exes="@GL_UTIL_EXES@" ;					\
+	 idir="$(install_prefix)$(bindir)" ;				\
+	 if [ "$$exes" != "" ]; then					\
+	   if [ ! -d $$idir ]; then					\
+	     $(INSTALL_DIRS) $$idir ;					\
 	   fi ;								\
-	   exes="$(UTIL_EXES)" ;					\
 	   for program in $$exes; do					\
-	     echo $(INSTALL_PROGRAM) $$program				\
-	       $(install_prefix)$(bindir)/$$program ;			\
-	     $(INSTALL_PROGRAM) $$program				\
-	       $(install_prefix)$(bindir)/$$program ;			\
+	     echo $(INSTALL_PROGRAM) $$program $$idir/$$program ;	\
+		  $(INSTALL_PROGRAM) $$program $$idir/$$program ;	\
 	   done ;							\
 	 fi
 
 install-man: $(MEN)
 	@men="$(MEN)" ;							\
-	if [ ! -d $(install_prefix)$(man1dir) ]; then			\
-	  $(INSTALL_DIRS) $(install_prefix)$(man1dir) ;			\
+	 idir="$(install_prefix)$(man1dir)" ;				\
+	 if [ ! -d $$idir ]; then					\
+	  $(INSTALL_DIRS) $$idir ;					\
 	 fi ;								\
-	for man in $$men; do						\
-	  instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ;	\
-	  echo $(INSTALL_DATA) $(srcdir)/$$man				\
-	   $(install_prefix)$(man1dir)/$$instname ;			\
-	  $(INSTALL_DATA) $(srcdir)/$$man				\
-	    $(install_prefix)$(man1dir)/$$instname ;			\
-	done
+	 for man in $$men; do						\
+	   instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ;	\
+	   echo $(INSTALL_DATA) $(srcdir)/$$man $$idir/$$instname ;	\
+		$(INSTALL_DATA) $(srcdir)/$$man $$idir/$$instname ;	\
+	 done
 
 # the hacks, in $HACKDIR
 uninstall-program::
-	@exes="$(GL_EXES_1) $(GLE_EXES)" ;				\
-	for program in $$exes; do					\
-	  echo rm -f $(install_prefix)$(HACKDIR)/$$program ;		\
-	  rm -f $(install_prefix)$(HACKDIR)/$$program ;			\
-	done
+	@exes="$(HACK_EXES)" ;						\
+	 idir="$(install_prefix)$(HACKDIR)" ;				\
+	 for program in $$exes; do					\
+	   echo rm -f $$idir/$$program ;				\
+		rm -f $$idir/$$program ;				\
+	 done
 
 # the xscreensaver-gl-helper program, in $bindir
 uninstall-program::
-	@exes="$(UTIL_EXES)" ;						\
-	for program in $$exes; do					\
-	  echo rm -f $(install_prefix)$(bindir)/$$program ;		\
-	  rm -f $(install_prefix)$(bindir)/$$program ;			\
+	@exes="$(GL_UTIL_EXES)" ;					\
+	 idir="$(install_prefix)$(bindir)" ;				\
+	 for program in $$exes; do					\
+	   echo rm -f $$idir/$$program ;				\
+		rm -f $$idir/$$program ;				\
 	done
 
 uninstall-man:
-	@men="$(GL_MEN)" ;						\
-	for man in $$men; do						\
-	  instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ;	\
-	  echo rm -f $(install_prefix)$(man1dir)/$$instname ;		\
-	  rm -f $(install_prefix)$(man1dir)/$$instname ;		\
+	@men="$(MEN)" ;							\
+	 idir="$(install_prefix)$(man1dir)" ;				\
+	 for man in $$men; do						\
+	   instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ;	\
+	   echo rm -f $$idir/$$instname ;				\
+		rm -f $$idir/$$instname ;				\
 	done
 
 clean:
@@ -339,8 +347,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)
@@ -353,6 +361,30 @@ 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)
+
+glsnake:	glsnake.o	$(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HACK_LIBS)
+
+boxed:		boxed.o		$(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HACK_LIBS)
+
+glforestfire:	glforestfire.o	$(HACK_OBJS) xpm-ximage.o
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) xpm-ximage.o $(XPM_LIBS)
+
+sballs:		sballs.o	$(HACK_OBJS) xpm-ximage.o
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) xpm-ximage.o $(XPM_LIBS)
+
 # This one works differently (it's not xlock-like.)
 #
 STONER_OBJS=stonerview.o stonerview-move.o stonerview-osc.o stonerview-view.o \
@@ -374,6 +406,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)
 
 ##############################################################################
 #
@@ -443,6 +477,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
@@ -475,4 +510,23 @@ 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
+glsnake.o: ../../config.h
+boxed.o: $(srcdir)/boxed.h
+boxed.o: ../../config.h
+glforestfire.o: ../../config.h
+glforestfire.o: $(srcdir)/xpm-ximage.h
+glforestfire.o: $(HACK_SRC)/images/ground.xpm
+glforestfire.o: $(HACK_SRC)/images/tree.xpm
+sballs.o: ../../config.h
+sballs.o: $(srcdir)/xpm-ximage.h
+sballs.o: $(HACK_SRC)/images/sball.xpm
+sballs.o: $(HACK_SRC)/images/sball-bg.xpm