X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2FMakefile.in;h=0d6c8000f26901cb3c26e7ab93ba6f8fb7640295;hb=c70f94f648d51bb4828193124f325fa52b0e57f3;hp=148a7624685faa4750cb022272d9999a3a0b59d0;hpb=7b34ef992563d7bcbb64cc5597dc45fa24470b05;p=xscreensaver

diff --git a/hacks/Makefile.in b/hacks/Makefile.in
index 148a7624..0d6c8000 100644
--- a/hacks/Makefile.in
+++ b/hacks/Makefile.in
@@ -1,4 +1,4 @@
-# hacks/Makefile.in --- xscreensaver, Copyright (c) 1997-2005 Jamie Zawinski.
+# hacks/Makefile.in --- xscreensaver, Copyright (c) 1997-2011 Jamie Zawinski.
 # the `../configure' script generates `hacks/Makefile' from this file.
 
 @SET_MAKE@
@@ -56,31 +56,34 @@ HACK_LIBS	= $(HACK_PRE)            @HACK_LIBS@ $(HACK_POST)
 XPM_LIBS	= $(HACK_PRE) @XPM_LIBS@ @HACK_LIBS@ $(HACK_POST)
 JPEG_LIBS	= @JPEG_LIBS@
 XLOCK_LIBS	= $(HACK_LIBS)
-PTY_LIBS	= @PTY_LIBS@
+TEXT_LIBS	= @PTY_LIBS@
 MINIXPM		= $(UTILS_BIN)/minixpm.o
 
 UTILS_SRC	= $(srcdir)/../utils
 UTILS_BIN	= ../utils
 
-INCLUDES	= -I. -I$(srcdir) -I$(UTILS_SRC) -I.. @INCLUDES@
+INCLUDES_1	= -I. -I$(srcdir) -I$(UTILS_SRC) -I..
+INCLUDES	= $(INCLUDES_1) @INCLUDES@
 
 UTIL_SRCS	= $(UTILS_SRC)/alpha.c $(UTILS_SRC)/colors.c \
-		  $(UTILS_SRC)/grabscreen.c $(UTILS_SRC)/grabclient.c \
+		  $(UTILS_SRC)/grabclient.c \
 		  $(UTILS_SRC)/hsv.c $(UTILS_SRC)/resources.c \
 		  $(UTILS_SRC)/spline.c $(UTILS_SRC)/usleep.c \
 		  $(UTILS_SRC)/visual.c $(UTILS_SRC)/logo.c \
 		  $(UTILS_SRC)/minixpm.c \
 		  $(UTILS_SRC)/yarandom.c $(UTILS_SRC)/erase.c \
-		  $(UTILS_SRC)/xshm.c $(UTILS_SRC)/xdbe.c
+		  $(UTILS_SRC)/xshm.c $(UTILS_SRC)/xdbe.c \
+		  $(UTILS_SRC)/textclient.c
 UTIL_OBJS	= $(UTILS_BIN)/alpha.o $(UTILS_BIN)/colors.o \
-		  $(UTILS_BIN)/grabscreen.o $(UTILS_BIN)/grabclient.o \
+		  $(UTILS_BIN)/grabclient.o \
 		  $(UTILS_BIN)/hsv.o $(UTILS_BIN)/resources.o \
 		  $(UTILS_BIN)/spline.o $(UTILS_BIN)/usleep.o \
 		  $(UTILS_BIN)/visual.o $(UTILS_BIN)/logo.o \
 		  $(UTILS_SRC)/minixpm.c \
 		  $(UTILS_BIN)/yarandom.o $(UTILS_BIN)/erase.o \
 		  $(UTILS_BIN)/xshm.o $(UTILS_BIN)/xdbe.o \
-		  $(UTILS_BIN)/colorbars.o
+		  $(UTILS_BIN)/colorbars.o \
+		  $(UTILS_SRC)/textclient.o
 
 SRCS		= attraction.c blitspin.c bouboule.c braid.c bubbles.c \
 		  bubbles-default.c decayscreen.c deco.c drift.c flag.c \
@@ -117,7 +120,7 @@ SCRIPTS		= vidwhacker webcollage ljlatest
 # Programs that are mentioned in XScreenSaver.ad, and that have XML files,
 # but that are not shipped with xscreensaver itself.
 #
-EXTERNALS	= cosmos electricsheep extrusion fireflies goban \
+EXTERNALS	= cosmos electricsheep fireflies goban \
 		  sphereeversion ssystem xaos xdaliclock xearth xfishtank \
 		  xmountains xplanet xsnow
 
@@ -154,7 +157,7 @@ OBJS		= attraction.o blitspin.o bouboule.o braid.o bubbles.o \
 
 EXES		= attraction blitspin bouboule braid decayscreen deco \
 		  drift flame galaxy grav greynetic halo \
