X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2FMakefile.in;h=d51a7252a257871ad6af872ba3849a211c29ca62;hb=0ed85ca0e4b0eae40a4f50a51d63f2f41e45373a;hp=b97bf27e13977ab1a2767b19c1a0023e0faf1f65;hpb=df7adbee81405e2849728a24b498ad2117784b1f;p=xscreensaver

diff --git a/hacks/Makefile.in b/hacks/Makefile.in
index b97bf27e..d51a7252 100644
--- a/hacks/Makefile.in
+++ b/hacks/Makefile.in
@@ -1,4 +1,4 @@
-# hacks/Makefile.in --- xscreensaver, Copyright (c) 1997 Jamie Zawinski.
+# hacks/Makefile.in --- xscreensaver, Copyright (c) 1997-1999 Jamie Zawinski.
 # the `../configure' script generates `hacks/Makefile' from this file.
 
 @SET_MAKE@
@@ -84,7 +84,8 @@ SRCS		= attraction.c blitspin.c bouboule.c braid.c bubbles.c \
 		  truchet.c bsod.c crystal.c discrete.c distort.c kumppa.c \
 		  sonar.c demon.c loop.c t3d.c penetrate.c deluxe.c compass.c \
 		  squiral.c xflame.c wander.c spotlight.c critical.c \
-		  phosphor.c xmatrix.c petri.c shadebobs.c
+		  phosphor.c xmatrix.c petri.c shadebobs.c xsublim.c ccurve.c \
+		  blaster.c bumps.c ripples.c
 SCRIPTS		= vidwhacker webcollage
 
 OBJS		= attraction.o blitspin.o bouboule.o braid.o bubbles.o \
@@ -102,7 +103,8 @@ OBJS		= attraction.o blitspin.o bouboule.o braid.o bubbles.o \
 		  truchet.o bsod.o crystal.o discrete.o distort.o kumppa.o \
 		  sonar.o demon.o loop.o t3d.o penetrate.o deluxe.o compass.o \
 		  squiral.o xflame.o wander.o spotlight.o critical.o \
-		  phosphor.o xmatrix.o petri.o shadebobs.o
+		  phosphor.o xmatrix.o petri.o shadebobs.o xsublim.o ccurve.o \
+		  blaster.o bumps.o ripples.o
 
 EXES		= attraction blitspin bouboule braid bubbles decayscreen deco \
 		  drift flag flame forest vines galaxy grav greynetic halo \
@@ -115,7 +117,7 @@ EXES		= attraction blitspin bouboule braid bubbles decayscreen deco \
 		  interference truchet bsod crystal discrete distort kumppa \
 		  sonar demon loop t3d penetrate deluxe compass squiral \
 		  xflame wander spotlight critical phosphor xmatrix petri \
-		  shadebobs
+		  shadebobs xsublim ccurve blaster bumps ripples
 
 HACK_OBJS_1	= $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \
 		  $(UTILS_BIN)/usleep.o $(UTILS_BIN)/yarandom.o @XMU_OBJS@
@@ -128,7 +130,8 @@ XSHM_OBJS	= $(UTILS_BIN)/xshm.o
 XDBE_OBJS	= $(UTILS_BIN)/xdbe.o
 GRAB_LIBS	= $(SGI_VIDEO_LIBS)
 
-HDRS		= bubbles.h screenhack.h xlockmore.h xlockmoreI.h automata.h
+HDRS		= bubbles.h screenhack.h xlockmore.h xlockmoreI.h automata.h \
+		  bumps.h
 MEN		= attraction.man blitspin.man bouboule.man braid.man \
 		  bubbles.man decayscreen.man deco.man drift.man flag.man \
 		  flame.man forest.man vines.man galaxy.man grav.man \
@@ -141,7 +144,8 @@ MEN		= attraction.man blitspin.man bouboule.man braid.man \
 		  xroger.man goop.man starfish.man munch.man rd-bomb.man \
 		  xjack.man xlyap.man jigsaw.man epicycle.man bsod.man \
 		  sonar.man t3d.man squiral.man spotlight.man critical.man \
