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

diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in
index e32391f2..0fb60097 100644
--- a/hacks/glx/Makefile.in
+++ b/hacks/glx/Makefile.in
@@ -1,4 +1,5 @@
-# hacks/glx/Makefile.in --- xscreensaver, Copyright (c) 1999 Jamie Zawinski.
+# hacks/glx/Makefile.in --- xscreensaver, Copyright (c) 1999, 2000
+#  by Jamie Zawinski.
 # the `../../configure' script generates `hacks/glx/Makefile' from this file.
 
 @SET_MAKE@
@@ -63,7 +64,8 @@ UTIL_OBJS	= $(UTILS_SRC)/colors.o $(UTILS_SRC)/hsv.o \
 		  $(UTILS_SRC)/visual.o $(UTILS_SRC)/visual-gl.o \
 		   $(UTILS_SRC)/yarandom.o
 
-SRCS		= atlantis.c b_draw.c b_lockglue.c b_sphere.c bubble3d.c \
+SRCS		= xscreensaver-gl-helper.c \
+		  atlantis.c b_draw.c b_lockglue.c b_sphere.c bubble3d.c \
 		  buildlwo.c cage.c dolphin.c gears.c lament.c moebius.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 \
@@ -71,9 +73,13 @@ SRCS		= atlantis.c b_draw.c b_lockglue.c b_sphere.c bubble3d.c \
 		  xlock-gl.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
+		  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
 
-OBJS		= atlantis.o b_draw.o b_lockglue.o b_sphere.o bubble3d.o \
+OBJS		= xscreensaver-gl-helper.o \
+		  atlantis.o b_draw.o b_lockglue.o b_sphere.o bubble3d.o \
 		  buildlwo.o cage.o dolphin.o gears.o lament.o moebius.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 \
@@ -81,13 +87,20 @@ OBJS		= atlantis.o b_draw.o b_lockglue.o b_sphere.o bubble3d.o \
 		  xlock-gl.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
+		  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
 
-GL_EXES		= cage gears moebius pipes sproingies stairs superquadrics \
+GL_EXES_1	= cage gears moebius pipes sproingies stairs superquadrics \
 		  morph3d rubik atlantis lament bubble3d glplanet pulsar \
-		  sierpinski3d
+		  sierpinski3d gflux stonerview starwars gltext molecule \
+		  dangerball
+UTIL_EXES	= xscreensaver-gl-helper
+GL_EXES		= $(UTIL_EXES) $(GL_EXES_1)
 GLE_EXES	= extrusion
-EXES		= @GL_EXES@ @GLE_EXES@
+HACK_EXES	= @GL_EXES@ @GLE_EXES@
+EXES		= $(HACK_EXES)
 
 HACK_OBJS	= screenhack-gl.o xlock-gl.o $(HACK_BIN)/xlockmore.o \
 		  $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \
@@ -95,8 +108,10 @@ HACK_OBJS	= screenhack-gl.o xlock-gl.o $(HACK_BIN)/xlockmore.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
-GL_MEN		= lament.man
+HDRS		= atlantis.h bubble3d.h buildlwo.h e_textures.h xpm-ximage.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@
 EXTRAS		= README Makefile.in
 
@@ -112,11 +127,12 @@ uninstall: uninstall-program uninstall-man
 install-strip:
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 
-install-program: $(EXES)
+# the hacks, in $HACKDIR
+install-program:: $(HACK_EXES)
 	@if [ ! -d $(install_prefix)$(HACKDIR) ]; then			\
 	  $(INSTALL_DIRS) $(install_prefix)$(HACKDIR) ;			\
 	 fi ;								\
-	exes="$(EXES)" ;						\
+	exes="$(HACK_EXES)" ;						\
 	for program in $$exes; do					\
 	  echo $(INSTALL_PROGRAM) $$program				\
 	    $(install_prefix)$(HACKDIR)/$$program ;			\
@@ -124,6 +140,21 @@ install-program: $(EXES)
 	    $(install_prefix)$(HACKDIR)/$$program ;			\
 	done
 
+# 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) ;		\
+	   fi ;								\
+	   exes="$(UTIL_EXES)" ;					\
+	   for program in $$exes; do					\
+	     echo $(INSTALL_PROGRAM) $$program				\
+	       $(install_prefix)$(bindir)/$$program ;			\
+	     $(INSTALL_PROGRAM) $$program				\
+	       $(install_prefix)$(bindir)/$$program ;			\
+	   done ;							\
+	 fi
+
 install-man: $(MEN)
 	@men="$(MEN)" ;							\
 	if [ ! -d $(install_prefix)$(man1dir) ]; then			\
