X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2FMakefile.in;h=4f186cf38268714134c62b2af432dd9f6d5fbc4d;hb=af290bcdf2d1c61efc8aaaff653745c900cbe98c;hp=e9ce414e314cf6ec7671c61146e29c856f8fcc7d;hpb=a719ec12b8b2563112366a8ac3196816fd64d2c7;p=xscreensaver

diff --git a/hacks/Makefile.in b/hacks/Makefile.in
index e9ce414e..4f186cf3 100644
--- a/hacks/Makefile.in
+++ b/hacks/Makefile.in
@@ -21,6 +21,7 @@ CFLAGS		= @CFLAGS@
 LDFLAGS		= @LDFLAGS@
 DEFS		= -DSTANDALONE @DEFS@
 LIBS		= @LIBS@
+PERL		= @PERL@
 
 DEPEND		= @DEPEND@
 DEPEND_FLAGS	= @DEPEND_FLAGS@
@@ -82,7 +83,9 @@ SRCS		= attraction.c blitspin.c bouboule.c braid.c bubbles.c \
 		  cynosure.c moire2.c flow.c epicycle.c interference.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
+		  squiral.c xflame.c wander.c spotlight.c critical.c \
+		  phosphor.c xmatrix.c petri.c shadebobs.c xsublim.c
+SCRIPTS		= vidwhacker webcollage
 
 OBJS		= attraction.o blitspin.o bouboule.o braid.o bubbles.o \
 		  bubbles-default.o decayscreen.o deco.o drift.o flag.o \
@@ -98,7 +101,8 @@ OBJS		= attraction.o blitspin.o bouboule.o braid.o bubbles.o \
 		  cynosure.o moire2.o flow.o epicycle.o interference.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
+		  squiral.o xflame.o wander.o spotlight.o critical.o \
+		  phosphor.o xmatrix.o petri.o shadebobs.o xsublim.o
 
 EXES		= attraction blitspin bouboule braid bubbles decayscreen deco \
 		  drift flag flame forest vines galaxy grav greynetic halo \
@@ -110,7 +114,8 @@ EXES		= attraction blitspin bouboule braid bubbles decayscreen deco \
 		  ant xjack xlyap jigsaw cynosure moire2 flow epicycle \
 		  interference truchet bsod crystal discrete distort kumppa \
 		  sonar demon loop t3d penetrate deluxe compass squiral \
-		  xflame wander spotlight critical
+		  xflame wander spotlight critical phosphor xmatrix petri \
+		  shadebobs xsublim
 
 HACK_OBJS_1	= $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \
 		  $(UTILS_BIN)/usleep.o $(UTILS_BIN)/yarandom.o @XMU_OBJS@
@@ -135,10 +140,10 @@ MEN		= attraction.man blitspin.man bouboule.man braid.man \
 		  slip.man sphere.man spiral.man strange.man swirl.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
+		  sonar.man t3d.man squiral.man spotlight.man critical.man \
+		  vidwhacker.man webcollage.man
 STAR		= *
 EXTRAS		= README Makefile.in xlock_23.h .gdbinit \
-		  vidwhacker \
 		  images/$(STAR).xbm \
 		  images/$(STAR).xpm \
 		  images/bubbles/$(STAR).pov \
@@ -150,25 +155,50 @@ EXTRAS		= README Makefile.in xlock_23.h .gdbinit \
 VMSFILES	= compile_axp.com compile_decc.com link_axp.com link_decc.com \
 		  vms_axp.opt vms_axp_12.opt vms_decc.opt vms_decc_12.opt
 
-TARFILES	= $(SRCS) $(HDRS) $(MEN) $(EXTRAS) $(VMSFILES)
+TARFILES	= $(SRCS) $(HDRS) $(SCRIPTS) $(MEN) $(EXTRAS) $(VMSFILES)
 
 
+default: all
 all: $(EXES)
 
-install:   install-program   install-man
+install:   install-program   install-scripts install-man
 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 ;	\