-		  vidwhacker.man webcollage.man
+		  vidwhacker.man webcollage.man xsublim.man distort.man \
+		  phosphor.man xmatrix.man
 STAR		= *
 EXTRAS		= README Makefile.in xlock_23.h .gdbinit \
 		  images/$(STAR).xbm \
@@ -168,10 +172,14 @@ install-strip:
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 
 install-program: $(EXES)
-	@if [ ! -d $(HACKDIR) ]; then $(INSTALL_DIRS) $(HACKDIR) ; fi ;	\
+	@if [ ! -d $(install_prefix)$(HACKDIR) ]; then			\
+	  $(INSTALL_DIRS) $(install_prefix)$(HACKDIR) ;			\
+	 fi ;								\
 	for program in $(EXES); do					\
-	  echo $(INSTALL_PROGRAM) $$program $(HACKDIR)/$$program ;	\
-	  $(INSTALL_PROGRAM) $$program $(HACKDIR)/$$program ;		\
+	  echo $(INSTALL_PROGRAM) $$program				\
+	    $(install_prefix)$(HACKDIR)/$$program ;			\
+	  $(INSTALL_PROGRAM) $$program					\
+	    $(install_prefix)$(HACKDIR)/$$program ;			\
 	done
 
 install-scripts: $(SCRIPTS) munge-scripts
@@ -181,8 +189,10 @@ install-scripts: $(SCRIPTS) munge-scripts
 	  else								\
 	    p=$(srcdir)/$$program ;					\
 	  fi ;								\
-	  echo $(INSTALL_PROGRAM) $$p $(HACKDIR)/$$program ;		\
-	  $(INSTALL_PROGRAM) $$p $(HACKDIR)/$$program ;			\
+	  echo $(INSTALL_PROGRAM) $$p					\
+	    $(install_prefix)$(HACKDIR)/$$program ;			\
+	  $(INSTALL_PROGRAM) $$p					\
+	    $(install_prefix)$(HACKDIR)/$$program ;			\
 	done
 
 munge-scripts: $(SCRIPTS)
@@ -201,25 +211,29 @@ munge-scripts: $(SCRIPTS)
 
 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) $(SCRIPTS); do				\
-	  echo rm -f $(HACKDIR)/$$program ;				\
-	  rm -f $(HACKDIR)/$$program ;					\
+	  echo rm -f $(install_prefix)$(HACKDIR)/$$program ;		\
+	  rm -f $(install_prefix)$(HACKDIR)/$$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:
@@ -534,6 +548,18 @@ petri:		petri.o		$(HACK_OBJS) $(COL) $(SPL)
 shadebobs:	shadebobs.o	$(HACK_OBJS) $(COL) $(SPL)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(SPL) $(HACK_LIBS)
 
+ccurve:		ccurve.o	$(HACK_OBJS) $(COL) $(SPL)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(ERASE) $(HACK_LIBS)
+
+blaster:	blaster.o	$(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HACK_LIBS)
+
+bumps:		bumps.o		$(HACK_OBJS) $(GRAB)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(GRAB) $(HACK_LIBS) $(GRAB_LIBS)
+
+ripples:	ripples.o	$(HACK_OBJS) $(SHM) $(GRAB)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(SHM) $(GRAB) $(HACK_LIBS) $(GRAB_LIBS)
+
 
 # The rules for those hacks which follow the `xlockmore' API.
 #
@@ -638,6 +664,13 @@ crystal:	crystal.o		$(XLOCK_OBJS)
 	$(CC_HACK) -o $@ $@.o	$(XLOCK_OBJS) $(HACK_LIBS)
 
 
+
+# This one is not like the others.
+#
+xsublim:	xsublim.o	$(HACK_OBJS_1)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS_1) $(HACK_LIBS)
+
+
 ##############################################################################
 #
 # DO NOT DELETE: updated by make distdepend
@@ -798,8 +831,8 @@ flame.o: $(UTILS_SRC)/hsv.h
 flame.o: $(UTILS_SRC)/colors.h
 flame.o: $(UTILS_SRC)/grabscreen.h
 flame.o: $(UTILS_SRC)/visual.h
-forest.o: $(srcdir)/xlockmore.h
 forest.o: ../config.h
