X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2FMakefile.in;h=f85df1cfd59659410c9af49963633a7a13f4697d;hb=0bd2eabab3e404c6769fe8f59b639275e960c415;hp=2f8292b6b803478e7e5445764af86b757f646caf;hpb=f3e0240915ed9f9b3a61781f5c7002d587563fe0;p=xscreensaver

diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in
index 2f8292b6..f85df1cf 100644
--- a/hacks/glx/Makefile.in
+++ b/hacks/glx/Makefile.in
@@ -30,6 +30,7 @@ SHELL		= /bin/sh
 INSTALL		= @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA	= @INSTALL_DATA@
+INSTALL_DIRS	= @INSTALL_DIRS@
 HACKDIR		= @HACKDIR@
 
 X_CFLAGS	= @X_CFLAGS@
@@ -37,6 +38,8 @@ X_LIBS		= @X_LIBS@
 X_PRE_LIBS	= @X_PRE_LIBS@
 X_EXTRA_LIBS	= @X_EXTRA_LIBS@
 
+# Note: see comment in ../driver/Makefile.in for explanation of X_LIBS, etc.
+#
 HACK_LIBS	= $(LIBS) $(X_LIBS) $(X_PRE_LIBS) @GL_LIBS@ @HACK_LIBS@ \
 		  -lXt -lX11 -lXext $(X_EXTRA_LIBS) -lm
 
@@ -45,8 +48,7 @@ HACK_BIN	= ..
 UTILS_SRC	= $(HACK_SRC)/../utils
 UTILS_BIN	= $(HACK_BIN)/../utils
 
-INCLUDES	= -I$(srcdir) -I$(UTILS_SRC) -I$(HACK_SRC) \
-		  -I$(HACK_SRC)/.. @INCLUDES@
+INCLUDES	= -I$(srcdir) -I$(UTILS_SRC) -I$(HACK_SRC) -I../.. @INCLUDES@
 
 UTIL_SRCS	= $(UTILS_SRC)/colors.c $(UTILS_SRC)/hsv.c \
 		  $(UTILS_SRC)/resources.c $(UTILS_SRC)/usleep.c \
@@ -55,17 +57,20 @@ UTIL_OBJS	= $(UTILS_SRC)/colors.o $(UTILS_SRC)/hsv.o \
 		  $(UTILS_SRC)/resources.o $(UTILS_SRC)/usleep.o \
 		  $(UTILS_SRC)/visual.o $(UTILS_SRC)/yarandom.o
 
-SRCS		= buildlwo.c escher.c gears.c morph3d.c pipeobjs.c pipes.c \
-		  s1_1.c s1_2.c s1_3.c s1_4.c s1_5.c s1_6.c s1_b.c \
-		  sproingies.c sproingiewrap.c superquadrics.c rubik.c \
+SRCS		= atlantis.c buildlwo.c cage.c dolphin.c gears.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
 
-OBJS		= buildlwo.o escher.o gears.o morph3d.o pipeobjs.o pipes.o \
-		  s1_1.o s1_2.o s1_3.o s1_4.o s1_5.o s1_6.o s1_b.o \
-		  sproingies.o sproingiewrap.o superquadrics.o rubik.o \
+OBJS		= atlantis.o buildlwo.o cage.o dolphin.o gears.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
 
-GL_EXES		= escher gears pipes sproingies superquadrics morph3d rubik
+GL_EXES		= cage gears moebius pipes sproingies stairs superquadrics \
+		  morph3d rubik atlantis
 EXES		= @GL_EXES@
 
 HACK_OBJS	= screenhack-gl.o xlock-gl.o $(HACK_BIN)/xlockmore.o \
@@ -73,7 +78,7 @@ HACK_OBJS	= screenhack-gl.o xlock-gl.o $(HACK_BIN)/xlockmore.o \
 		  $(UTILS_BIN)/usleep.o $(UTILS_BIN)/yarandom.o \
 		  $(UTILS_BIN)/hsv.o $(UTILS_BIN)/colors.o
 
-HDRS		= buildlwo.h e_textures.h
+HDRS		= atlantis.h buildlwo.h e_textures.h
 MEN		= 
 EXTRAS		= README Makefile.in
 
@@ -90,6 +95,7 @@ install-strip:
 
 install-program:
 	@exes="$(EXES)" ;						\
+	if [ ! -d $(HACKDIR) ]; then $(INSTALL_DIRS) $(HACKDIR) ; fi ;	\
 	for program in $$exes; do					\
 	  echo $(INSTALL_PROGRAM) $$program $(HACKDIR)/$$program ;	\
 	  $(INSTALL_PROGRAM) $$program $(HACKDIR)/$$program ;		\