-		  helix hopalong hypercube ifs imsmap julia kaleidescope \
+		  helix hopalong ifs imsmap julia kaleidescope \
 		  maze moire noseguy pedal \
 		  penrose pyro qix rocks rorschach sierpinski slidescreen \
 		  slip strange swirl goop starfish munch \
@@ -164,9 +167,9 @@ EXES		= attraction blitspin bouboule braid decayscreen deco \
 		  demon loop penetrate deluxe compass squiral xflame \
 		  wander spotlight phosphor xmatrix petri shadebobs \
 		  ccurve blaster bumps ripples xspirograph \
-		  nerverot xrayswarm hyperball zoom whirlwindwarp rotzoomer \
+		  nerverot xrayswarm zoom whirlwindwarp rotzoomer \
 		  speedmine vermiculate twang apollonian euler2d \
-		  juggle polyominoes thornbird  fluidballs anemone halftone \
+		  polyominoes thornbird  fluidballs anemone halftone \
 		  metaballs eruption popsquares barcode piecewise cloudlife \
 		  fontglide apple2 xanalogtv pong  wormhole \
 		  pacman fuzzyflakes anemotaxis memscroller substrate \
@@ -175,9 +178,9 @@ EXES		= attraction blitspin bouboule braid decayscreen deco \
 		  @JPEG_EXES@
 JPEG_EXES	= webcollage-helper
 
-RETIRED_EXES	= ant bubbles critical flag forest laser lightning lisa \
-		  lissie lmorph rotor sphere spiral t3d vines whirlygig \
-		  worm xsublim
+RETIRED_EXES	= ant bubbles critical flag forest hyperball hypercube laser \
+		  lightning lisa lissie lmorph rotor sphere spiral t3d vines \
+		  whirlygig worm xsublim juggle
 
 HACK_OBJS_1	= fps.o $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \
 		  $(UTILS_BIN)/usleep.o $(UTILS_BIN)/yarandom.o @XMU_OBJS@
@@ -200,8 +203,8 @@ MEN		= anemone.man apollonian.man attraction.man \
 	          drift.man epicycle.man euler2d.man fadeplot.man \
 	          flame.man flow.man fluidballs.man galaxy.man \
 	          goop.man grav.man greynetic.man halo.man helix.man \
-	          hopalong.man hyperball.man hypercube.man ifs.man imsmap.man \
-	          interference.man juggle.man julia.man \
+	          hopalong.man ifs.man imsmap.man \
+	          interference.man julia.man \
 	          kaleidescope.man kumppa.man \
 	          loop.man maze.man moire.man \
 	          moire2.man mountain.man munch.man nerverot.man noseguy.man \
@@ -228,7 +231,8 @@ MEN		= anemone.man apollonian.man attraction.man \
 RETIRED_MEN	= ant.man bubbles.man critical.man flag.man forest.man \
 		  laser.man lightning.man lisa.man lissie.man lmorph.man \
 		  rotor.man sphere.man spiral.man t3d.man vines.man \
-		  whirlygig.man worm.man xsublim.man
+		  whirlygig.man worm.man xsublim.man juggle.man \
+		  hypercube.man hyperball.man
 
 STAR		= *
 EXTRAS		= README Makefile.in xml2man.pl m6502.sh .gdbinit \
@@ -250,7 +254,8 @@ EXTRAS		= README Makefile.in xml2man.pl m6502.sh .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) $(SCRIPTS) $(MEN) $(EXTRAS) $(VMSFILES)
+TARFILES	= $(SRCS) $(HDRS) $(SCRIPTS) $(MEN) $(RETIRED_MEN) \
+		  $(EXTRAS) $(VMSFILES)
 
 
 default: all
@@ -273,7 +278,7 @@ install-program:: $(EXES)
 	    $(install_prefix)$(HACKDIR)/$$program ;			\
 	  $(INSTALL_PROGRAM) $$program					\
 	    $(install_prefix)$(HACKDIR)/$$program ;			\
-	done ;								\
+	done
 
 install-scripts: $(SCRIPTS) munge-scripts
 	@for program in $(SCRIPTS); do					\
@@ -349,13 +354,13 @@ install-xml:
 	done
 
 uninstall-program:
-	@for program in $(EXES) $(SCRIPTS); do				\
+	@for program in $(EXES) $(RETIRED_EXES) $(SCRIPTS); do		\
 	  echo rm -f $(install_prefix)$(HACKDIR)/$$program ;		\
 	  rm -f $(install_prefix)$(HACKDIR)/$$program ;			\
 	done
 
 uninstall-man:
-	@men="$(MEN)" ;							\
+	@men="$(MEN) $(RETIRED_MEN)" ;					\
 	for man in $$men; do						\
 	  instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ;	\
 	  echo rm -f $(install_prefix)$(manNdir)/$$instname* ;		\
