-# 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@
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 \
apple2-main.c analogtv.c xanalogtv.c pong.c wormhole.c \
pacman.c pacman_ai.c pacman_level.c \
fuzzyflakes.c anemotaxis.c memscroller.c substrate.c \
- intermomentary.c fireworkx.c fireworkx_mmx.S fiberlamp.c \
+ intermomentary.c fireworkx.c fiberlamp.c \
boxfit.c interaggregate.c celtic.c cwaves.c m6502.c \
- asm6502.c abstractile.c lcdscrub.c \
+ asm6502.c abstractile.c lcdscrub.c hexadrop.c \
webcollage-cocoa.m webcollage-helper-cocoa.m
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
intermomentary.o fireworkx.o fiberlamp.o boxfit.o \
interaggregate.o celtic.o cwaves.o webcollage-cocoa.o \
webcollage-helper-cocoa.o m6502.o asm6502.o abstractile.o \
- lcdscrub.o
+ lcdscrub.o hexadrop.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 \
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 \
intermomentary fireworkx fiberlamp boxfit interaggregate \
- celtic cwaves m6502 abstractile lcdscrub \
+ celtic cwaves m6502 abstractile lcdscrub hexadrop \
@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@
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 \
anemotaxis.man memscroller.man substrate.man \
intermomentary.man fireworkx.man fiberlamp.man boxfit.man \
interaggregate.man celtic.man cwaves.man abstractile.man \
- lcdscrub.man
+ lcdscrub.man hexadrop.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 \
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
$(install_prefix)$(HACKDIR)/$$program ; \
$(INSTALL_PROGRAM) $$program \
$(install_prefix)$(HACKDIR)/$$program ; \
- done ; \
+ done
install-scripts: $(SCRIPTS) munge-scripts
@for program in $(SCRIPTS); do \
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* ; \
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 *~ "#"*
@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 | \
( \
$(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) ; \
- $(MAKE) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+ $(MAKE) -C $(UTILS_BIN) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
# How we build object files in this directory.
.c.o:
- $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) $<
+ $(CC) -c $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) $<
# Make sure these are regenerated when the version number ticks.
BARS = $(UTILS_BIN)/colorbars.o $(LOGO)
ATV = analogtv.o $(SHM)
APPLE2 = apple2.o $(ATV)
+TEXT = $(UTILS_BIN)/textclient.o
CC_HACK = $(CC) $(LDFLAGS)
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)
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)
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)
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)
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)
lcdscrub: lcdscrub.o $(HACK_OBJS)
$(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(HACK_LIBS)
+hexadrop: hexadrop.o $(HACK_OBJS) $(COL)
+ $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(COL) $(HACK_LIBS)
+
# The rules for those hacks which follow the `xlockmore' API.
#
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
apple2.o: $(UTILS_SRC)/xshm.h
apple2.o: $(UTILS_SRC)/yarandom.h
asm6502.o: $(srcdir)/asm6502.h
+asm6502.o: $(UTILS_SRC)/yarandom.h
attraction.o: ../config.h
attraction.o: $(srcdir)/fps.h
attraction.o: $(srcdir)/screenhackI.h
bsod.o: ../config.h
bsod.o: $(srcdir)/fps.h
bsod.o: $(srcdir)/images/amiga.xpm
+bsod.o: $(srcdir)/images/android.xpm
bsod.o: $(srcdir)/images/atari.xbm
bsod.o: $(srcdir)/images/atm.xbm
bsod.o: $(srcdir)/images/hmac.xpm
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
helix.o: $(UTILS_SRC)/usleep.h
helix.o: $(UTILS_SRC)/visual.h
helix.o: $(UTILS_SRC)/yarandom.h
+hexadrop.o: ../config.h
+hexadrop.o: $(srcdir)/fps.h
+hexadrop.o: $(srcdir)/screenhackI.h
+hexadrop.o: $(srcdir)/screenhack.h
+hexadrop.o: $(UTILS_SRC)/colors.h
+hexadrop.o: $(UTILS_SRC)/grabscreen.h
+hexadrop.o: $(UTILS_SRC)/hsv.h
+hexadrop.o: $(UTILS_SRC)/resources.h
+hexadrop.o: $(UTILS_SRC)/usleep.h
+hexadrop.o: $(UTILS_SRC)/visual.h
+hexadrop.o: $(UTILS_SRC)/yarandom.h
hopalong.o: ../config.h
hopalong.o: $(srcdir)/fps.h
hopalong.o: $(srcdir)/screenhackI.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
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
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
projects / xscreensaver / blobdiff