X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2FMakefile.in;h=9127723b007991f551891800cc849de469aa9be9;hb=447db08c956099b3b183886729108bf5b364c4b8;hp=4a71641bfd95d23e12d9c3d563ecbc77c4020869;hpb=ffd8c0873576a9e3065696a624dce6b766b77062;p=xscreensaver diff --git a/hacks/Makefile.in b/hacks/Makefile.in index 4a71641b..9127723b 100644 --- a/hacks/Makefile.in +++ b/hacks/Makefile.in @@ -1,4 +1,4 @@ -# hacks/Makefile.in --- xscreensaver, Copyright (c) 1997-2004 Jamie Zawinski. +# hacks/Makefile.in --- xscreensaver, Copyright (c) 1997-2005 Jamie Zawinski. # the `../configure' script generates `hacks/Makefile' from this file. @SET_MAKE@ @@ -7,16 +7,23 @@ srcdir = @srcdir@ VPATH = @srcdir@ +top_srcdir = @top_srcdir@ +top_builddir = .. install_prefix = prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ +datadir = @datadir@ mandir = @mandir@ +libexecdir = @libexecdir@ # maybe this should be 6 (games)? mansuffix = 1 manNdir = $(mandir)/man$(mansuffix) +HACKDIR = @HACKDIR@ +HACK_CONF_DIR = @HACK_CONF_DIR@ + CC = @CC@ CFLAGS = @CFLAGS@ LDFLAGS = @LDFLAGS@ @@ -36,9 +43,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_SETUID = @INSTALL_SETUID@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_DIRS = @INSTALL_DIRS@ -GNOME_DATADIR = @GNOME_DATADIR@ -HACKDIR = @HACKDIR@ -HACK_CONF_DIR = @HACK_CONF_DIR@ X_CFLAGS = @X_CFLAGS@ X_LIBS = @X_LIBS@ @@ -102,7 +106,8 @@ SRCS = attraction.c blitspin.c bouboule.c braid.c bubbles.c \ barcode.c piecewise.c cloudlife.c fontglide.c apple2.c \ apple2-main.c analogtv.c xanalogtv.c pong.c wormhole.c \ mismunch.c pacman.c pacman_ai.c pacman_level.c \ - fuzzyflakes.c anemotaxis.c memscroller.c + fuzzyflakes.c anemotaxis.c memscroller.c substrate.c \ + intermomentary.c fireworkx.c fiberlamp.c boxfit.c SCRIPTS = vidwhacker webcollage ljlatest OBJS = attraction.o blitspin.o bouboule.o braid.o bubbles.o \ @@ -130,7 +135,8 @@ OBJS = attraction.o blitspin.o bouboule.o braid.o bubbles.o \ barcode.o piecewise.o cloudlife.o fontglide.o apple2.o \ apple2-main.o analogtv.o xanalogtv.o pong.o wormhole.o \ mismunch.o pacman.o pacman_ai.o pacman_level.o \ - fuzzyflakes.o anemotaxis.o memscroller.c + fuzzyflakes.o anemotaxis.o memscroller.o substrate.o \ + intermomentary.o fireworkx.o fiberlamp.o boxfit.o NEXES = attraction blitspin bouboule braid bubbles decayscreen deco \ drift flag flame forest vines galaxy grav greynetic halo \ @@ -149,7 +155,8 @@ NEXES = attraction blitspin bouboule braid bubbles decayscreen deco \ juggle polyominoes thornbird fluidballs anemone halftone \ metaballs eruption popsquares barcode piecewise cloudlife \ fontglide apple2 xanalogtv pong wormhole mismunch \ - pacman fuzzyflakes anemotaxis memscroller \ + pacman fuzzyflakes anemotaxis memscroller substrate \ + intermomentary fireworkx fiberlamp boxfit \ @JPEG_EXES@ SEXES = sonar JPEG_EXES = webcollage-helper @@ -195,7 +202,8 @@ MEN = anemone.man ant.man apollonian.man attraction.man \ barcode.man piecewise.man cloudlife.man ljlatest.man \ fontglide.man apple2.man xanalogtv.man pong.man \ wormhole.man mismunch.man pacman.man fuzzyflakes.man \ - anemotaxis.man memscroller.man + anemotaxis.man memscroller.man substrate.man \ + intermomentary.man fireworkx.man fiberlamp.man boxfit.man STAR = * EXTRAS = README Makefile.in xlock_23.h xml2man.pl .gdbinit \ euler2d.tex \ @@ -283,10 +291,7 @@ munge-scripts: $(SCRIPTS) for program in $(SCRIPTS); do \ sed "s@^\(#!\)\(/[^ ]*/perl[^ ]*\)\(.*\)\$$@\1$$perl\3@" \ < $(srcdir)/$$program > $$tmp ; \ - if cmp -s $(srcdir)/$$program $$tmp ; then \ - echo "$$program unchanged" ; \ - true ; \ - else \ + if ! cmp -s $(srcdir)/$$program $$tmp ; then \ echo "$$program: setting interpreter to $$perl" ; \ cat $$tmp > ./$$program ; \ fi ; \ @@ -307,15 +312,16 @@ install-man: $(MEN) done install-xml: - @if [ ! -d $(install_prefix)$(HACK_CONF_DIR) ]; then \ - $(INSTALL_DIRS) $(install_prefix)$(HACK_CONF_DIR) ; \ + @dest=$(install_prefix)$(HACK_CONF_DIR) ; \ + if [ ! -d $$dest ]; then \ + $(INSTALL_DIRS) $$dest ; \ fi ; \ - files=`cd $(srcdir)/config/ ; echo README $(STAR).xml` ; \ - for file in $$files ; do \ - echo $(INSTALL_DATA) $(srcdir)/config/$$file \ - $(install_prefix)$(HACK_CONF_DIR)/$$file ; \ - $(INSTALL_DATA) $(srcdir)/config/$$file \ - $(install_prefix)$(HACK_CONF_DIR)/$$file ; \ + src=$(srcdir)/config ; \ + for file in $(EXES) $(SCRIPTS) ; do \ + if [ -f $$src/$$file.xml ]; then \ + echo $(INSTALL_DATA) $$src/$$file.xml $$dest/$$file.xml ; \ + $(INSTALL_DATA) $$src/$$file.xml $$dest/$$file.xml ; \ + fi ; \ done uninstall-program: @@ -333,10 +339,10 @@ uninstall-man: done uninstall-xml: - @cd $(srcdir)/config/ ; \ - for file in README $(STAR).xml ; do \ - echo rm -f $(install_prefix)$(HACK_CONF_DIR)/$$file ; \ - rm -f $(install_prefix)$(HACK_CONF_DIR)/$$file ; \ + @dest=$(install_prefix)$(HACK_CONF_DIR) ; \ + for file in $(EXES) $(SCRIPTS) ; do \ + echo rm -f $$dest/$$file.xml ; \ + rm -f $$dest/$$file.xml ; \ done clean: @@ -509,6 +515,10 @@ screenhack-xlock.o: screenhack.c $(CC) -o $@ -c $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) \ -DXLOCKMORE $(srcdir)/screenhack.c +# Make sure these are regenerated when the version number ticks. +screenhack.o: $(UTILS_SRC)/version.h +screenhack-xlock.o: $(UTILS_SRC)/version.h + # Some abbreviations to keep the lines short... XPM = xpm-pixmap.o ALP = $(UTILS_BIN)/alpha.o @@ -795,6 +805,21 @@ anemotaxis: anemotaxis.o $(HACK_OBJS) $(DBE) memscroller: memscroller.o $(HACK_OBJS) $(SHM) $(COL) $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(SHM) $(COL) $(HACK_LIBS) +substrate: substrate.o $(HACK_OBJS) + $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(HACK_LIBS) + +intermomentary: intermomentary.o $(HACK_OBJS) $(COL) + $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(COL) $(HACK_LIBS) + +fireworkx: fireworkx.o $(HACK_OBJS) $(COL) + $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(COL) $(HACK_LIBS) + +boxfit: boxfit.o $(HACK_OBJS) $(COL) $(GRAB) + $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(COL) $(GRAB) $(HACK_LIBS) + +ifs: ifs.o $(HACK_OBJS) $(COL) + $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(COL) $(HACK_LIBS) + # The rules for those hacks which follow the `xlockmore' API. # @@ -826,9 +851,6 @@ grav: grav.o $(XLOCK_OBJS) hopalong: hopalong.o $(XLOCK_OBJS) $(ERASE) $(CC_HACK) -o $@ $@.o $(XLOCK_OBJS) $(ERASE) $(HACK_LIBS) -ifs: ifs.o $(XLOCK_OBJS) - $(CC_HACK) -o $@ $@.o $(XLOCK_OBJS) $(HACK_LIBS) - julia: julia.o $(XLOCK_OBJS) $(CC_HACK) -o $@ $@.o $(XLOCK_OBJS) $(HACK_LIBS) @@ -917,6 +939,8 @@ PACOBJS=pacman_ai.o pacman_level.o pacman: pacman.o $(PACOBJS) $(XLOCK_OBJS) $(XPM) $(CC_HACK) -o $@ $@.o $(PACOBJS) $(XLOCK_OBJS) $(XPM) $(XPM_LIBS) +fiberlamp: fiberlamp.o $(XLOCK_OBJS) + $(CC_HACK) -o $@ $@.o $(XLOCK_OBJS) $(HACK_LIBS) # These are not like the others. # @@ -968,6 +992,9 @@ bouboule.o: ../config.h bouboule.o: $(srcdir)/screenhack.h bouboule.o: $(srcdir)/xlockmore.h bouboule.o: $(srcdir)/xlockmoreI.h +boxfit.o: ../config.h +boxfit.o: $(srcdir)/screenhack.h +boxfit.o: $(srcdir)/xpm-pixmap.h braid.o: ../config.h braid.o: $(srcdir)/screenhack.h braid.o: $(srcdir)/xlockmore.h @@ -1084,6 +1111,12 @@ fadeplot.o: ../config.h fadeplot.o: $(srcdir)/screenhack.h fadeplot.o: $(srcdir)/xlockmore.h fadeplot.o: $(srcdir)/xlockmoreI.h +fiberlamp.o: ../config.h +fiberlamp.o: $(srcdir)/screenhack.h +fiberlamp.o: $(srcdir)/xlockmore.h +fiberlamp.o: $(srcdir)/xlockmoreI.h +fireworkx.o: ../config.h +fireworkx.o: $(srcdir)/screenhack.h flag.o: ../config.h flag.o: $(srcdir)/images/bob.xbm flag.o: $(srcdir)/screenhack.h @@ -1134,12 +1167,12 @@ hypercube.o: ../config.h hypercube.o: $(srcdir)/screenhack.h ifs.o: ../config.h ifs.o: $(srcdir)/screenhack.h -ifs.o: $(srcdir)/xlockmore.h -ifs.o: $(srcdir)/xlockmoreI.h imsmap.o: ../config.h imsmap.o: $(srcdir)/screenhack.h interference.o: ../config.h interference.o: $(srcdir)/screenhack.h +intermomentary.o: ../config.h +intermomentary.o: $(srcdir)/screenhack.h jigsaw.o: ../config.h jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_a_e_f.xbm jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_a_e_h.xbm @@ -1250,12 +1283,18 @@ pacman_ai.o: $(srcdir)/pacman.h pacman_ai.o: $(srcdir)/pacman_level.h pacman_ai.o: $(srcdir)/screenhack.h pacman_ai.o: $(srcdir)/xlockmoreI.h +pacman_ai.o: $(srcdir)/xpm-pixmap.h pacman_level.o: ../config.h pacman_level.o: $(srcdir)/pacman.h pacman_level.o: $(srcdir)/pacman_level.h pacman_level.o: $(srcdir)/screenhack.h pacman_level.o: $(srcdir)/xlockmoreI.h +pacman_level.o: $(srcdir)/xpm-pixmap.h pacman.o: ../config.h +pacman.o: $(srcdir)/images/pacman/eyes-d.xpm +pacman.o: $(srcdir)/images/pacman/eyes-l.xpm +pacman.o: $(srcdir)/images/pacman/eyes-r.xpm +pacman.o: $(srcdir)/images/pacman/eyes-u.xpm pacman.o: $(srcdir)/images/pacman/ghost-d1.xpm pacman.o: $(srcdir)/images/pacman/ghost-d2.xpm pacman.o: $(srcdir)/images/pacman/ghost-l1.xpm @@ -1263,8 +1302,29 @@ pacman.o: $(srcdir)/images/pacman/ghost-l2.xpm pacman.o: $(srcdir)/images/pacman/ghost-mask.xpm pacman.o: $(srcdir)/images/pacman/ghost-r1.xpm pacman.o: $(srcdir)/images/pacman/ghost-r2.xpm +pacman.o: $(srcdir)/images/pacman/ghost-s1.xpm +pacman.o: $(srcdir)/images/pacman/ghost-s2.xpm +pacman.o: $(srcdir)/images/pacman/ghost-sf1.xpm +pacman.o: $(srcdir)/images/pacman/ghost-sf2.xpm pacman.o: $(srcdir)/images/pacman/ghost-u1.xpm pacman.o: $(srcdir)/images/pacman/ghost-u2.xpm +pacman.o: $(srcdir)/images/pacman/pacman-0.xpm +pacman.o: $(srcdir)/images/pacman/pacman-d1.xpm +pacman.o: $(srcdir)/images/pacman/pacman-d2.xpm +pacman.o: $(srcdir)/images/pacman/pacman-ds1.xpm +pacman.o: $(srcdir)/images/pacman/pacman-ds2.xpm +pacman.o: $(srcdir)/images/pacman/pacman-ds3.xpm +pacman.o: $(srcdir)/images/pacman/pacman-ds4.xpm +pacman.o: $(srcdir)/images/pacman/pacman-ds5.xpm +pacman.o: $(srcdir)/images/pacman/pacman-ds6.xpm +pacman.o: $(srcdir)/images/pacman/pacman-ds7.xpm +pacman.o: $(srcdir)/images/pacman/pacman-ds8.xpm +pacman.o: $(srcdir)/images/pacman/pacman-l1.xpm +pacman.o: $(srcdir)/images/pacman/pacman-l2.xpm +pacman.o: $(srcdir)/images/pacman/pacman-r1.xpm +pacman.o: $(srcdir)/images/pacman/pacman-r2.xpm +pacman.o: $(srcdir)/images/pacman/pacman-u1.xpm +pacman.o: $(srcdir)/images/pacman/pacman-u2.xpm pacman.o: $(srcdir)/pacman_ai.h pacman.o: $(srcdir)/pacman.h pacman.o: $(srcdir)/pacman_level.h @@ -1349,6 +1409,8 @@ strange.o: ../config.h strange.o: $(srcdir)/screenhack.h strange.o: $(srcdir)/xlockmore.h strange.o: $(srcdir)/xlockmoreI.h +substrate.o: ../config.h +substrate.o: $(srcdir)/screenhack.h swirl.o: ../config.h swirl.o: $(srcdir)/screenhack.h swirl.o: $(srcdir)/xlockmore.h