@@ -364,13 +369,13 @@ uninstall-man:
 
 uninstall-xml:
 	@dest=$(install_prefix)$(HACK_CONF_DIR) ;			\
-	 for file in $(EXES) $(SCRIPTS) $(EXTERNALS) ; do		\
+	 for file in $(EXES) $(RETIRED_EXES) $(SCRIPTS) $(EXTERNALS) ; do \
 	     echo rm -f $$dest/$$file.xml ;				\
 	          rm -f $$dest/$$file.xml ;				\
 	done
 
 clean:
-	-rm -f *.o a.out core $(EXES) m6502.h
+	-rm -f *.o a.out core $(EXES) $(RETIRED_EXES) m6502.h
 
 distclean: clean
 	-rm -f Makefile TAGS *~ "#"*
@@ -390,7 +395,7 @@ distdepend:: m6502.h
 	@echo updating dependencies in `pwd`/Makefile.in... ;		    \
 	$(DEPEND) -w 0 -f - 						    \
 	-s '# DO NOT DELETE: updated by make distdepend' $(DEPEND_FLAGS) -- \
-	$(INCLUDES) $(DEFS) $(DEPEND_DEFINES) $(CFLAGS) $(X_CFLAGS) --	    \
+	$(INCLUDES_1) $(DEFS) $(DEPEND_DEFINES) $(CFLAGS) $(X_CFLAGS) --    \
 	$(SRCS) 2>/dev/null |						    \
 	sort -d |							    \
 	(								    \
@@ -509,6 +514,7 @@ $(UTILS_BIN)/yarandom.o:	$(UTILS_SRC)/yarandom.c
 $(UTILS_BIN)/erase.o:		$(UTILS_SRC)/erase.c
 $(UTILS_BIN)/xshm.o:		$(UTILS_SRC)/xshm.c
 $(UTILS_BIN)/xdbe.o:		$(UTILS_SRC)/xdbe.c
+$(UTILS_BIN)/textclient.o:	$(UTILS_SRC)/textclient.c
 
 $(UTIL_OBJS):
 	cd $(UTILS_BIN) ; \
@@ -536,6 +542,7 @@ DBE		= $(XDBE_OBJS)
 BARS		= $(UTILS_BIN)/colorbars.o $(LOGO)
 ATV             = analogtv.o $(SHM)
 APPLE2          = apple2.o $(ATV)
+TEXT            = $(UTILS_BIN)/textclient.o
 
 CC_HACK		= $(CC) $(LDFLAGS)
 
@@ -598,8 +605,8 @@ moire:		moire.o		$(HACK_OBJS) $(COL) $(SHM)
 moire2:		moire2.o	$(HACK_OBJS) $(COL) $(DBE)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(DBE) $(HACK_LIBS)
 
-noseguy:	noseguy.o	$(HACK_OBJS) $(XPM)
-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(XPM) $(XPM_LIBS)
+noseguy:	noseguy.o	$(HACK_OBJS) $(XPM) $(TEXT)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(XPM) $(TEXT) $(XPM_LIBS) $(TEXT_LIBS)
 
 pedal:		pedal.o		$(HACK_OBJS) $(HSV) $(ERASE)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(HSV) $(ERASE) $(HACK_LIBS)
@@ -655,8 +662,8 @@ truchet:	 truchet.o	$(HACK_OBJS) $(COL)
 bsod:	 	bsod.o		$(HACK_OBJS) $(GRAB) $(APPLE2) $(XPM)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(GRAB) $(APPLE2) $(XPM) $(XPM_LIBS)
 
-apple2:	 	apple2.o apple2-main.o	$(HACK_OBJS) $(ATV) $(GRAB)
-	$(CC_HACK) -o $@ $@.o	apple2-main.o $(HACK_OBJS) $(ATV) $(GRAB) $(XPM_LIBS) $(PTY_LIBS)
+apple2:	 	apple2.o apple2-main.o	$(HACK_OBJS) $(ATV) $(GRAB) $(TEXT)
+	$(CC_HACK) -o $@ $@.o	apple2-main.o $(HACK_OBJS) $(ATV) $(GRAB) $(TEXT) $(XPM_LIBS) $(TEXT_LIBS)
 
 xanalogtv: 	xanalogtv.o	$(HACK_OBJS) $(ATV) $(GRAB) $(XPM)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(ATV) $(GRAB) $(XPM) $(XPM_LIBS) $(HACK_LIBS)
@@ -694,11 +701,11 @@ 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) $(PTY_LIBS)
+phosphor:	phosphor.o	$(HACK_OBJS) $(TEXT) $(COL)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(TEXT) $(COL) $(HACK_LIBS) $(TEXT_LIBS)
 