-	for program in $$exes; do					\
+	@if [ ! -d $(HACKDIR) ]; then $(INSTALL_DIRS) $(HACKDIR) ; fi ;	\
+	for program in $(EXES); do					\
 	  echo $(INSTALL_PROGRAM) $$program $(HACKDIR)/$$program ;	\
 	  $(INSTALL_PROGRAM) $$program $(HACKDIR)/$$program ;		\
 	done
 
+install-scripts: $(SCRIPTS) munge-scripts
+	@for program in $(SCRIPTS); do					\
+	  if [ -r $$program ] ; then					\
+	    p=$$program ;						\
+	  else								\
+	    p=$(srcdir)/$$program ;					\
+	  fi ;								\
+	  echo $(INSTALL_PROGRAM) $$p $(HACKDIR)/$$program ;		\
+	  $(INSTALL_PROGRAM) $$p $(HACKDIR)/$$program ;			\
+	done
+
+munge-scripts: $(SCRIPTS)
+	@tmp=/tmp/mf.$$$$ ;						\
+	perl="${PERL}" ;						\
+	for program in $(SCRIPTS); do					\
+	  echo "adjusting location of perl in $$program..." ;		\
+	  sed "s@^\(#!\)\(/[^ ]*/perl[^ ]*\)\(.*\)\$$@\1$$perl\3@"	\
+	      < $(srcdir)/$$program > $$tmp ;				\
+	  if cmp -s $(srcdir)/$$program $$tmp ; then			\
+	    true ;							\
+	  else								\
+	    cat $$tmp > ./$$program ;					\
+	  fi ;								\
+	done
+
 install-man: $(MEN)
 	@men="$(MEN)" ;							\
 	if [ ! -d $(man1dir) ]; then $(INSTALL_DIRS) $(man1dir) ; fi ;	\
@@ -179,7 +209,7 @@ install-man: $(MEN)
 	done
 
 uninstall-program:
-	@for program in $(EXES); do					\
+	@for program in $(EXES) $(SCRIPTS); do				\
 	  echo rm -f $(HACKDIR)/$$program ;				\
 	  rm -f $(HACKDIR)/$$program ;					\
 	done
@@ -322,7 +352,7 @@ screenhack-xlock.o: screenhack.c
 	-DXLOCKMORE $(srcdir)/screenhack.c
 
 # Some abbreviations to keep the lines short...
-ALP		= $(HSV) $(UTILS_BIN)/alpha.o
+ALP		= $(UTILS_BIN)/alpha.o
 HSV		= $(UTILS_BIN)/hsv.o
 SPL		= $(UTILS_BIN)/spline.o
 XROG		= $(UTILS_BIN)/xroger.o $(SPL)
@@ -402,8 +432,8 @@ pedal:		pedal.o		$(HACK_OBJS) $(HSV)
 pyro:		pyro.o		$(HACK_OBJS) $(HSV)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HSV) $(HACK_LIBS)
 
-qix:		qix.o		$(HACK_OBJS) $(ALP)
-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(ALP) $(HACK_LIBS)
+qix:		qix.o		$(HACK_OBJS) $(HSV) $(ALP)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HSV) $(ALP) $(HACK_LIBS)
 
 rocks:		rocks.o		$(HACK_OBJS) $(COL)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(HACK_LIBS)
@@ -417,8 +447,8 @@ slidescreen:	slidescreen.o	$(HACK_OBJS) $(GRAB)
 xroger:		xroger-hack.o	$(HACK_OBJS) $(HSV) $(XROG)
 	$(CC_HACK) -o $@ xroger-hack.o	$(HACK_OBJS) $(HSV) $(XROG) $(HACK_LIBS)
 
-goop:		goop.o		$(HACK_OBJS) $(ALP) $(SPL)
-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(ALP) $(SPL) $(HACK_LIBS)
+goop:		goop.o		$(HACK_OBJS) $(HSV) $(ALP) $(SPL)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HSV) $(ALP) $(SPL) $(HACK_LIBS)
 
 starfish:	starfish.o	$(HACK_OBJS) $(COL) $(SPL)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(SPL) $(HACK_LIBS)
@@ -471,8 +501,8 @@ t3d:		t3d.o		$(HACK_OBJS) $(COL)
 penetrate:	penetrate.o	$(HACK_OBJS) $(COL)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(HACK_LIBS)
 