@@ -97,6 +103,7 @@ install-program:
 
 install-man:
 	@men="$(MEN)" ;							\
+	if [ ! -d $(man1dir) ]; then $(INSTALL_DIRS) $(man1dir) ; fi ;	\
 	for man in $$men; do						\
 	  instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ;	\
 	  echo $(INSTALL_DATA) $(srcdir)/$$man $(man1dir)/$$instname ;	\
@@ -134,7 +141,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::
 	@echo updating dependencies in `pwd`/Makefile.in... ;		    \
 	$(DEPEND) -w 0 -f - 						    \
 	-s '# DO NOT DELETE: updated by make distdepend' $(DEPEND_FLAGS) -- \
@@ -146,7 +153,9 @@ distdepend:
 	      -e 's@\.\./\.\./utils@$$(UTILS_SRC)@g'			    \
 	      -e 's@\.\./glx/@@g'					    \
 	      -e 's@ \.\./@ $$(HACK_SRC)/@g'				    \
-	      -e 's@ \([^$$]\)@ $$(srcdir)/\1@g' ;			    \
+	      -e 's@ \([^$$]\)@ $$(srcdir)/\1@g'			    \
+	      -e 's@ $$(srcdir)/\(.*config.h\)@ \1@g'			    \
+	      -e 's@ $$(HACK_SRC)/\(.*config.h\)@ ../\1@g' ;		    \
 	  echo ''							    \
 	) > /tmp/distdepend.$$$$ &&					    \
 	mv Makefile.in Makefile.in.bak &&				    \
@@ -192,25 +201,35 @@ screenhack-gl.o: $(HACK_SRC)/screenhack.c
 
 CC_HACK		= $(CC) $(LDFLAGS)
 
-gears:		gears.o		$(HACK_OBJS)
+atlantis:	atlantis.o	$(HACK_OBJS) dolphin.o shark.o swim.o whale.o
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) dolphin.o shark.o swim.o whale.o \
+				$(HACK_LIBS)
+
+cage:		cage.o		$(HACK_OBJS)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HACK_LIBS)
 
-superquadrics:	superquadrics.o	$(HACK_OBJS)
+gears:		gears.o		$(HACK_OBJS)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HACK_LIBS)
 
-escher:		escher.o	$(HACK_OBJS)
+moebius:	moebius.o		$(HACK_OBJS)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HACK_LIBS)
 
 pipes:		pipes.o		$(HACK_OBJS) pipeobjs.o buildlwo.o
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) pipeobjs.o buildlwo.o \
 	  $(HACK_LIBS)
 
+superquadrics:	superquadrics.o	$(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HACK_LIBS)
+
 morph3d:	morph3d.o	$(HACK_OBJS)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HACK_LIBS)
 
 rubik:		rubik.o	$(HACK_OBJS)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HACK_LIBS)
 
+stairs:		stairs.o	$(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HACK_LIBS)
+
 SPROINGIES = sproingiewrap.o buildlwo.o \
 	     s1_1.o s1_2.o s1_3.o s1_4.o s1_5.o s1_6.o s1_b.o
 sproingies: sproingies.o $(HACK_OBJS) $(SPROINGIES)
@@ -221,21 +240,34 @@ sproingies: sproingies.o $(HACK_OBJS) $(SPROINGIES)
 #
 # DO NOT DELETE: updated by make distdepend
 
+atlantis.o: $(HACK_SRC)/xlockmore.h
+atlantis.o: ../../config.h
+atlantis.o: $(HACK_SRC)/xlockmoreI.h
+atlantis.o: $(HACK_SRC)/screenhack.h
+atlantis.o: $(UTILS_SRC)/yarandom.h
+atlantis.o: $(UTILS_SRC)/usleep.h
+atlantis.o: $(UTILS_SRC)/resources.h
+atlantis.o: $(UTILS_SRC)/hsv.h
+atlantis.o: $(UTILS_SRC)/colors.h
+atlantis.o: $(UTILS_SRC)/grabscreen.h
+atlantis.o: $(UTILS_SRC)/visual.h
+atlantis.o: $(srcdir)/atlantis.h
 buildlwo.o: $(srcdir)/buildlwo.h