-xmatrix:	xmatrix.o	$(HACK_OBJS) $(XPM)
-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(XPM) $(XPM_LIBS)
+xmatrix:	xmatrix.o	$(HACK_OBJS) $(TEXT) $(XPM)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(TEXT) $(XPM) $(XPM_LIBS) $(TEXT_LIBS)
 
 petri:		petri.o		$(HACK_OBJS) $(COL) $(SPL)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(SPL) $(HACK_LIBS)
@@ -778,8 +785,8 @@ piecewise:	piecewise.o	$(HACK_OBJS) $(COL) $(DBE)
 cloudlife:	cloudlife.o	$(HACK_OBJS) $(COL) $(DBE)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(COL) $(DBE) $(HACK_LIBS)
 
-fontglide:	fontglide.o	$(HACK_OBJS) $(DBE)
-	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(DBE) $(HACK_LIBS)
+fontglide:	fontglide.o	$(HACK_OBJS) $(DBE) $(TEXT)
+	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(DBE) $(TEXT) $(HACK_LIBS) $(TEXT_LIBS)
 
 pong: 	pong.o	$(HACK_OBJS) $(ATV) $(GRAB) $(XPM)
 	$(CC_HACK) -o $@ $@.o	$(HACK_OBJS) $(ATV) $(GRAB) $(XPM) $(XPM_LIBS) $(HACK_LIBS)
@@ -825,6 +832,7 @@ m6502.h:
 	UTILS_SRC="$(UTILS_SRC)" \
 	$(srcdir)/m6502.sh m6502.h $(srcdir)/images/m6502/*.asm
 
+m6502.o:	m6502.h
 m6502:		m6502.o		asm6502.o $(HACK_OBJS) $(ATV)
 	$(CC_HACK) -o $@ $@.o	asm6502.o $(HACK_OBJS) $(ATV) $(HACK_LIBS)
 
@@ -1050,6 +1058,7 @@ apple2-main.o: $(UTILS_SRC)/colors.h
 apple2-main.o: $(UTILS_SRC)/grabscreen.h
 apple2-main.o: $(UTILS_SRC)/hsv.h
 apple2-main.o: $(UTILS_SRC)/resources.h
+apple2-main.o: $(UTILS_SRC)/textclient.h
 apple2-main.o: $(UTILS_SRC)/usleep.h
 apple2-main.o: $(UTILS_SRC)/visual.h
 apple2-main.o: $(UTILS_SRC)/xshm.h
@@ -1576,6 +1585,7 @@ fontglide.o: $(UTILS_SRC)/colors.h
 fontglide.o: $(UTILS_SRC)/grabscreen.h
 fontglide.o: $(UTILS_SRC)/hsv.h
 fontglide.o: $(UTILS_SRC)/resources.h
+fontglide.o: $(UTILS_SRC)/textclient.h
 fontglide.o: $(UTILS_SRC)/usleep.h
 fontglide.o: $(UTILS_SRC)/visual.h
 fontglide.o: $(UTILS_SRC)/xdbe.h
@@ -2052,6 +2062,7 @@ noseguy.o: $(UTILS_SRC)/colors.h
 noseguy.o: $(UTILS_SRC)/grabscreen.h
 noseguy.o: $(UTILS_SRC)/hsv.h
 noseguy.o: $(UTILS_SRC)/resources.h
+noseguy.o: $(UTILS_SRC)/textclient.h
 noseguy.o: $(UTILS_SRC)/usleep.h
 noseguy.o: $(UTILS_SRC)/visual.h
 noseguy.o: $(UTILS_SRC)/yarandom.h
@@ -2195,6 +2206,7 @@ phosphor.o: $(UTILS_SRC)/colors.h
 phosphor.o: $(UTILS_SRC)/grabscreen.h
 phosphor.o: $(UTILS_SRC)/hsv.h
 phosphor.o: $(UTILS_SRC)/resources.h
+phosphor.o: $(UTILS_SRC)/textclient.h
 phosphor.o: $(UTILS_SRC)/usleep.h
 phosphor.o: $(UTILS_SRC)/visual.h
 phosphor.o: $(UTILS_SRC)/yarandom.h
@@ -2747,6 +2759,7 @@ xmatrix.o: $(UTILS_SRC)/colors.h
 xmatrix.o: $(UTILS_SRC)/grabscreen.h
 xmatrix.o: $(UTILS_SRC)/hsv.h
 xmatrix.o: $(UTILS_SRC)/resources.h
+xmatrix.o: $(UTILS_SRC)/textclient.h
 xmatrix.o: $(UTILS_SRC)/usleep.h
 xmatrix.o: $(UTILS_SRC)/visual.h
 xmatrix.o: $(UTILS_SRC)/yarandom.h