+forest.o: $(srcdir)/xlockmore.h
 forest.o: $(srcdir)/xlockmoreI.h
 forest.o: $(srcdir)/screenhack.h
 forest.o: $(UTILS_SRC)/yarandom.h
@@ -810,7 +843,6 @@ forest.o: $(UTILS_SRC)/colors.h
 forest.o: $(UTILS_SRC)/grabscreen.h
 forest.o: $(UTILS_SRC)/visual.h
 forest.o: $(UTILS_SRC)/xshm.h
-forest.o: $(UTILS_SRC)/erase.h
 vines.o: $(srcdir)/xlockmore.h
 vines.o: ../config.h
 vines.o: $(srcdir)/xlockmoreI.h
@@ -1656,7 +1688,9 @@ xmatrix.o: $(UTILS_SRC)/colors.h
 xmatrix.o: $(UTILS_SRC)/grabscreen.h
 xmatrix.o: $(UTILS_SRC)/visual.h
 xmatrix.o: $(srcdir)/images/matrix.xpm
+xmatrix.o: $(srcdir)/images/matrix2.xpm
 xmatrix.o: $(srcdir)/images/matrix.xbm
+xmatrix.o: $(srcdir)/images/matrix2.xbm
 petri.o: $(srcdir)/screenhack.h
 petri.o: ../config.h
 petri.o: $(UTILS_SRC)/yarandom.h
@@ -1676,4 +1710,46 @@ shadebobs.o: $(UTILS_SRC)/hsv.h
 shadebobs.o: $(UTILS_SRC)/colors.h
 shadebobs.o: $(UTILS_SRC)/grabscreen.h
 shadebobs.o: $(UTILS_SRC)/visual.h
+xsublim.o: $(UTILS_SRC)/yarandom.h
+xsublim.o: $(UTILS_SRC)/usleep.h
+xsublim.o: $(UTILS_SRC)/resources.h
+ccurve.o: $(srcdir)/screenhack.h
+ccurve.o: ../config.h
+ccurve.o: $(UTILS_SRC)/yarandom.h
+ccurve.o: $(UTILS_SRC)/usleep.h
+ccurve.o: $(UTILS_SRC)/resources.h
+ccurve.o: $(UTILS_SRC)/hsv.h
+ccurve.o: $(UTILS_SRC)/colors.h
+ccurve.o: $(UTILS_SRC)/grabscreen.h
+ccurve.o: $(UTILS_SRC)/visual.h
+ccurve.o: $(UTILS_SRC)/erase.h
+blaster.o: $(srcdir)/screenhack.h
+blaster.o: ../config.h
+blaster.o: $(UTILS_SRC)/yarandom.h
+blaster.o: $(UTILS_SRC)/usleep.h
+blaster.o: $(UTILS_SRC)/resources.h
+blaster.o: $(UTILS_SRC)/hsv.h
+blaster.o: $(UTILS_SRC)/colors.h
+blaster.o: $(UTILS_SRC)/grabscreen.h
+blaster.o: $(UTILS_SRC)/visual.h
+bumps.o: $(srcdir)/bumps.h
+bumps.o: $(srcdir)/screenhack.h
+bumps.o: ../config.h
+bumps.o: $(UTILS_SRC)/yarandom.h
+bumps.o: $(UTILS_SRC)/usleep.h
+bumps.o: $(UTILS_SRC)/resources.h
+bumps.o: $(UTILS_SRC)/hsv.h
+bumps.o: $(UTILS_SRC)/colors.h
+bumps.o: $(UTILS_SRC)/grabscreen.h
+bumps.o: $(UTILS_SRC)/visual.h
+ripples.o: $(srcdir)/screenhack.h
+ripples.o: ../config.h
+ripples.o: $(UTILS_SRC)/yarandom.h
+ripples.o: $(UTILS_SRC)/usleep.h
+ripples.o: $(UTILS_SRC)/resources.h
+ripples.o: $(UTILS_SRC)/hsv.h
+ripples.o: $(UTILS_SRC)/colors.h
+ripples.o: $(UTILS_SRC)/grabscreen.h
+ripples.o: $(UTILS_SRC)/visual.h
+ripples.o: $(UTILS_SRC)/xshm.h