X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2FMakefile.in;h=9e55906b2bbeb18ffb124c1c0644420c0eecc850;hb=a445bdd3e3ba4abbee441844b6665b4c3c13d48c;hp=5da1b76af0bd2b55e7b2218bd6355db16bc687ed;hpb=06e9a7886a77cad92f9ddbc169d6d199a4d8b76d;p=xscreensaver

diff --git a/hacks/Makefile.in b/hacks/Makefile.in
index 5da1b76a..9e55906b 100644
--- a/hacks/Makefile.in
+++ b/hacks/Makefile.in
@@ -30,7 +30,7 @@ DEPEND_DEFINES	= @DEPEND_DEFINES@
 SHELL		= /bin/sh
 INSTALL		= @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT  = @INSTALL_PROGRAM@
+INSTALL_SCRIPT  = @INSTALL_SCRIPT@
 INSTALL_DATA	= @INSTALL_DATA@
 INSTALL_DIRS	= @INSTALL_DIRS@
 HACKDIR		= @HACKDIR@
@@ -59,14 +59,14 @@ UTIL_SRCS	= $(UTILS_SRC)/alpha.c $(UTILS_SRC)/colors.c \
 		  $(UTILS_SRC)/grabscreen.c $(UTILS_SRC)/hsv.c \
 		  $(UTILS_SRC)/resources.c $(UTILS_SRC)/spline.c \
 		  $(UTILS_SRC)/usleep.c $(UTILS_SRC)/visual.c \
-		  $(UTILS_SRC)/xroger.c $(UTILS_SRC)/yarandom.c \
+		  $(UTILS_SRC)/logo.c $(UTILS_SRC)/yarandom.c \
 	 	  $(UTILS_SRC)/erase.c $(UTILS_SRC)/sgivideo.c \
 		  $(UTILS_SRC)/xshm.c $(UTILS_SRC)/xdbe.c
 UTIL_OBJS	= $(UTILS_BIN)/alpha.o $(UTILS_BIN)/colors.o \
 		  $(UTILS_BIN)/grabscreen.o $(UTILS_BIN)/hsv.o \
 		  $(UTILS_BIN)/resources.o $(UTILS_BIN)/spline.o \
 		  $(UTILS_BIN)/usleep.o $(UTILS_BIN)/visual.o \
-		  $(UTILS_BIN)/xroger.o $(UTILS_BIN)/yarandom.o \
+		  $(UTILS_BIN)/logo.o $(UTILS_BIN)/yarandom.o \
 		  $(UTILS_BIN)/erase.o $(UTILS_BIN)/sgivideo.o \
 		  $(UTILS_SRC)/xshm.o $(UTILS_SRC)/xdbe.o
 
@@ -78,7 +78,7 @@ SRCS		= attraction.c blitspin.c bouboule.c braid.c bubbles.c \
 		  maze.c moire.c noseguy.c pedal.c penrose.c pyro.c qix.c \
 		  rocks.c rorschach.c screenhack.c sierpinski.c slidescreen.c \
 		  slip.c sphere.c spiral.c strange.c swirl.c xlockmore.c \
-		  xroger-hack.c goop.c starfish.c munch.c fadeplot.c \
+		  goop.c starfish.c munch.c fadeplot.c \
 		  rd-bomb.c coral.c mountain.c triangle.c lissie.c worm.c \
 		  rotor.c ant.c xjack.c xlyap.c jigsaw.c xscreensaver-sgigl.c \
 		  cynosure.c moire2.c flow.c epicycle.c interference.c \
@@ -86,7 +86,9 @@ SRCS		= attraction.c blitspin.c bouboule.c braid.c bubbles.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 xsublim.c ccurve.c \
-		  blaster.c bumps.c ripples.c xteevee.c xspirograph.c
+		  blaster.c bumps.c ripples.c xteevee.c xspirograph.c \
+		  nerverot.c xrayswarm.c hyperball.c zoom.c whirlwindwarp.c \
+		  rotzoomer.c
 SCRIPTS		= vidwhacker webcollage
 
 OBJS		= attraction.o blitspin.o bouboule.o braid.o bubbles.o \
@@ -97,7 +99,7 @@ OBJS		= attraction.o blitspin.o bouboule.o braid.o bubbles.o \
 		  maze.o moire.o noseguy.o pedal.o penrose.o pyro.o qix.o \
 		  rocks.o rorschach.o screenhack.o sierpinski.o slidescreen.o \
 		  slip.o sphere.o spiral.o strange.o swirl.o xlockmore.o \
