X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2FMakefile.in;h=e82ec7814949667d726192960b2fadc3f4fa39e6;hb=de041722414a2e31c1c04caa10aaec9d6952e9b4;hp=7d4e7860c6b45e9e060dddd6b2e7f97f23438bcb;hpb=df7adbee81405e2849728a24b498ad2117784b1f;p=xscreensaver

diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in
index 7d4e7860..e82ec781 100644
--- a/hacks/glx/Makefile.in
+++ b/hacks/glx/Makefile.in
@@ -1,4 +1,5 @@
-# hacks/glx/Makefile.in --- xscreensaver, Copyright (c) 1997 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@
@@ -42,8 +43,10 @@ X_EXTRA_LIBS	= @X_EXTRA_LIBS@
 #
 HACK_PRE	= $(LIBS) $(X_LIBS)
 HACK_POST	= $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) -lm
-HACK_LIBS	= $(HACK_PRE)            @GL_LIBS@ @HACK_LIBS@ $(HACK_POST)
-XPM_LIBS	= $(HACK_PRE) @XPM_LIBS@ @GL_LIBS@ @HACK_LIBS@ $(HACK_POST)
+HACK_POST2	= @GL_LIBS@ @HACK_LIBS@ $(HACK_POST)
+HACK_LIBS	= $(HACK_PRE)                       $(HACK_POST2)
+XPM_LIBS	= $(HACK_PRE)            @XPM_LIBS@ $(HACK_POST2)
+GLE_LIBS	= $(HACK_PRE) @GLE_LIBS@ @XPM_LIBS@ $(HACK_POST2)
 
 HACK_SRC	= $(srcdir)/..
 HACK_BIN	= ..
@@ -61,23 +64,36 @@ 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 \
 		  sproingiewrap.c stairs.c superquadrics.c swim.c whale.c \
-		  xlock-gl.c xpm-ximage.c glplanet.c pulsar.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 gflux.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 \
 		  sproingiewrap.o stairs.o superquadrics.o swim.o whale.o \
-		  xlock-gl.o xpm-ximage.o glplanet.o pulsar.o
-
-GL_EXES		= cage gears moebius pipes sproingies stairs superquadrics \
-		  morph3d rubik atlantis lament bubble3d glplanet pulsar
-EXES		= @GL_EXES@
+		  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 gflux.o
+
+UTIL_EXES	= xscreensaver-gl-helper
+GL_EXES		= $(UTIL_EXES) \
+		  cage gears moebius pipes sproingies stairs superquadrics \
+		  morph3d rubik atlantis lament bubble3d glplanet pulsar \
+		  sierpinski3d gflux
+GLE_EXES	= extrusion
+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 \
@@ -86,7 +102,7 @@ HACK_OBJS	= screenhack-gl.o xlock-gl.o $(HACK_BIN)/xlockmore.o \
 		  $(UTILS_BIN)/colors.o
 
 HDRS		= atlantis.h bubble3d.h buildlwo.h e_textures.h xpm-ximage.h
-GL_MEN		= lament.man
+GL_MEN		= lament.man xscreensaver-gl-helper.man gflux.man
 MEN		= @GL_MEN@
 EXTRAS		= README Makefile.in
 
@@ -102,35 +118,67 @@ uninstall: uninstall-program uninstall-man
 install-strip:
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 
-install-program: $(EXES)
-	@exes="$(EXES)" ;						\
-	if [ ! -d $(HACKDIR) ]; then $(INSTALL_DIRS) $(HACKDIR) ; fi ;	\
+# 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
+
+# the xscreensaver-gl-helper program, in $bindir
+install-program:: $(HACK_EXES)
+	@if [ ! -d $(install_prefix)$(bindir) ]; then			\
+	  $(INSTALL_DIRS) $(install_prefix)$(bindir) ;			\
+	 fi ;								\
+	exes="$(UTIL_EXES)" ;						\
 	for program in $$exes; do					\
-	  echo $(INSTALL_PROGRAM) $$program $(HACKDIR)/$$program ;	\
-	  $(INSTALL_PROGRAM) $$program $(HACKDIR)/$$program ;		\
+	  echo $(INSTALL_PROGRAM) $$program				\
+	    $(install_prefix)$(bindir)/$$program ;			\
+	  $(INSTALL_PROGRAM) $$program					\
+	    $(install_prefix)$(bindir)/$$program ;			\
 	done
 
 install-man: $(MEN)
 	@men="$(MEN)" ;							\
