X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2FMakefile.in;h=cc99a4181f949ff9cb35deabf19ac1a5c1d42403;hb=a1d41b2aa6e18bf9a49b914a99dda8232c5d7762;hp=06b84f7884a33a714801900254ba738cff00440d;hpb=82c5080773aae5e72ec155327c075775e023d2ee;p=xscreensaver diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in index 06b84f78..cc99a418 100644 --- a/hacks/glx/Makefile.in +++ b/hacks/glx/Makefile.in @@ -38,11 +38,12 @@ X_CFLAGS = @X_CFLAGS@ X_LIBS = @X_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ +XMU_LIBS = @XMU_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 -lXext $(X_EXTRA_LIBS) -lm +HACK_POST = $(X_PRE_LIBS) -lXt -lX11 $(XMU_LIBS) -lXext $(X_EXTRA_LIBS) -lm HACK_POST2 = @GL_LIBS@ @HACK_LIBS@ $(HACK_POST) HACK_LIBS = $(HACK_PRE) $(HACK_POST2) XPM_LIBS = $(HACK_PRE) @XPM_LIBS@ $(HACK_POST2) @@ -53,7 +54,7 @@ HACK_BIN = .. UTILS_SRC = $(HACK_SRC)/../utils UTILS_BIN = $(HACK_BIN)/../utils -INCLUDES = -I$(srcdir) -I$(UTILS_SRC) -I$(HACK_SRC) -I../.. @INCLUDES@ +INCLUDES = -I. -I$(srcdir) -I$(UTILS_SRC) -I$(HACK_SRC) -I../.. @INCLUDES@ UTIL_SRCS = $(UTILS_SRC)/colors.c $(UTILS_SRC)/hsv.c \ $(UTILS_SRC)/resources.c $(UTILS_SRC)/usleep.c \ @@ -76,7 +77,7 @@ SRCS = xscreensaver-gl-helper.c \ extrusion-taper.c extrusion-twistoid.c sierpinski3d.c \ gflux.c stonerview.c stonerview-move.c stonerview-osc.c \ stonerview-view.c starwars.c glut_stroke.c glut_swidth.c \ - gltext.c molecule.c dangerball.c sphere.c tube.c + gltext.c molecule.c dangerball.c sphere.c tube.c circuit.c OBJS = xscreensaver-gl-helper.o \ atlantis.o b_draw.o b_lockglue.o b_sphere.o bubble3d.o \ @@ -90,17 +91,16 @@ OBJS = xscreensaver-gl-helper.o \ extrusion-taper.o extrusion-twistoid.o sierpinski3d.o \ gflux.o stonerview.o stonerview-move.o stonerview-osc.o \ stonerview-view.o starwars.o glut_stroke.o glut_swidth.o \ - gltext.o molecule.o dangerball.o sphere.o tube.o + gltext.o molecule.o dangerball.o sphere.o tube.o circuit.o -GL_EXES_1 = cage gears moebius pipes sproingies stairs superquadrics \ +GL_EXES = cage gears moebius pipes sproingies stairs superquadrics \ morph3d rubik atlantis lament bubble3d glplanet pulsar \ sierpinski3d gflux stonerview starwars gltext molecule \ - dangerball -UTIL_EXES = xscreensaver-gl-helper -GL_EXES = $(UTIL_EXES) $(GL_EXES_1) + dangerball circuit GLE_EXES = extrusion +GL_UTIL_EXES = xscreensaver-gl-helper HACK_EXES = @GL_EXES@ @GLE_EXES@ -EXES = $(HACK_EXES) +EXES = @GL_UTIL_EXES@ $(HACK_EXES) HACK_OBJS = screenhack-gl.o xlock-gl.o fps.o $(HACK_BIN)/xlockmore.o \ $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \ @@ -129,68 +129,70 @@ install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install # the hacks, in $HACKDIR -install-program:: $(HACK_EXES) - @if [ ! -d $(install_prefix)$(HACKDIR) ]; then \ - $(INSTALL_DIRS) $(install_prefix)$(HACKDIR) ; \ - fi ; \ - exes="$(HACK_EXES)" ; \ - for program in $$exes; do \ - echo $(INSTALL_PROGRAM) $$program \ - $(install_prefix)$(HACKDIR)/$$program ; \ - $(INSTALL_PROGRAM) $$program \ - $(install_prefix)$(HACKDIR)/$$program ; \ - done +install-program:: $(EXES) + @exes="$(HACK_EXES)" ; \ + idir="$(install_prefix)$(HACKDIR)" ; \ + if [ "$$exes" != "" ]; then \ + if [ ! -d $$idir ]; then \ + $(INSTALL_DIRS) $$idir ; \ + fi ; \ + for program in $$exes; do \ + echo $(INSTALL_PROGRAM) $$program $$idir/$$program ; \ + $(INSTALL_PROGRAM) $$program $$idir/$$program ; \ + done ; \ + fi # the xscreensaver-gl-helper program, in $bindir -install-program:: $(HACK_EXES) - @if [ "$(HACK_EXES)" != "" ]; then \ - if [ ! -d $(install_prefix)$(bindir) ]; then \ - $(INSTALL_DIRS) $(install_prefix)$(bindir) ; \ +install-program:: $(EXES) + @exes="@GL_UTIL_EXES@" ; \ + idir="$(install_prefix)$(bindir)" ; \ + if [ "$$exes" != "" ]; then \ + if [ ! -d $$idir ]; then \ + $(INSTALL_DIRS) $$idir ; \ fi ; \ - exes="$(UTIL_EXES)" ; \ for program in $$exes; do \ - echo $(INSTALL_PROGRAM) $$program \ - $(install_prefix)$(bindir)/$$program ; \ - $(INSTALL_PROGRAM) $$program \ - $(install_prefix)$(bindir)/$$program ; \ + echo $(INSTALL_PROGRAM) $$program $$idir/$$program ; \ + $(INSTALL_PROGRAM) $$program $$idir/$$program ; \ done ; \ fi install-man: $(MEN) @men="$(MEN)" ; \ - if [ ! -d $(install_prefix)$(man1dir) ]; then \ - $(INSTALL_DIRS) $(install_prefix)$(man1dir) ; \ + idir="$(install_prefix)$(man1dir)" ; \ + if [ ! -d $$idir ]; then \ + $(INSTALL_DIRS) $$idir ; \ fi ; \ - for man in $$men; do \ - instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ; \ - echo $(INSTALL_DATA) $(srcdir)/$$man \ - $(install_prefix)$(man1dir)/$$instname ; \ - $(INSTALL_DATA) $(srcdir)/$$man \ - $(install_prefix)$(man1dir)/$$instname ; \ - done + for man in $$men; do \ + instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ; \ + echo $(INSTALL_DATA) $(srcdir)/$$man $$idir/$$instname ; \ + $(INSTALL_DATA) $(srcdir)/$$man $$idir/$$instname ; \ + done # the hacks, in $HACKDIR uninstall-program:: - @exes="$(GL_EXES_1) $(GLE_EXES)" ; \ - for program in $$exes; do \ - echo rm -f $(install_prefix)$(HACKDIR)/$$program ; \ - rm -f $(install_prefix)$(HACKDIR)/$$program ; \ - done + @exes="$(HACK_EXES)" ; \ + idir="$(install_prefix)$(HACKDIR)" ; \ + for program in $$exes; do \ + echo rm -f $$idir/$$program ; \ + rm -f $$idir/$$program ; \ + done # the xscreensaver-gl-helper program, in $bindir uninstall-program:: - @exes="$(UTIL_EXES)" ; \ - for program in $$exes; do \ - echo rm -f $(install_prefix)$(bindir)/$$program ; \ - rm -f $(install_prefix)$(bindir)/$$program ; \ + @exes="$(GL_UTIL_EXES)" ; \ + idir="$(install_prefix)$(bindir)" ; \ + for program in $$exes; do \ + echo rm -f $$idir/$$program ; \ + rm -f $$idir/$$program ; \ done uninstall-man: - @men="$(GL_MEN)" ; \ - for man in $$men; do \ - instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ; \ - echo rm -f $(install_prefix)$(man1dir)/$$instname ; \ - rm -f $(install_prefix)$(man1dir)/$$instname ; \ + @men="$(MEN)" ; \ + idir="$(install_prefix)$(man1dir)" ; \ + for man in $$men; do \ + instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ; \ + echo rm -f $$idir/$$instname ; \ + rm -f $$idir/$$instname ; \ done clean: @@ -282,9 +284,9 @@ screenhack-gl.o: $(HACK_SRC)/screenhack.c CC_HACK = $(CC) $(LDFLAGS) -atlantis: atlantis.o $(HACK_OBJS) dolphin.o shark.o swim.o whale.o - $(CC_HACK) -o $@ $@.o $(HACK_OBJS) dolphin.o shark.o swim.o whale.o \ - $(HACK_LIBS) +ATLANTIS_OBJS = $(HACK_OBJS) dolphin.o shark.o swim.o whale.o xpm-ximage.o +atlantis: atlantis.o $(ATLANTIS_OBJS) + $(CC_HACK) -o $@ $@.o $(ATLANTIS_OBJS) $(HACK_LIBS) $(XPM_LIBS) cage: cage.o $(HACK_OBJS) $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(HACK_LIBS) @@ -352,6 +354,9 @@ gltext: $(GLT_OBJS) $(HACK_OBJS) dangerball: dangerball.o sphere.o tube.o $(HACK_OBJS) $(CC_HACK) -o $@ $@.o sphere.o tube.o $(HACK_OBJS) $(HACK_LIBS) +circuit: circuit.o $(HACK_OBJS) + $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(HACK_LIBS) + # This one works differently (it's not xlock-like.) # STONER_OBJS=stonerview.o stonerview-move.o stonerview-osc.o stonerview-view.o \ @@ -373,6 +378,8 @@ molecules.h: molecule: molecule.o sphere.o tube.o $(HACK_OBJS) $(CC_HACK) -o $@ $@.o sphere.o tube.o $(HACK_OBJS) $(HACK_LIBS) +dnalogo: dnalogo.o tube.o $(HACK_OBJS) + $(CC_HACK) -o $@ $@.o tube.o $(HACK_OBJS) $(HACK_LIBS) ############################################################################## # @@ -395,6 +402,8 @@ atlantis.o: $(UTILS_SRC)/grabscreen.h atlantis.o: $(UTILS_SRC)/visual.h atlantis.o: $(UTILS_SRC)/xshm.h atlantis.o: $(srcdir)/atlantis.h +atlantis.o: $(srcdir)/xpm-ximage.h +atlantis.o: $(HACK_SRC)/images/sea-texture.xpm b_draw.o: $(srcdir)/bubble3d.h b_draw.o: $(HACK_SRC)/xlockmoreI.h b_draw.o: $(HACK_SRC)/screenhack.h @@ -777,10 +786,20 @@ dangerball.o: $(UTILS_SRC)/visual.h dangerball.o: $(UTILS_SRC)/xshm.h dangerball.o: $(srcdir)/sphere.h dangerball.o: $(srcdir)/tube.h -dangerball.o: $(srcdir)/glutstroke.h -dangerball.o: $(srcdir)/glut_roman.h sphere.o: ../../config.h sphere.o: $(srcdir)/tube.h tube.o: ../../config.h tube.o: $(srcdir)/tube.h +circuit.o: $(HACK_SRC)/xlockmore.h +circuit.o: ../../config.h +circuit.o: $(HACK_SRC)/xlockmoreI.h +circuit.o: $(HACK_SRC)/screenhack.h +circuit.o: $(UTILS_SRC)/yarandom.h +circuit.o: $(UTILS_SRC)/usleep.h +circuit.o: $(UTILS_SRC)/resources.h +circuit.o: $(UTILS_SRC)/hsv.h +circuit.o: $(UTILS_SRC)/colors.h +circuit.o: $(UTILS_SRC)/grabscreen.h +circuit.o: $(UTILS_SRC)/visual.h +circuit.o: $(UTILS_SRC)/xshm.h