X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2FMakefile.in;h=ecc170c075525c30aa034c16ed27ba3ef048ae78;hb=0bd2eabab3e404c6769fe8f59b639275e960c415;hp=687145342dda8ed6ce3743cc7dea1b8ab17149db;hpb=6bb727f03bff0389fbb1349d7df4c9d8d7532959;p=xscreensaver diff --git a/hacks/Makefile.in b/hacks/Makefile.in index 68714534..ecc170c0 100644 --- a/hacks/Makefile.in +++ b/hacks/Makefile.in @@ -30,6 +30,7 @@ SHELL = /bin/sh INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +INSTALL_DIRS = @INSTALL_DIRS@ HACKDIR = @HACKDIR@ X_CFLAGS = @X_CFLAGS@ @@ -37,6 +38,8 @@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ +# Note: see comment in ../driver/Makefile.in for explanation of X_LIBS, etc. +# HACK_PRE = $(LIBS) $(X_LIBS) $(X_PRE_LIBS) HACK_POST = -lXt -lX11 -lXext $(X_EXTRA_LIBS) -lm HACK_LIBS = $(HACK_PRE) @HACK_LIBS@ $(HACK_POST) @@ -48,7 +51,7 @@ SGI_VIDEO_LIBS = @SGI_VIDEO_LIBS@ UTILS_SRC = $(srcdir)/../utils UTILS_BIN = ../utils -INCLUDES = -I$(srcdir) -I$(srcdir)/.. -I$(UTILS_SRC) -I.. @INCLUDES@ +INCLUDES = -I$(srcdir) -I$(UTILS_SRC) -I.. @INCLUDES@ UTIL_SRCS = $(UTILS_SRC)/alpha.c $(UTILS_SRC)/colors.c \ $(UTILS_SRC)/grabscreen.c $(UTILS_SRC)/hsv.c \ @@ -73,8 +76,9 @@ SRCS = attraction.c blitspin.c bouboule.c braid.c bubbles.c \ slip.c sphere.c spiral.c strange.c swirl.c xlockmore.c \ xroger-hack.c goop.c starfish.c munch.c fadeplot.c \ rd-bomb.c coral.c mountain.c triangle.c lissie.c worm.c \ - rotor.c ant.c xjack.c xlyap.c puzzle.c xscreensaver-sgigl.c \ - cynosure.c moire2.c + rotor.c ant.c xjack.c xlyap.c jigsaw.c xscreensaver-sgigl.c \ + cynosure.c moire2.c flow.c epicycle.c interference.c \ + truchet.c bsod.c crystal.c discrete.c OBJS = attraction.o blitspin.o bouboule.o braid.o bubbles.o \ bubbles-default.o decayscreen.o deco.o drift.o flag.o \ @@ -86,8 +90,9 @@ OBJS = attraction.o blitspin.o bouboule.o braid.o bubbles.o \ slip.o sphere.o spiral.o strange.o swirl.o xlockmore.o \ xroger-hack.o goop.o starfish.o munch.o fadeplot.o \ rd-bomb.o coral.o mountain.o triangle.o lissie.o worm.o \ - rotor.o ant.o xjack.o xlyap.o puzzle.o xscreensaver-sgigl.o \ - cynosure.o moire2.o + rotor.o ant.o xjack.o xlyap.o jigsaw.o xscreensaver-sgigl.o \ + cynosure.o moire2.o flow.o epicycle.o interference.o \ + truchet.o bsod.o crystal.o discrete.o EXES = attraction blitspin bouboule braid bubbles decayscreen deco \ drift flag flame forest vines galaxy grav greynetic halo \ @@ -96,7 +101,8 @@ EXES = attraction blitspin bouboule braid bubbles decayscreen deco \ penrose pyro qix rocks rorschach sierpinski slidescreen \ slip sphere spiral strange swirl xroger goop starfish munch \ fadeplot rd-bomb coral mountain triangle lissie worm rotor \ - ant xjack xlyap puzzle cynosure moire2 + ant xjack xlyap jigsaw cynosure moire2 flow epicycle \ + interference truchet bsod crystal discrete HACK_OBJS_1 = $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \ $(UTILS_BIN)/usleep.o $(UTILS_BIN)/yarandom.o @XMU_OBJS@ @@ -118,16 +124,17 @@ MEN = attraction.man blitspin.man bouboule.man braid.man \ rocks.man rorschach.man sierpinski.man slidescreen.man \ slip.man sphere.man spiral.man strange.man swirl.man \ xroger.man goop.man starfish.man munch.man rd-bomb.man \ - xjack.man xlyap.man puzzle.man + xjack.man xlyap.man jigsaw.man epicycle.man STAR = * -EXTRAS = README Makefile.in xlock.h .gdbinit \ +EXTRAS = README Makefile.in xlock_23.h .gdbinit \ vidwhacker \ images/$(STAR).xbm \ + images/$(STAR).xpm \ images/bubbles/$(STAR).pov \ images/bubbles/$(STAR).xpm \ images/noseguy/$(STAR).xbm \ images/noseguy/$(STAR).xpm \ - images/puzzle/$(STAR).xbm \ + images/jigsaw/$(STAR).xbm \ 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 @@ -144,16 +151,16 @@ install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install install-program: - @if [ ! -d $(HACKDIR) ]; then mkdir $(HACKDIR) ; fi ; \ - for program in $(EXES); do \ + @exes="$(EXES)" ; \ + if [ ! -d $(HACKDIR) ]; then $(INSTALL_DIRS) $(HACKDIR) ; fi ; \ + for program in $$exes; do \ echo $(INSTALL_PROGRAM) $$program $(HACKDIR)/$$program ; \ $(INSTALL_PROGRAM) $$program $(HACKDIR)/$$program ; \ done install-man: - @if [ ! -d $(mandir) ]; then mkdir $(mandir) ; fi ; \ - if [ ! -d $(man1dir) ]; then mkdir $(man1dir) ; fi ; \ - men="$(MEN)" ; \ + @men="$(MEN)" ; \ + if [ ! -d $(man1dir) ]; then $(INSTALL_DIRS) $(man1dir) ; fi ; \ for man in $$men; do \ instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ; \ echo $(INSTALL_DATA) $(srcdir)/$$man $(man1dir)/$$instname ; \ @@ -416,12 +423,24 @@ xjack: $(HACK_OBJS) xjack.o xlyap: $(HACK_OBJS) xlyap.o $(COL) $(CC_HACK) -o $@ $(HACK_OBJS) xlyap.o $(COL) $(HACK_LIBS) -puzzle: $(HACK_OBJS) puzzle.o $(GRAB) - $(CC_HACK) -o $@ $(HACK_OBJS) puzzle.o $(GRAB) $(HACK_LIBS) $(GRAB_LIBS) +jigsaw: $(HACK_OBJS) jigsaw.o $(GRAB) + $(CC_HACK) -o $@ $(HACK_OBJS) jigsaw.o $(GRAB) $(HACK_LIBS) $(GRAB_LIBS) cynosure: $(HACK_OBJS) cynosure.o $(COL) $(CC_HACK) -o $@ $(HACK_OBJS) cynosure.o $(COL) $(HACK_LIBS) +epicycle: $(HACK_OBJS) epicycle.o $(COL) $(ERASE) + $(CC_HACK) -o $@ $(HACK_OBJS) epicycle.o $(COL) $(ERASE) $(HACK_LIBS) + +interference: $(HACK_OBJS) interference.o $(COL) + $(CC_HACK) -o $@ $(HACK_OBJS) interference.o $(COL) $(HACK_LIBS) + +truchet: $(HACK_OBJS) truchet.o $(COL) + $(CC_HACK) -o $@ $(HACK_OBJS) truchet.o $(COL) $(HACK_LIBS) + +bsod: $(HACK_OBJS) bsod.o $(COL) + $(CC_HACK) -o $@ $(HACK_OBJS) bsod.o $(COL) $(HACK_LIBS) $(XPM_LIBS) + # The rules for those hacks which follow the `xlockmore' API. # @@ -510,6 +529,15 @@ rotor: rotor.o $(XLOCK_OBJS) ant: ant.o $(XLOCK_OBJS) $(ERASE) $(CC_HACK) -o $@ $@.o $(XLOCK_OBJS) $(ERASE) $(HACK_LIBS) +flow: flow.o $(XLOCK_OBJS) + $(CC_HACK) -o $@ $@.o $(XLOCK_OBJS) $(HACK_LIBS) + +discrete: discrete.o $(XLOCK_OBJS) $(ERASE) + $(CC_HACK) -o $@ $@.o $(XLOCK_OBJS) $(ERASE) $(HACK_LIBS) + +crystal: crystal.o $(XLOCK_OBJS) + $(CC_HACK) -o $@ $@.o $(XLOCK_OBJS) $(HACK_LIBS) + ############################################################################## # @@ -1190,51 +1218,51 @@ xlyap.o: $(UTILS_SRC)/colors.h xlyap.o: $(UTILS_SRC)/grabscreen.h xlyap.o: $(UTILS_SRC)/visual.h xlyap.o: $(UTILS_SRC)/vroot.h -puzzle.o: $(srcdir)/screenhack.h -puzzle.o: ../config.h -puzzle.o: $(UTILS_SRC)/yarandom.h -puzzle.o: $(UTILS_SRC)/usleep.h -puzzle.o: $(UTILS_SRC)/resources.h -puzzle.o: $(UTILS_SRC)/hsv.h -puzzle.o: $(UTILS_SRC)/colors.h -puzzle.o: $(UTILS_SRC)/grabscreen.h -puzzle.o: $(UTILS_SRC)/visual.h -puzzle.o: $(srcdir)/images/puzzle/puzzle_a_h.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_a_n_h.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_a_ne_h.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_a_e_h.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_a_se_h.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_a_s_h.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_a_sw_h.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_a_w_h.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_a_nw_h.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_b_h.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_b_n_h.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_b_ne_h.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_b_e_h.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_b_se_h.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_b_s_h.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_b_sw_h.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_b_w_h.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_b_nw_h.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_a_f.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_a_n_f.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_a_ne_f.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_a_e_f.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_a_se_f.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_a_s_f.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_a_sw_f.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_a_w_f.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_a_nw_f.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_b_f.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_b_n_f.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_b_ne_f.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_b_e_f.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_b_se_f.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_b_s_f.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_b_sw_f.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_b_w_f.xbm -puzzle.o: $(srcdir)/images/puzzle/puzzle_b_nw_f.xbm +jigsaw.o: $(srcdir)/screenhack.h +jigsaw.o: ../config.h +jigsaw.o: $(UTILS_SRC)/yarandom.h +jigsaw.o: $(UTILS_SRC)/usleep.h +jigsaw.o: $(UTILS_SRC)/resources.h +jigsaw.o: $(UTILS_SRC)/hsv.h +jigsaw.o: $(UTILS_SRC)/colors.h +jigsaw.o: $(UTILS_SRC)/grabscreen.h +jigsaw.o: $(UTILS_SRC)/visual.h +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_a_h.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_a_n_h.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_a_ne_h.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_a_e_h.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_a_se_h.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_a_s_h.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_a_sw_h.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_a_w_h.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_a_nw_h.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_b_h.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_b_n_h.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_b_ne_h.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_b_e_h.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_b_se_h.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_b_s_h.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_b_sw_h.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_b_w_h.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_b_nw_h.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_a_f.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_a_n_f.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_a_ne_f.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_a_e_f.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_a_se_f.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_a_s_f.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_a_sw_f.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_a_w_f.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_a_nw_f.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_b_f.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_b_n_f.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_b_ne_f.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_b_e_f.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_b_se_f.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_b_s_f.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_b_sw_f.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_b_w_f.xbm +jigsaw.o: $(srcdir)/images/jigsaw/jigsaw_b_nw_f.xbm xscreensaver-sgigl.o: $(UTILS_SRC)/vroot.h cynosure.o: $(srcdir)/screenhack.h cynosure.o: ../config.h @@ -1254,4 +1282,78 @@ moire2.o: $(UTILS_SRC)/hsv.h moire2.o: $(UTILS_SRC)/colors.h moire2.o: $(UTILS_SRC)/grabscreen.h moire2.o: $(UTILS_SRC)/visual.h +flow.o: $(srcdir)/xlockmore.h +flow.o: ../config.h +flow.o: $(srcdir)/xlockmoreI.h +flow.o: $(srcdir)/screenhack.h +flow.o: $(UTILS_SRC)/yarandom.h +flow.o: $(UTILS_SRC)/usleep.h +flow.o: $(UTILS_SRC)/resources.h +flow.o: $(UTILS_SRC)/hsv.h +flow.o: $(UTILS_SRC)/colors.h +flow.o: $(UTILS_SRC)/grabscreen.h +flow.o: $(UTILS_SRC)/visual.h +flow.o: $(UTILS_SRC)/erase.h +epicycle.o: $(srcdir)/screenhack.h +epicycle.o: ../config.h +epicycle.o: $(UTILS_SRC)/yarandom.h +epicycle.o: $(UTILS_SRC)/usleep.h +epicycle.o: $(UTILS_SRC)/resources.h +epicycle.o: $(UTILS_SRC)/hsv.h +epicycle.o: $(UTILS_SRC)/colors.h +epicycle.o: $(UTILS_SRC)/grabscreen.h +epicycle.o: $(UTILS_SRC)/visual.h +epicycle.o: $(UTILS_SRC)/erase.h +interference.o: $(srcdir)/screenhack.h +interference.o: ../config.h +interference.o: $(UTILS_SRC)/yarandom.h +interference.o: $(UTILS_SRC)/usleep.h +interference.o: $(UTILS_SRC)/resources.h +interference.o: $(UTILS_SRC)/hsv.h +interference.o: $(UTILS_SRC)/colors.h +interference.o: $(UTILS_SRC)/grabscreen.h +interference.o: $(UTILS_SRC)/visual.h +truchet.o: $(srcdir)/screenhack.h +truchet.o: ../config.h +truchet.o: $(UTILS_SRC)/yarandom.h +truchet.o: $(UTILS_SRC)/usleep.h +truchet.o: $(UTILS_SRC)/resources.h +truchet.o: $(UTILS_SRC)/hsv.h +truchet.o: $(UTILS_SRC)/colors.h +truchet.o: $(UTILS_SRC)/grabscreen.h +truchet.o: $(UTILS_SRC)/visual.h +bsod.o: $(srcdir)/screenhack.h +bsod.o: ../config.h +bsod.o: $(UTILS_SRC)/yarandom.h +bsod.o: $(UTILS_SRC)/usleep.h +bsod.o: $(UTILS_SRC)/resources.h +bsod.o: $(UTILS_SRC)/hsv.h +bsod.o: $(UTILS_SRC)/colors.h +bsod.o: $(UTILS_SRC)/grabscreen.h +bsod.o: $(UTILS_SRC)/visual.h +bsod.o: $(srcdir)/images/amiga.xpm +bsod.o: $(srcdir)/images/mac.xbm +crystal.o: $(srcdir)/xlockmore.h +crystal.o: ../config.h +crystal.o: $(srcdir)/xlockmoreI.h +crystal.o: $(srcdir)/screenhack.h +crystal.o: $(UTILS_SRC)/yarandom.h +crystal.o: $(UTILS_SRC)/usleep.h +crystal.o: $(UTILS_SRC)/resources.h +crystal.o: $(UTILS_SRC)/hsv.h +crystal.o: $(UTILS_SRC)/colors.h +crystal.o: $(UTILS_SRC)/grabscreen.h +crystal.o: $(UTILS_SRC)/visual.h +discrete.o: $(srcdir)/xlockmore.h +discrete.o: ../config.h +discrete.o: $(srcdir)/xlockmoreI.h +discrete.o: $(srcdir)/screenhack.h +discrete.o: $(UTILS_SRC)/yarandom.h +discrete.o: $(UTILS_SRC)/usleep.h +discrete.o: $(UTILS_SRC)/resources.h +discrete.o: $(UTILS_SRC)/hsv.h +discrete.o: $(UTILS_SRC)/colors.h +discrete.o: $(UTILS_SRC)/grabscreen.h +discrete.o: $(UTILS_SRC)/visual.h +discrete.o: $(UTILS_SRC)/erase.h