-	if [ ! -d $(man1dir) ]; then $(INSTALL_DIRS) $(man1dir) ; fi ;	\
+	if [ ! -d $(install_prefix)$(man1dir) ]; then			\
+	  $(INSTALL_DIRS) $(install_prefix)$(man1dir) ;			\
+	 fi ;								\
 	for man in $$men; do						\
 	  instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ;	\
-	  echo $(INSTALL_DATA) $(srcdir)/$$man $(man1dir)/$$instname ;	\
-	  $(INSTALL_DATA) $(srcdir)/$$man $(man1dir)/$$instname ;	\
+	  echo $(INSTALL_DATA) $(srcdir)/$$man				\
+	   $(install_prefix)$(man1dir)/$$instname ;			\
+	  $(INSTALL_DATA) $(srcdir)/$$man				\
+	    $(install_prefix)$(man1dir)/$$instname ;			\
 	done
 
-uninstall-program:
-	@for program in $(EXES); do					\
-	  echo rm -f $(HACKDIR)/$$program ;				\
-	  rm -f $(HACKDIR)/$$program ;					\
+# the hacks, in $HACKDIR
+uninstall-program::
+	@exes="$(HACK_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)" ;							\
 	for man in $$men; do						\
 	  instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ;	\
-	  echo rm -f $(man1dir)/$$instname ;				\
-	  rm -f $(man1dir)/$$instname ;					\
+	  echo rm -f $(install_prefix)$(man1dir)/$$instname ;		\
+	  rm -f $(install_prefix)$(man1dir)/$$instname ;		\
 	done
 
 clean:
@@ -202,6 +250,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.
 #
@@ -255,15 +313,29 @@ bubble3d:	bubble3d.o	$(HACK_OBJS) $(B3D)
 glplanet:	glplanet.o	$(HACK_OBJS) xpm-ximage.o
 	$(CC_HACK) -o $@ $@.o   $(HACK_OBJS) xpm-ximage.o $(XPM_LIBS)
 
-pulsar:		pulsar.o		$(HACK_OBJS)
+pulsar:		pulsar.o	$(HACK_OBJS)
 	$(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(HACK_LIBS)
 
+EXTRUSION_OBJS=extrusion.o extrusion-helix2.o extrusion-helix3.o    \
+	extrusion-helix4.o extrusion-joinoffset.o extrusion-screw.o \
+	extrusion-taper.o extrusion-twistoid.o
+extrusion:	$(EXTRUSION_OBJS) $(HACK_OBJS)
+	$(CC_HACK) -o $@ $(EXTRUSION_OBJS) $(HACK_OBJS) $(GLE_LIBS)
+
+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)
 
 ##############################################################################
 #
 # 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
@@ -526,4 +598,47 @@ pulsar.o: $(UTILS_SRC)/colors.h
 pulsar.o: $(UTILS_SRC)/grabscreen.h
 pulsar.o: $(UTILS_SRC)/visual.h
 pulsar.o: $(UTILS_SRC)/xshm.h
+extrusion.o: ../../config.h
+extrusion.o: $(HACK_SRC)/xlockmore.h
+extrusion.o: $(HACK_SRC)/xlockmoreI.h
+extrusion.o: $(HACK_SRC)/screenhack.h
+extrusion.o: $(UTILS_SRC)/yarandom.h
+extrusion.o: $(UTILS_SRC)/usleep.h
+extrusion.o: $(UTILS_SRC)/resources.h
+extrusion.o: $(UTILS_SRC)/hsv.h
+extrusion.o: $(UTILS_SRC)/colors.h
+extrusion.o: $(UTILS_SRC)/grabscreen.h
+extrusion.o: $(UTILS_SRC)/visual.h
+extrusion.o: $(UTILS_SRC)/xshm.h
+extrusion-helix2.o: ../../config.h
+extrusion-helix3.o: ../../config.h
+extrusion-helix4.o: ../../config.h
+extrusion-joinoffset.o: ../../config.h
+extrusion-screw.o: ../../config.h
+extrusion-taper.o: ../../config.h
+extrusion-twistoid.o: ../../config.h
+sierpinski3d.o: $(HACK_SRC)/xlockmore.h
+sierpinski3d.o: ../../config.h
+sierpinski3d.o: $(HACK_SRC)/xlockmoreI.h
+sierpinski3d.o: $(HACK_SRC)/screenhack.h
+sierpinski3d.o: $(UTILS_SRC)/yarandom.h
+sierpinski3d.o: $(UTILS_SRC)/usleep.h
+sierpinski3d.o: $(UTILS_SRC)/resources.h
+sierpinski3d.o: $(UTILS_SRC)/hsv.h
+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