X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2FMakefile.in;h=5a66e60beb1e854358ddada8006fe7670f1343e8;hp=5684f0623776120a81bac42e5f05546747f15460;hb=019de959b265701cd0c3fccbb61f2b69f06bf9ee;hpb=5f9c47ca98dd43d8f59b7c27d3fde6edfde4fe21 diff --git a/hacks/Makefile.in b/hacks/Makefile.in index 5684f062..5a66e60b 100644 --- a/hacks/Makefile.in +++ b/hacks/Makefile.in @@ -56,7 +56,7 @@ 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 @@ -72,7 +72,8 @@ UTIL_SRCS = $(UTILS_SRC)/alpha.c $(UTILS_SRC)/colors.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)/grabclient.o \ $(UTILS_BIN)/hsv.o $(UTILS_BIN)/resources.o \ @@ -81,7 +82,8 @@ UTIL_OBJS = $(UTILS_BIN)/alpha.o $(UTILS_BIN)/colors.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 \ @@ -109,9 +111,9 @@ SRCS = attraction.c blitspin.c bouboule.c braid.c bubbles.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 @@ -151,7 +153,7 @@ OBJS = attraction.o blitspin.o bouboule.o braid.o bubbles.o \ 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 \ @@ -172,7 +174,7 @@ EXES = attraction blitspin bouboule braid decayscreen deco \ 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 @@ -224,7 +226,7 @@ MEN = anemone.man apollonian.man attraction.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 \ @@ -512,14 +514,14 @@ $(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) ; \ - $(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. @@ -539,6 +541,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) @@ -601,8 +604,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) @@ -658,8 +661,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) @@ -697,11 +700,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) @@ -781,8 +784,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) @@ -838,6 +841,9 @@ abstractile: abstractile.o $(HACK_OBJS) $(COL) 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. # @@ -1054,6 +1060,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 @@ -1073,6 +1080,7 @@ apple2.o: $(UTILS_SRC)/visual.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 @@ -1164,6 +1172,7 @@ bsod.o: $(srcdir)/apple2.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 @@ -1580,6 +1589,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 @@ -1703,6 +1713,17 @@ helix.o: $(UTILS_SRC)/resources.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 @@ -2056,6 +2077,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 @@ -2199,6 +2221,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 @@ -2751,6 +2774,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