-		  xroger-hack.o goop.o starfish.o munch.o fadeplot.o \
+		  goop.o starfish.o munch.o fadeplot.o \
 		  rd-bomb.o coral.o mountain.o triangle.o lissie.o worm.o \
 		  rotor.o ant.o xjack.o xlyap.o jigsaw.o xscreensaver-sgigl.o \
 		  cynosure.o moire2.o flow.o epicycle.o interference.o \
@@ -105,21 +107,24 @@ OBJS		= attraction.o blitspin.o bouboule.o braid.o bubbles.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 xsublim.o ccurve.o \
-		  blaster.o bumps.o ripples.o xteevee.o xspirograph.o
+		  blaster.o bumps.o ripples.o xteevee.o xspirograph.o \
+		  nerverot.o xrayswarm.o hyperball.o zoom.o whirlwindwarp.o \
+		  rotzoomer.o
 
 EXES		= attraction blitspin bouboule braid bubbles decayscreen deco \
 		  drift flag flame forest vines galaxy grav greynetic halo \
 		  helix hopalong hypercube ifs imsmap julia kaleidescope \
 		  laser lightning lisa lmorph maze moire noseguy pedal \
 		  penrose pyro qix rocks rorschach sierpinski slidescreen \
-		  slip sphere spiral strange swirl xroger goop starfish munch \
+		  slip sphere spiral strange swirl goop starfish munch \
 		  fadeplot rd-bomb coral mountain triangle lissie worm rotor \
 		  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 phosphor xmatrix petri \
 		  shadebobs xsublim ccurve blaster bumps ripples xteevee \
-		  xspirograph
+		  xspirograph nerverot xrayswarm hyperball zoom whirlwindwarp \
+		  rotzoomer
 
 HACK_OBJS_1	= $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \
 		  $(UTILS_BIN)/usleep.o $(UTILS_BIN)/yarandom.o @XMU_OBJS@
@@ -143,11 +148,13 @@ MEN		= attraction.man blitspin.man bouboule.man braid.man \
 		  noseguy.man pedal.man penrose.man pyro.man qix.man \
 		  rocks.man rorschach.man sierpinski.man slidescreen.man \
 		  slip.man sphere.man spiral.man strange.man swirl.man \
-		  xroger.man goop.man starfish.man munch.man rd-bomb.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 xsublim.man distort.man \
-		  phosphor.man xmatrix.man xteevee.man
+		  phosphor.man xmatrix.man xteevee.man xflame.man petri.man \
+		  nerverot.man zoom.man whirlwindwarp.man hyperball.man \
+		  rotzoomer.man
 STAR		= *
 EXTRAS		= README Makefile.in xlock_23.h .gdbinit \
 		  images/$(STAR).xbm \
@@ -157,6 +164,7 @@ EXTRAS		= README Makefile.in xlock_23.h .gdbinit \
 		  images/noseguy/$(STAR).xbm \
 		  images/noseguy/$(STAR).xpm \
 		  images/jigsaw/$(STAR).xbm  \
+		  images/molecules/$(STAR).pdb
 
 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
@@ -346,7 +354,7 @@ $(UTILS_BIN)/spline.o:		$(UTILS_SRC)/spline.c
 $(UTILS_BIN)/usleep.o:		$(UTILS_SRC)/usleep.c
 $(UTILS_BIN)/visual.o:		$(UTILS_SRC)/visual.c
 $(UTILS_BIN)/xmu.o:		$(UTILS_SRC)/xmu.c
-$(UTILS_BIN)/xroger.o:		$(UTILS_SRC)/xroger.c
+$(UTILS_BIN)/logo.o:		$(UTILS_SRC)/logo.c
 $(UTILS_BIN)/yarandom.o:	$(UTILS_SRC)/yarandom.c
 $(UTILS_BIN)/erase.o:		$(UTILS_SRC)/erase.c
 $(UTILS_BIN)/xshm.o:		$(UTILS_SRC)/xshm.c
@@ -371,7 +379,7 @@ screenhack-xlock.o: screenhack.c
 ALP		= $(UTILS_BIN)/alpha.o
 HSV		= $(UTILS_BIN)/hsv.o
 SPL		= $(UTILS_BIN)/spline.o