-escher.o: $(HACK_SRC)/xlockmore.h
-escher.o: $(HACK_SRC)/../config.h
-escher.o: $(HACK_SRC)/xlockmoreI.h
-escher.o: $(HACK_SRC)/screenhack.h
-escher.o: $(UTILS_SRC)/yarandom.h
-escher.o: $(UTILS_SRC)/usleep.h
-escher.o: $(UTILS_SRC)/resources.h
-escher.o: $(UTILS_SRC)/hsv.h
-escher.o: $(UTILS_SRC)/colors.h
-escher.o: $(UTILS_SRC)/grabscreen.h
-escher.o: $(UTILS_SRC)/visual.h
-escher.o: $(srcdir)/e_textures.h
+cage.o: $(HACK_SRC)/xlockmore.h
+cage.o: ../../config.h
+cage.o: $(HACK_SRC)/xlockmoreI.h
+cage.o: $(HACK_SRC)/screenhack.h
+cage.o: $(UTILS_SRC)/yarandom.h
+cage.o: $(UTILS_SRC)/usleep.h
+cage.o: $(UTILS_SRC)/resources.h
+cage.o: $(UTILS_SRC)/hsv.h
+cage.o: $(UTILS_SRC)/colors.h
+cage.o: $(UTILS_SRC)/grabscreen.h
+cage.o: $(UTILS_SRC)/visual.h
+cage.o: $(srcdir)/e_textures.h
+dolphin.o: $(srcdir)/atlantis.h
 gears.o: $(HACK_SRC)/xlockmore.h
-gears.o: $(HACK_SRC)/../config.h
+gears.o: ../../config.h
 gears.o: $(HACK_SRC)/xlockmoreI.h
 gears.o: $(HACK_SRC)/screenhack.h
 gears.o: $(UTILS_SRC)/yarandom.h
@@ -245,8 +277,20 @@ gears.o: $(UTILS_SRC)/hsv.h
 gears.o: $(UTILS_SRC)/colors.h
 gears.o: $(UTILS_SRC)/grabscreen.h
 gears.o: $(UTILS_SRC)/visual.h
+moebius.o: $(HACK_SRC)/xlockmore.h
+moebius.o: ../../config.h
+moebius.o: $(HACK_SRC)/xlockmoreI.h
+moebius.o: $(HACK_SRC)/screenhack.h
+moebius.o: $(UTILS_SRC)/yarandom.h
+moebius.o: $(UTILS_SRC)/usleep.h
+moebius.o: $(UTILS_SRC)/resources.h
+moebius.o: $(UTILS_SRC)/hsv.h
+moebius.o: $(UTILS_SRC)/colors.h
+moebius.o: $(UTILS_SRC)/grabscreen.h
+moebius.o: $(UTILS_SRC)/visual.h
+moebius.o: $(srcdir)/e_textures.h
 morph3d.o: $(HACK_SRC)/xlockmore.h
-morph3d.o: $(HACK_SRC)/../config.h
+morph3d.o: ../../config.h
 morph3d.o: $(HACK_SRC)/xlockmoreI.h
 morph3d.o: $(HACK_SRC)/screenhack.h
 morph3d.o: $(UTILS_SRC)/yarandom.h
@@ -258,7 +302,7 @@ morph3d.o: $(UTILS_SRC)/grabscreen.h
 morph3d.o: $(UTILS_SRC)/visual.h
 pipeobjs.o: $(srcdir)/buildlwo.h
 pipes.o: $(HACK_SRC)/xlockmore.h
-pipes.o: $(HACK_SRC)/../config.h
+pipes.o: ../../config.h
 pipes.o: $(HACK_SRC)/xlockmoreI.h
 pipes.o: $(HACK_SRC)/screenhack.h
 pipes.o: $(UTILS_SRC)/yarandom.h
@@ -269,6 +313,17 @@ pipes.o: $(UTILS_SRC)/colors.h
 pipes.o: $(UTILS_SRC)/grabscreen.h
 pipes.o: $(UTILS_SRC)/visual.h
 pipes.o: $(srcdir)/buildlwo.h
+rubik.o: $(HACK_SRC)/xlockmore.h
+rubik.o: ../../config.h
+rubik.o: $(HACK_SRC)/xlockmoreI.h
+rubik.o: $(HACK_SRC)/screenhack.h
+rubik.o: $(UTILS_SRC)/yarandom.h
+rubik.o: $(UTILS_SRC)/usleep.h
+rubik.o: $(UTILS_SRC)/resources.h
+rubik.o: $(UTILS_SRC)/hsv.h
+rubik.o: $(UTILS_SRC)/colors.h
+rubik.o: $(UTILS_SRC)/grabscreen.h
+rubik.o: $(UTILS_SRC)/visual.h
 s1_1.o: $(srcdir)/buildlwo.h
 s1_2.o: $(srcdir)/buildlwo.h
 s1_3.o: $(srcdir)/buildlwo.h
@@ -276,9 +331,10 @@ s1_4.o: $(srcdir)/buildlwo.h
 s1_5.o: $(srcdir)/buildlwo.h
 s1_6.o: $(srcdir)/buildlwo.h
 s1_b.o: $(srcdir)/buildlwo.h
