X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2FMakefile.in;h=c1e25eba470a3ff8f6458cabf05fd6bdbcae99e1;hb=d6b0217f2417bd19187f0ebc389d6c5c2233b11c;hp=f0c272f5dad66343dc62f6795041dabbd1d5960b;hpb=dba664f31aa87285db4d76cf8c5e66335299703a;p=xscreensaver diff --git a/hacks/Makefile.in b/hacks/Makefile.in index f0c272f5..c1e25eba 100644 --- a/hacks/Makefile.in +++ b/hacks/Makefile.in @@ -1,4 +1,4 @@ -# hacks/Makefile.in --- xscreensaver, Copyright (c) 1997-2014 Jamie Zawinski. +# hacks/Makefile.in --- xscreensaver, Copyright (c) 1997-2015 Jamie Zawinski. # the `../configure' script generates `hacks/Makefile' from this file. @SET_MAKE@ @@ -50,13 +50,14 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ XMU_LIBS = @XMU_LIBS@ +XFT_LIBS = @XFT_LIBS@ # Note: see comment in ../driver/Makefile.in for explanation of X_LIBS, etc. # HACK_PRE = $(LIBS) $(X_LIBS) -HACK_POST = $(X_PRE_LIBS) -lXt -lX11 $(XMU_LIBS) -lXext $(X_EXTRA_LIBS) -lm -HACK_LIBS = $(HACK_PRE) @HACK_LIBS@ $(HACK_POST) -XPM_LIBS = $(HACK_PRE) @XPM_LIBS@ @HACK_LIBS@ $(HACK_POST) +HACK_POST = $(X_PRE_LIBS) $(XFT_LIBS) -lXt -lX11 $(XMU_LIBS) -lXext $(X_EXTRA_LIBS) -lm +HACK_LIBS = $(HACK_PRE) @ANIM_LIBS@ @HACK_LIBS@ $(HACK_POST) +XPM_LIBS = $(HACK_PRE) @XPM_LIBS@ @HACK_LIBS@ $(HACK_POST) JPEG_LIBS = @JPEG_LIBS@ XLOCK_LIBS = $(HACK_LIBS) TEXT_LIBS = @PTY_LIBS@ @@ -83,12 +84,13 @@ UTIL_OBJS = $(UTILS_BIN)/alpha.o $(UTILS_BIN)/colors.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)/minixpm.o \ $(UTILS_BIN)/yarandom.o $(UTILS_BIN)/erase.o \ $(UTILS_BIN)/xshm.o $(UTILS_BIN)/xdbe.o \ $(UTILS_BIN)/colorbars.o \ - $(UTILS_SRC)/textclient.o $(UTILS_SRC)/aligned_malloc.o \ - $(UTILS_SRC)/thread_util.o + $(UTILS_BIN)/textclient.o $(UTILS_BIN)/aligned_malloc.o \ + $(UTILS_BIN)/thread_util.o \ + $(UTILS_BIN)/xft.o $(UTILS_BIN)/utf8wc.o SRCS = attraction.c blitspin.c bouboule.c braid.c bubbles.c \ bubbles-default.c decayscreen.c deco.c drift.c flag.c \ @@ -119,8 +121,8 @@ SRCS = attraction.c blitspin.c bouboule.c braid.c bubbles.c \ intermomentary.c fireworkx.c fiberlamp.c \ boxfit.c interaggregate.c celtic.c cwaves.c m6502.c \ asm6502.c abstractile.c lcdscrub.c hexadrop.c \ - tessellimage.c delaunay.c \ - webcollage-cocoa.m webcollage-helper-cocoa.m + tessellimage.c delaunay.c recanim.c binaryring.c \ + webcollage-cocoa.m webcollage-helper-cocoa.m testx11.c SCRIPTS = vidwhacker webcollage ljlatest # Programs that are mentioned in XScreenSaver.ad, and that have XML files, @@ -159,7 +161,8 @@ 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 hexadrop.o tessellimage.o delaunay.o + lcdscrub.o hexadrop.o tessellimage.o delaunay.o recanim.o \ + binaryring.o testx11.o EXES = attraction blitspin bouboule braid decayscreen deco \ drift flame galaxy grav greynetic halo \ @@ -181,28 +184,31 @@ EXES = attraction blitspin bouboule braid decayscreen deco \ pacman fuzzyflakes anemotaxis memscroller substrate \ intermomentary fireworkx fiberlamp boxfit interaggregate \ celtic cwaves m6502 abstractile lcdscrub hexadrop \ - tessellimage \ + tessellimage binaryring \ @JPEG_EXES@ JPEG_EXES = webcollage-helper RETIRED_EXES = ant bubbles critical flag forest hyperball hypercube laser \ lightning lisa lissie lmorph rotor sphere spiral t3d vines \ - whirlygig worm xsublim juggle + whirlygig worm xsublim juggle testx11 HACK_OBJS_1 = fps.o $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \ - $(UTILS_BIN)/usleep.o $(UTILS_BIN)/yarandom.o @XMU_OBJS@ + $(UTILS_BIN)/usleep.o $(UTILS_BIN)/yarandom.o \ + $(UTILS_BIN)/utf8wc.o @XMU_OBJS@ @XFT_OBJS@ @ANIM_OBJS@ HACK_OBJS = screenhack.o $(HACK_OBJS_1) XLOCK_OBJS = screenhack.o xlockmore.o $(COLOR_OBJS) $(HACK_OBJS_1) COLOR_OBJS = $(UTILS_BIN)/hsv.o $(UTILS_BIN)/colors.o GRAB_OBJS = $(UTILS_BIN)/grabclient.o XSHM_OBJS = $(UTILS_BIN)/xshm.o XDBE_OBJS = $(UTILS_BIN)/xdbe.o +ANIM_OBJS = recanim.o +ANIM_LIBS = @XPM_LIBS@ THREAD_OBJS = $(UTILS_BIN)/aligned_malloc.o $(UTILS_BIN)/thread_util.o HDRS = screenhack.h screenhackI.h fps.h fpsI.h xlockmore.h \ xlockmoreI.h automata.h bubbles.h xpm-pixmap.h \ apple2.h analogtv.h pacman.h pacman_ai.h pacman_level.h \ - asm6502.h delaunay.h + asm6502.h delaunay.h recanim.h MEN = anemone.man apollonian.man attraction.man \ blaster.man blitspin.man bouboule.man braid.man bsod.man \ bumps.man ccurve.man compass.man coral.man \ @@ -234,7 +240,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 hexadrop.man tessellimage.man + lcdscrub.man hexadrop.man tessellimage.man binaryring.man RETIRED_MEN = ant.man bubbles.man critical.man flag.man forest.man \ laser.man lightning.man lisa.man lissie.man lmorph.man \ @@ -416,7 +422,6 @@ distdepend:: m6502.h -e 's@ $$(srcdir)/\(m6502.h\)@ \1@g' ; \ echo '' \ ) > /tmp/distdepend.$$$$ && \ - mv Makefile.in Makefile.in.bak && \ mv /tmp/distdepend.$$$$ Makefile.in TAGS: tags @@ -516,6 +521,8 @@ $(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)/xft.o: $(UTILS_SRC)/xft.c +$(UTILS_BIN)/utf8wc.o: $(UTILS_SRC)/utf8wc.c $(UTILS_BIN)/logo.o: $(UTILS_SRC)/logo.c $(UTILS_BIN)/minixpm.o: $(UTILS_SRC)/minixpm.c $(UTILS_BIN)/yarandom.o: $(UTILS_SRC)/yarandom.c @@ -561,6 +568,9 @@ xscreensaver-sgigl: xscreensaver-sgigl.c $(CC) $(LDFLAGS) -o $@ $< -I$(UTILS_SRC) $(HACK_PRE) \ $(XMU_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) -lm +test-utf8wc: $(UTILS_SRC)/utf8wc.c + $(CC) $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) $(LDFLAGS)\ + -o $@ -DSELFTEST $< # The rules for those hacks which follow the `screenhack.c' API. # If make wasn't such an utter abomination, these could all be combined @@ -571,6 +581,9 @@ xscreensaver-sgigl: xscreensaver-sgigl.c attraction: attraction.o $(HACK_OBJS) $(COL) $(SPL) $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(COL) $(SPL) $(HACK_LIBS) +binaryring: binaryring.o $(HACK_OBJS) $(COL) + $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(COL) $(HACK_LIBS) + blitspin: blitspin.o $(HACK_OBJS) $(GRAB) $(XPM) $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(GRAB) $(XPM) $(XPM_LIBS) @@ -671,7 +684,7 @@ truchet: truchet.o $(HACK_OBJS) $(COL) $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(COL) $(HACK_LIBS) bsod: bsod.o $(HACK_OBJS) $(GRAB) $(APPLE2) $(XPM) - $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(GRAB) $(APPLE2) $(XPM) $(XPM_LIBS) + $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(GRAB) $(APPLE2) $(XPM) $(XPM_LIBS) $(THRL) 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) $(THRL) @@ -859,6 +872,11 @@ hexadrop: hexadrop.o $(HACK_OBJS) $(COL) tessellimage: tessellimage.o delaunay.o $(HACK_OBJS) $(GRAB) $(CC_HACK) -o $@ $@.o delaunay.o $(HACK_OBJS) $(GRAB) $(HACK_LIBS) +testx11: testx11.o glx/rotator.o $(HACK_OBJS) + $(CC_HACK) -o $@ $@.o glx/rotator.o $(HACK_OBJS) $(COL) $(HACK_LIBS) +glx/rotator.o: glx/rotator.c + $(MAKE) -C glx $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" + # The rules for those hacks which follow the `xlockmore' API. # @@ -1025,6 +1043,7 @@ anemone.o: $(UTILS_SRC)/hsv.h anemone.o: $(UTILS_SRC)/resources.h anemone.o: $(UTILS_SRC)/usleep.h anemone.o: $(UTILS_SRC)/visual.h +anemone.o: $(UTILS_SRC)/xdbe.h anemone.o: $(UTILS_SRC)/yarandom.h anemotaxis.o: ../config.h anemotaxis.o: $(srcdir)/fps.h @@ -1036,6 +1055,7 @@ anemotaxis.o: $(UTILS_SRC)/hsv.h anemotaxis.o: $(UTILS_SRC)/resources.h anemotaxis.o: $(UTILS_SRC)/usleep.h anemotaxis.o: $(UTILS_SRC)/visual.h +anemotaxis.o: $(UTILS_SRC)/xdbe.h anemotaxis.o: $(UTILS_SRC)/yarandom.h ant.o: $(srcdir)/automata.h ant.o: ../config.h @@ -1080,6 +1100,7 @@ apple2-main.o: $(UTILS_SRC)/resources.h apple2-main.o: $(UTILS_SRC)/textclient.h apple2-main.o: $(UTILS_SRC)/thread_util.h apple2-main.o: $(UTILS_SRC)/usleep.h +apple2-main.o: $(UTILS_SRC)/utf8wc.h apple2-main.o: $(UTILS_SRC)/visual.h apple2-main.o: $(UTILS_SRC)/xshm.h apple2-main.o: $(UTILS_SRC)/yarandom.h @@ -1100,6 +1121,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: ../config.h asm6502.o: $(UTILS_SRC)/yarandom.h attraction.o: ../config.h attraction.o: $(srcdir)/fps.h @@ -1124,6 +1146,17 @@ barcode.o: $(UTILS_SRC)/resources.h barcode.o: $(UTILS_SRC)/usleep.h barcode.o: $(UTILS_SRC)/visual.h barcode.o: $(UTILS_SRC)/yarandom.h +binaryring.o: ../config.h +binaryring.o: $(srcdir)/fps.h +binaryring.o: $(srcdir)/screenhackI.h +binaryring.o: $(srcdir)/screenhack.h +binaryring.o: $(UTILS_SRC)/colors.h +binaryring.o: $(UTILS_SRC)/grabscreen.h +binaryring.o: $(UTILS_SRC)/hsv.h +binaryring.o: $(UTILS_SRC)/resources.h +binaryring.o: $(UTILS_SRC)/usleep.h +binaryring.o: $(UTILS_SRC)/visual.h +binaryring.o: $(UTILS_SRC)/yarandom.h blaster.o: ../config.h blaster.o: $(srcdir)/fps.h blaster.o: $(srcdir)/screenhackI.h @@ -1329,6 +1362,7 @@ compass.o: $(UTILS_SRC)/hsv.h compass.o: $(UTILS_SRC)/resources.h compass.o: $(UTILS_SRC)/usleep.h compass.o: $(UTILS_SRC)/visual.h +compass.o: $(UTILS_SRC)/xdbe.h compass.o: $(UTILS_SRC)/yarandom.h coral.o: ../config.h coral.o: $(srcdir)/fps.h @@ -1425,6 +1459,7 @@ deluxe.o: $(UTILS_SRC)/hsv.h deluxe.o: $(UTILS_SRC)/resources.h deluxe.o: $(UTILS_SRC)/usleep.h deluxe.o: $(UTILS_SRC)/visual.h +deluxe.o: $(UTILS_SRC)/xdbe.h deluxe.o: $(UTILS_SRC)/yarandom.h demon.o: $(srcdir)/automata.h demon.o: ../config.h @@ -1601,6 +1636,7 @@ fluidballs.o: $(UTILS_SRC)/hsv.h fluidballs.o: $(UTILS_SRC)/resources.h fluidballs.o: $(UTILS_SRC)/usleep.h fluidballs.o: $(UTILS_SRC)/visual.h +fluidballs.o: $(UTILS_SRC)/xdbe.h fluidballs.o: $(UTILS_SRC)/yarandom.h fontglide.o: ../config.h fontglide.o: $(srcdir)/fps.h @@ -1612,7 +1648,10 @@ 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)/utf8wc.h fontglide.o: $(UTILS_SRC)/visual.h +fontglide.o: $(UTILS_SRC)/xdbe.h +fontglide.o: $(UTILS_SRC)/xft.h fontglide.o: $(UTILS_SRC)/yarandom.h forest.o: ../config.h forest.o: $(srcdir)/fps.h @@ -1825,6 +1864,7 @@ interference.o: $(UTILS_SRC)/resources.h interference.o: $(UTILS_SRC)/thread_util.h interference.o: $(UTILS_SRC)/usleep.h interference.o: $(UTILS_SRC)/visual.h +interference.o: $(UTILS_SRC)/xdbe.h interference.o: $(UTILS_SRC)/xshm.h interference.o: $(UTILS_SRC)/yarandom.h intermomentary.o: ../config.h @@ -1886,6 +1926,7 @@ kumppa.o: $(UTILS_SRC)/hsv.h kumppa.o: $(UTILS_SRC)/resources.h kumppa.o: $(UTILS_SRC)/usleep.h kumppa.o: $(UTILS_SRC)/visual.h +kumppa.o: $(UTILS_SRC)/xdbe.h kumppa.o: $(UTILS_SRC)/yarandom.h laser.o: ../config.h laser.o: $(srcdir)/fps.h @@ -2036,6 +2077,7 @@ moire2.o: $(UTILS_SRC)/hsv.h moire2.o: $(UTILS_SRC)/resources.h moire2.o: $(UTILS_SRC)/usleep.h moire2.o: $(UTILS_SRC)/visual.h +moire2.o: $(UTILS_SRC)/xdbe.h moire2.o: $(UTILS_SRC)/yarandom.h moire.o: ../config.h moire.o: $(srcdir)/fps.h @@ -2102,6 +2144,7 @@ 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)/xft.h noseguy.o: $(UTILS_SRC)/yarandom.h noseguy.o: $(srcdir)/xpm-pixmap.h pacman_ai.o: ../config.h @@ -2245,6 +2288,7 @@ 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)/utf8wc.h phosphor.o: $(UTILS_SRC)/visual.h phosphor.o: $(UTILS_SRC)/yarandom.h piecewise.o: ../config.h @@ -2257,6 +2301,7 @@ piecewise.o: $(UTILS_SRC)/hsv.h piecewise.o: $(UTILS_SRC)/resources.h piecewise.o: $(UTILS_SRC)/usleep.h piecewise.o: $(UTILS_SRC)/visual.h +piecewise.o: $(UTILS_SRC)/xdbe.h piecewise.o: $(UTILS_SRC)/yarandom.h polyominoes.o: ../config.h polyominoes.o: $(srcdir)/fps.h @@ -2297,6 +2342,7 @@ popsquares.o: $(UTILS_SRC)/hsv.h popsquares.o: $(UTILS_SRC)/resources.h popsquares.o: $(UTILS_SRC)/usleep.h popsquares.o: $(UTILS_SRC)/visual.h +popsquares.o: $(UTILS_SRC)/xdbe.h popsquares.o: $(UTILS_SRC)/yarandom.h pyro.o: ../config.h pyro.o: $(srcdir)/fps.h @@ -2332,6 +2378,17 @@ rd-bomb.o: $(UTILS_SRC)/resources.h rd-bomb.o: $(UTILS_SRC)/usleep.h rd-bomb.o: $(UTILS_SRC)/visual.h rd-bomb.o: $(UTILS_SRC)/yarandom.h +recanim.o: ../config.h +recanim.o: $(srcdir)/fps.h +recanim.o: $(srcdir)/recanim.h +recanim.o: $(srcdir)/screenhackI.h +recanim.o: $(UTILS_SRC)/colors.h +recanim.o: $(UTILS_SRC)/grabscreen.h +recanim.o: $(UTILS_SRC)/hsv.h +recanim.o: $(UTILS_SRC)/resources.h +recanim.o: $(UTILS_SRC)/usleep.h +recanim.o: $(UTILS_SRC)/visual.h +recanim.o: $(UTILS_SRC)/yarandom.h ripples.o: ../config.h ripples.o: $(srcdir)/fps.h ripples.o: $(srcdir)/screenhackI.h @@ -2392,6 +2449,7 @@ rotzoomer.o: $(UTILS_SRC)/visual.h rotzoomer.o: $(UTILS_SRC)/yarandom.h screenhack.o: ../config.h screenhack.o: $(srcdir)/fps.h +screenhack.o: $(srcdir)/recanim.h screenhack.o: $(srcdir)/screenhackI.h screenhack.o: $(UTILS_SRC)/colors.h screenhack.o: $(UTILS_SRC)/grabscreen.h @@ -2584,6 +2642,18 @@ tessellimage.o: $(UTILS_SRC)/resources.h tessellimage.o: $(UTILS_SRC)/usleep.h tessellimage.o: $(UTILS_SRC)/visual.h tessellimage.o: $(UTILS_SRC)/yarandom.h +testx11.o: ../config.h +testx11.o: $(srcdir)/fps.h +testx11.o: $(srcdir)/glx/rotator.h +testx11.o: $(srcdir)/screenhackI.h +testx11.o: $(srcdir)/screenhack.h +testx11.o: $(UTILS_SRC)/colors.h +testx11.o: $(UTILS_SRC)/grabscreen.h +testx11.o: $(UTILS_SRC)/hsv.h +testx11.o: $(UTILS_SRC)/resources.h +testx11.o: $(UTILS_SRC)/usleep.h +testx11.o: $(UTILS_SRC)/visual.h +testx11.o: $(UTILS_SRC)/yarandom.h thornbird.o: ../config.h thornbird.o: $(srcdir)/fps.h thornbird.o: $(srcdir)/screenhackI.h @@ -2703,6 +2773,7 @@ whirlygig.o: $(UTILS_SRC)/hsv.h whirlygig.o: $(UTILS_SRC)/resources.h whirlygig.o: $(UTILS_SRC)/usleep.h whirlygig.o: $(UTILS_SRC)/visual.h +whirlygig.o: $(UTILS_SRC)/xdbe.h whirlygig.o: $(UTILS_SRC)/yarandom.h wormhole.o: ../config.h wormhole.o: $(srcdir)/fps.h