-XROG		= $(UTILS_BIN)/xroger.o $(SPL)
+LOGO		= $(UTILS_BIN)/logo.o $(SPL)
 GRAB		= $(GRAB_OBJS)
 ERASE		= $(UTILS_BIN)/erase.o
 COL		= $(COLOR_OBJS)
@@ -430,8 +438,8 @@ kaleidescope:	kaleidescope.o	$(HACK_OBJS)
 lmorph:		lmorph.o	$(HACK_OBJS)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HACK_LIBS)
 
-maze:		maze.o		$(HACK_OBJS) $(ERASE) $(XROG)
-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(ERASE) $(XROG) $(HACK_LIBS)
+maze:		maze.o		$(HACK_OBJS) $(ERASE) $(LOGO)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(ERASE) $(LOGO) $(HACK_LIBS)
 
 moire:		moire.o		$(HACK_OBJS) $(COL) $(SHM)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(SHM) $(HACK_LIBS)
@@ -460,9 +468,6 @@ rorschach:	rorschach.o	$(HACK_OBJS) $(HSV) $(ERASE)
 slidescreen:	slidescreen.o	$(HACK_OBJS) $(GRAB)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(GRAB) $(HACK_LIBS) $(GRAB_LIBS)
 
-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) $(HSV) $(ALP) $(SPL)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HSV) $(ALP) $(SPL) $(HACK_LIBS)
 
@@ -499,8 +504,8 @@ interference:  interference.o	$(HACK_OBJS) $(COL) $(SHM) $(DBE)
 truchet:	 truchet.o	$(HACK_OBJS) $(COL)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(HACK_LIBS)
 
-bsod:	 	bsod.o		$(HACK_OBJS) $(COL)
-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(HACK_LIBS) $(XPM_LIBS)
+bsod:	 	bsod.o		$(HACK_OBJS) $(GRAB)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(GRAB) $(HACK_LIBS) $(XPM_LIBS) $(GRAB_LIBS)
 
 distort:	distort.o	$(HACK_OBJS) $(GRAB) $(SHM)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(GRAB) $(SHM) $(HACK_LIBS) $(GRAB_LIBS)
@@ -568,6 +573,24 @@ xteevee:	xteevee.o	$(HACK_OBJS) $(GRAB)
 xspirograph:	xspirograph.o	$(HACK_OBJS) $(COL) $(ERASE)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(ERASE) $(HACK_LIBS)
 
+nerverot:	nerverot.o	$(HACK_OBJS) $(COL)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(HACK_LIBS)
+
+xrayswarm:	xrayswarm.o	$(HACK_OBJS) 
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HACK_LIBS)
+
+hyperball:	hyperball.o	$(HACK_OBJS)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HACK_LIBS)
+
+zoom:	zoom.o	$(HACK_OBJS) $(GRAB)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(GRAB) $(HACK_LIBS) $(GRAB_LIBS)
+
+whirlwindwarp:	whirlwindwarp.o	$(HACK_OBJS) $(COL)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(HACK_LIBS)
+
+rotzoomer:	rotzoomer.o	$(HACK_OBJS) $(GRAB) $(SHM)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(GRAB) $(SHM) $(HACK_LIBS) $(GRAB_LIBS)
+
 
 # The rules for those hacks which follow the `xlockmore' API.
 #
@@ -1226,15 +1249,6 @@ xlockmore.o: $(UTILS_SRC)/grabscreen.h
 xlockmore.o: $(UTILS_SRC)/visual.h
 xlockmore.o: $(srcdir)/xlockmoreI.h
 xlockmore.o: $(UTILS_SRC)/xshm.h
-xroger-hack.o: $(srcdir)/screenhack.h
-xroger-hack.o: ../config.h
-xroger-hack.o: $(UTILS_SRC)/yarandom.h
-xroger-hack.o: $(UTILS_SRC)/usleep.h
-xroger-hack.o: $(UTILS_SRC)/resources.h
-xroger-hack.o: $(UTILS_SRC)/hsv.h
-xroger-hack.o: $(UTILS_SRC)/colors.h
-xroger-hack.o: $(UTILS_SRC)/grabscreen.h
-xroger-hack.o: $(UTILS_SRC)/visual.h
 goop.o: $(srcdir)/screenhack.h
 goop.o: ../config.h
 goop.o: $(UTILS_SRC)/yarandom.h