+shark.o: $(srcdir)/atlantis.h
 sproingies.o: $(HACK_SRC)/xlockmoreI.h
 sproingies.o: $(HACK_SRC)/screenhack.h
-sproingies.o: $(HACK_SRC)/../config.h
+sproingies.o: ../../config.h
 sproingies.o: $(UTILS_SRC)/yarandom.h
 sproingies.o: $(UTILS_SRC)/usleep.h
 sproingies.o: $(UTILS_SRC)/resources.h
@@ -288,7 +344,7 @@ sproingies.o: $(UTILS_SRC)/grabscreen.h
 sproingies.o: $(UTILS_SRC)/visual.h
 sproingies.o: $(srcdir)/buildlwo.h
 sproingiewrap.o: $(HACK_SRC)/xlockmore.h
-sproingiewrap.o: $(HACK_SRC)/../config.h
+sproingiewrap.o: ../../config.h
 sproingiewrap.o: $(HACK_SRC)/xlockmoreI.h
 sproingiewrap.o: $(HACK_SRC)/screenhack.h
 sproingiewrap.o: $(UTILS_SRC)/yarandom.h
@@ -298,8 +354,20 @@ sproingiewrap.o: $(UTILS_SRC)/hsv.h
 sproingiewrap.o: $(UTILS_SRC)/colors.h
 sproingiewrap.o: $(UTILS_SRC)/grabscreen.h
 sproingiewrap.o: $(UTILS_SRC)/visual.h
+stairs.o: $(HACK_SRC)/xlockmore.h
+stairs.o: ../../config.h
+stairs.o: $(HACK_SRC)/xlockmoreI.h
+stairs.o: $(HACK_SRC)/screenhack.h
+stairs.o: $(UTILS_SRC)/yarandom.h
+stairs.o: $(UTILS_SRC)/usleep.h
+stairs.o: $(UTILS_SRC)/resources.h
+stairs.o: $(UTILS_SRC)/hsv.h
+stairs.o: $(UTILS_SRC)/colors.h
+stairs.o: $(UTILS_SRC)/grabscreen.h
+stairs.o: $(UTILS_SRC)/visual.h
+stairs.o: $(srcdir)/e_textures.h
 superquadrics.o: $(HACK_SRC)/xlockmore.h
-superquadrics.o: $(HACK_SRC)/../config.h
+superquadrics.o: ../../config.h
 superquadrics.o: $(HACK_SRC)/xlockmoreI.h
 superquadrics.o: $(HACK_SRC)/screenhack.h
 superquadrics.o: $(UTILS_SRC)/yarandom.h
@@ -309,19 +377,20 @@ superquadrics.o: $(UTILS_SRC)/hsv.h
 superquadrics.o: $(UTILS_SRC)/colors.h
 superquadrics.o: $(UTILS_SRC)/grabscreen.h
 superquadrics.o: $(UTILS_SRC)/visual.h
-rubik.o: $(HACK_SRC)/xlockmore.h
-rubik.o: $(HACK_SRC)/../config.h
-rubik.o: $(HACK_SRC)/xlockmoreI.h
-rubik.o: $(HACK_SRC)/screenhack.h
-rubik.o: $(UTILS_SRC)/yarandom.h
-rubik.o: $(UTILS_SRC)/usleep.h
-rubik.o: $(UTILS_SRC)/resources.h
-rubik.o: $(UTILS_SRC)/hsv.h
-rubik.o: $(UTILS_SRC)/colors.h
-rubik.o: $(UTILS_SRC)/grabscreen.h
-rubik.o: $(UTILS_SRC)/visual.h
+swim.o: $(HACK_SRC)/xlockmoreI.h
+swim.o: $(HACK_SRC)/screenhack.h
+swim.o: ../../config.h
+swim.o: $(UTILS_SRC)/yarandom.h
+swim.o: $(UTILS_SRC)/usleep.h
+swim.o: $(UTILS_SRC)/resources.h
+swim.o: $(UTILS_SRC)/hsv.h
+swim.o: $(UTILS_SRC)/colors.h
+swim.o: $(UTILS_SRC)/grabscreen.h
+swim.o: $(UTILS_SRC)/visual.h
+swim.o: $(srcdir)/atlantis.h
+whale.o: $(srcdir)/atlantis.h
 xlock-gl.o: $(HACK_SRC)/screenhack.h
-xlock-gl.o: $(HACK_SRC)/../config.h
+xlock-gl.o: ../../config.h
 xlock-gl.o: $(UTILS_SRC)/yarandom.h
 xlock-gl.o: $(UTILS_SRC)/usleep.h
 xlock-gl.o: $(UTILS_SRC)/resources.h