@@ -137,15 +168,24 @@ install-man: $(MEN)
 	    $(install_prefix)$(man1dir)/$$instname ;			\
 	done
 
-uninstall-program:
-	@exes="$(EXES)" ;						\
+# 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
 
+# 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 ;			\
+	done
+
 uninstall-man:
-	@men="$(MEN)" ;							\
+	@men="$(GL_MEN)" ;						\
 	for man in $$men; do						\
 	  instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ;	\
 	  echo rm -f $(install_prefix)$(man1dir)/$$instname ;		\
@@ -153,7 +193,7 @@ uninstall-man:
 	done
 
 clean:
-	-rm -f *.o a.out core $(EXES)
+	-rm -f *.o a.out core $(EXES) molecules.h
 
 distclean: clean
 	-rm -f Makefile TAGS *~ "#"*
@@ -169,7 +209,7 @@ depend:
 # close.  This excludes dependencies on files in /usr/include, etc.  It tries
 # to include only dependencies on files which are themselves a part of this
 # package.
-distdepend::
+distdepend:: molecules.h
 	@echo updating dependencies in `pwd`/Makefile.in... ;		    \
 	$(DEPEND) -w 0 -f - 						    \
 	-s '# DO NOT DELETE: updated by make distdepend' $(DEPEND_FLAGS) -- \
@@ -183,7 +223,8 @@ distdepend::
 	      -e 's@ \.\./@ $$(HACK_SRC)/@g'				    \
 	      -e 's@ \([^$$]\)@ $$(srcdir)/\1@g'			    \
 	      -e 's@ $$(srcdir)/\(.*config.h\)@ \1@g'			    \
-	      -e 's@ $$(HACK_SRC)/\(.*config.h\)@ ../\1@g' ;		    \
+	      -e 's@ $$(HACK_SRC)/\(.*config.h\)@ ../\1@g'		    \
+	      -e 's@ $$(srcdir)/\(.*molecules.h\)@ \1@g' ;		    \
 	  echo ''							    \
 	) > /tmp/distdepend.$$$$ &&					    \
 	mv Makefile.in Makefile.in.bak &&				    \
@@ -221,6 +262,16 @@ $(HACK_BIN)/xlockmore.o: $(HACK_SRC)/xlockmore.c
 .c.o:
 	$(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) $<
 
+
+# How to build the "xscreensaver-gl-helper" program, that lets the daemon
+# know which visual is the right one for GL programs.
+#
+HELPER_OBJS = xscreensaver-gl-helper.o $(UTILS_BIN)/visual-gl.o \
+	      $(UTILS_BIN)/visual.o $(UTILS_BIN)/resources.o
+xscreensaver-gl-helper: $(HELPER_OBJS)
+	$(CC) $(LDFLAGS) -o $@ $(HELPER_OBJS) $(LIBS) $(X_LIBS) $(HACK_POST2)
+
+
 # These hacks use a slightly-differently-compiled variant of screenhack.c.
 # This is how to make the the other .o file from it.
 #