@@ -1648,6 +1662,7 @@ xflame.o: $(UTILS_SRC)/colors.h
 xflame.o: $(UTILS_SRC)/grabscreen.h
 xflame.o: $(UTILS_SRC)/visual.h
 xflame.o: $(UTILS_SRC)/xshm.h
+xflame.o: $(srcdir)/images/bob.xbm
 wander.o: $(srcdir)/screenhack.h
 wander.o: ../config.h
 wander.o: $(UTILS_SRC)/yarandom.h
@@ -1779,4 +1794,60 @@ xspirograph.o: $(UTILS_SRC)/colors.h
 xspirograph.o: $(UTILS_SRC)/grabscreen.h
 xspirograph.o: $(UTILS_SRC)/visual.h
 xspirograph.o: $(UTILS_SRC)/erase.h
+nerverot.o: $(srcdir)/screenhack.h
+nerverot.o: ../config.h
+nerverot.o: $(UTILS_SRC)/yarandom.h
+nerverot.o: $(UTILS_SRC)/usleep.h
+nerverot.o: $(UTILS_SRC)/resources.h
+nerverot.o: $(UTILS_SRC)/hsv.h
+nerverot.o: $(UTILS_SRC)/colors.h
+nerverot.o: $(UTILS_SRC)/grabscreen.h
+nerverot.o: $(UTILS_SRC)/visual.h
+xrayswarm.o: $(srcdir)/screenhack.h
+xrayswarm.o: ../config.h
+xrayswarm.o: $(UTILS_SRC)/yarandom.h
+xrayswarm.o: $(UTILS_SRC)/usleep.h
+xrayswarm.o: $(UTILS_SRC)/resources.h
+xrayswarm.o: $(UTILS_SRC)/hsv.h
+xrayswarm.o: $(UTILS_SRC)/colors.h
+xrayswarm.o: $(UTILS_SRC)/grabscreen.h
+xrayswarm.o: $(UTILS_SRC)/visual.h
+hyperball.o: $(srcdir)/screenhack.h
+hyperball.o: ../config.h
+hyperball.o: $(UTILS_SRC)/yarandom.h
+hyperball.o: $(UTILS_SRC)/usleep.h
+hyperball.o: $(UTILS_SRC)/resources.h
+hyperball.o: $(UTILS_SRC)/hsv.h
+hyperball.o: $(UTILS_SRC)/colors.h
+hyperball.o: $(UTILS_SRC)/grabscreen.h
+hyperball.o: $(UTILS_SRC)/visual.h
+zoom.o: $(srcdir)/screenhack.h
+zoom.o: ../config.h
+zoom.o: $(UTILS_SRC)/yarandom.h
+zoom.o: $(UTILS_SRC)/usleep.h
+zoom.o: $(UTILS_SRC)/resources.h
+zoom.o: $(UTILS_SRC)/hsv.h
+zoom.o: $(UTILS_SRC)/colors.h
+zoom.o: $(UTILS_SRC)/grabscreen.h
+zoom.o: $(UTILS_SRC)/visual.h
+whirlwindwarp.o: $(srcdir)/screenhack.h
+whirlwindwarp.o: ../config.h
+whirlwindwarp.o: $(UTILS_SRC)/yarandom.h
+whirlwindwarp.o: $(UTILS_SRC)/usleep.h
+whirlwindwarp.o: $(UTILS_SRC)/resources.h
+whirlwindwarp.o: $(UTILS_SRC)/hsv.h
+whirlwindwarp.o: $(UTILS_SRC)/colors.h
+whirlwindwarp.o: $(UTILS_SRC)/grabscreen.h
+whirlwindwarp.o: $(UTILS_SRC)/visual.h
+whirlwindwarp.o: $(UTILS_SRC)/erase.h
+rotzoomer.o: $(srcdir)/screenhack.h
+rotzoomer.o: ../config.h
+rotzoomer.o: $(UTILS_SRC)/yarandom.h
+rotzoomer.o: $(UTILS_SRC)/usleep.h
+rotzoomer.o: $(UTILS_SRC)/resources.h
+rotzoomer.o: $(UTILS_SRC)/hsv.h
+rotzoomer.o: $(UTILS_SRC)/colors.h
+rotzoomer.o: $(UTILS_SRC)/grabscreen.h
+rotzoomer.o: $(UTILS_SRC)/visual.h
+rotzoomer.o: $(UTILS_SRC)/xshm.h