-deluxe:		deluxe.o	$(HACK_OBJS) $(COL) $(DBE)
-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(DBE) $(HACK_LIBS)
+deluxe:		deluxe.o	$(HACK_OBJS) $(ALP) $(COL) $(DBE)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(ALP) $(COL) $(DBE) $(HACK_LIBS)
 
 compass:	compass.o	$(HACK_OBJS) $(DBE)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(DBE) $(HACK_LIBS)
@@ -492,6 +522,18 @@ spotlight:	spotlight.o	$(HACK_OBJS) $(GRAB)
 critical:	critical.o	$(HACK_OBJS) $(COL) $(ERASE)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(ERASE) $(HACK_LIBS)
 
+phosphor:	phosphor.o	$(HACK_OBJS) $(COL)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(HACK_LIBS)
+
+xmatrix:	xmatrix.o	$(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HACK_LIBS) $(XPM_LIBS)
+
+petri:		petri.o		$(HACK_OBJS) $(COL) $(SPL)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(SPL) $(HACK_LIBS)
+
+shadebobs:	shadebobs.o	$(HACK_OBJS) $(COL) $(SPL)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(SPL) $(HACK_LIBS)
+
 
 # The rules for those hacks which follow the `xlockmore' API.
 #
@@ -596,6 +638,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
@@ -1534,6 +1583,7 @@ deluxe.o: $(UTILS_SRC)/hsv.h
 deluxe.o: $(UTILS_SRC)/colors.h
 deluxe.o: $(UTILS_SRC)/grabscreen.h
 deluxe.o: $(UTILS_SRC)/visual.h
+deluxe.o: $(UTILS_SRC)/alpha.h
 deluxe.o: $(UTILS_SRC)/xdbe.h
 compass.o: $(srcdir)/screenhack.h
 compass.o: ../config.h
@@ -1594,4 +1644,45 @@ critical.o: $(UTILS_SRC)/colors.h
 critical.o: $(UTILS_SRC)/grabscreen.h
 critical.o: $(UTILS_SRC)/visual.h
 critical.o: $(UTILS_SRC)/erase.h
+phosphor.o: $(srcdir)/screenhack.h
+phosphor.o: ../config.h
+phosphor.o: $(UTILS_SRC)/yarandom.h
+phosphor.o: $(UTILS_SRC)/usleep.h
+phosphor.o: $(UTILS_SRC)/resources.h
+phosphor.o: $(UTILS_SRC)/hsv.h
+phosphor.o: $(UTILS_SRC)/colors.h
+phosphor.o: $(UTILS_SRC)/grabscreen.h
+phosphor.o: $(UTILS_SRC)/visual.h
+xmatrix.o: $(srcdir)/screenhack.h
+xmatrix.o: ../config.h
+xmatrix.o: $(UTILS_SRC)/yarandom.h
+xmatrix.o: $(UTILS_SRC)/usleep.h
+xmatrix.o: $(UTILS_SRC)/resources.h
+xmatrix.o: $(UTILS_SRC)/hsv.h
+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/matrix.xbm
+petri.o: $(srcdir)/screenhack.h
+petri.o: ../config.h
+petri.o: $(UTILS_SRC)/yarandom.h
+petri.o: $(UTILS_SRC)/usleep.h
+petri.o: $(UTILS_SRC)/resources.h
+petri.o: $(UTILS_SRC)/hsv.h
+petri.o: $(UTILS_SRC)/colors.h
+petri.o: $(UTILS_SRC)/grabscreen.h
+petri.o: $(UTILS_SRC)/visual.h
+petri.o: $(UTILS_SRC)/spline.h
+shadebobs.o: $(srcdir)/screenhack.h
+shadebobs.o: ../config.h
+shadebobs.o: $(UTILS_SRC)/yarandom.h
+shadebobs.o: $(UTILS_SRC)/usleep.h
+shadebobs.o: $(UTILS_SRC)/resources.h
+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)/usleep.h
+xsublim.o: $(UTILS_SRC)/resources.h