@@ -286,12 +337,50 @@ 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)
+
+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
+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)
+
+# 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
+stonerview:	$(STONER_OBJS)
+	$(CC_HACK) -o $@ $(STONER_OBJS) $(HACK_LIBS)
+
+molecules.h:
+	@tmp=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" |				\
+	    sed 's/",$$/\\n"/' >> $$tmp ;				\
+	  echo ',' >> $$tmp ;						\
+	done ;								\
+	mv $$tmp molecules.h
+
+molecule:	molecule.o	$(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(HACK_LIBS)
+
 
 ##############################################################################
 #
 # DO NOT DELETE: updated by make distdepend
 # $(srcdir)/DO $(srcdir)/NOT $(srcdir)/DELETE: $(srcdir)/updated $(srcdir)/by $(srcdir)/make $(srcdir)/distdepend
 
+xscreensaver-gl-helper.o: $(UTILS_SRC)/utils.h
+xscreensaver-gl-helper.o: ../../config.h
+xscreensaver-gl-helper.o: $(UTILS_SRC)/visual.h
 atlantis.o: $(HACK_SRC)/xlockmore.h
 atlantis.o: ../../config.h
 atlantis.o: $(HACK_SRC)/xlockmoreI.h
@@ -585,4 +674,91 @@ sierpinski3d.o: $(UTILS_SRC)/colors.h
 sierpinski3d.o: $(UTILS_SRC)/grabscreen.h
 sierpinski3d.o: $(UTILS_SRC)/visual.h
 sierpinski3d.o: $(UTILS_SRC)/xshm.h
+gflux.o: $(HACK_SRC)/xlockmore.h
+gflux.o: ../../config.h
+gflux.o: $(HACK_SRC)/xlockmoreI.h
+gflux.o: $(HACK_SRC)/screenhack.h
+gflux.o: $(UTILS_SRC)/yarandom.h
+gflux.o: $(UTILS_SRC)/usleep.h
+gflux.o: $(UTILS_SRC)/resources.h
+gflux.o: $(UTILS_SRC)/hsv.h
+gflux.o: $(UTILS_SRC)/colors.h
+gflux.o: $(UTILS_SRC)/grabscreen.h
+gflux.o: $(UTILS_SRC)/visual.h
+gflux.o: $(UTILS_SRC)/xshm.h
+stonerview.o: ../../config.h
+stonerview.o: $(UTILS_SRC)/yarandom.h
+stonerview.o: $(srcdir)/stonerview-move.h
+stonerview-move.o: ../../config.h
+stonerview-move.o: $(UTILS_SRC)/yarandom.h
+stonerview-move.o: $(srcdir)/stonerview-osc.h
+stonerview-move.o: $(srcdir)/stonerview-move.h
+stonerview-osc.o: ../../config.h
+stonerview-osc.o: $(UTILS_SRC)/yarandom.h
+stonerview-osc.o: $(srcdir)/stonerview-osc.h
+stonerview-view.o: ../../config.h
+stonerview-view.o: $(UTILS_SRC)/vroot.h
+stonerview-view.o: $(UTILS_SRC)/version.h
+stonerview-view.o: $(UTILS_SRC)/yarandom.h
+stonerview-view.o: $(srcdir)/stonerview-osc.h
+stonerview-view.o: $(srcdir)/stonerview-move.h
+starwars.o: $(HACK_SRC)/xlockmore.h
+starwars.o: ../../config.h
+starwars.o: $(HACK_SRC)/xlockmoreI.h
+starwars.o: $(HACK_SRC)/screenhack.h
+starwars.o: $(UTILS_SRC)/yarandom.h
+starwars.o: $(UTILS_SRC)/usleep.h
+starwars.o: $(UTILS_SRC)/resources.h
+starwars.o: $(UTILS_SRC)/hsv.h
+starwars.o: $(UTILS_SRC)/colors.h
+starwars.o: $(UTILS_SRC)/grabscreen.h
+starwars.o: $(UTILS_SRC)/visual.h
+starwars.o: $(UTILS_SRC)/xshm.h
+starwars.o: $(srcdir)/glutstroke.h
+starwars.o: $(srcdir)/glut_roman.h
+glut_stroke.o: ../../config.h
+glut_stroke.o: $(srcdir)/glutstroke.h
+glut_swidth.o: ../../config.h
+glut_swidth.o: $(srcdir)/glutstroke.h
+gltext.o: $(HACK_SRC)/xlockmore.h
+gltext.o: ../../config.h
+gltext.o: $(HACK_SRC)/xlockmoreI.h
+gltext.o: $(HACK_SRC)/screenhack.h
+gltext.o: $(UTILS_SRC)/yarandom.h
+gltext.o: $(UTILS_SRC)/usleep.h
+gltext.o: $(UTILS_SRC)/resources.h
+gltext.o: $(UTILS_SRC)/hsv.h
+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)/glutstroke.h
+gltext.o: $(srcdir)/glut_roman.h
+molecule.o: $(HACK_SRC)/xlockmore.h
+molecule.o: ../../config.h
+molecule.o: $(HACK_SRC)/xlockmoreI.h
+molecule.o: $(HACK_SRC)/screenhack.h
+molecule.o: $(UTILS_SRC)/yarandom.h
+molecule.o: $(UTILS_SRC)/usleep.h
+molecule.o: $(UTILS_SRC)/resources.h
+molecule.o: $(UTILS_SRC)/hsv.h
+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: molecules.h
+dangerball.o: $(HACK_SRC)/xlockmore.h
+dangerball.o: ../../config.h
+dangerball.o: $(HACK_SRC)/xlockmoreI.h
+dangerball.o: $(HACK_SRC)/screenhack.h
+dangerball.o: $(UTILS_SRC)/yarandom.h
+dangerball.o: $(UTILS_SRC)/usleep.h
+dangerball.o: $(UTILS_SRC)/resources.h
+dangerball.o: $(UTILS_SRC)/hsv.h
+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)/glutstroke.h
+dangerball.o: $(srcdir)/glut_roman.h