X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2FMakefile.in;h=cc99a4181f949ff9cb35deabf19ac1a5c1d42403;hb=a1d41b2aa6e18bf9a49b914a99dda8232c5d7762;hp=dcdfa94ec7c801da854fdaf618c4e798b83f9d1a;hpb=14627f4038ada5d11456f3770090f3c39740d70f;p=xscreensaver diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in index dcdfa94e..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 \ @@ -70,10 +71,13 @@ SRCS = xscreensaver-gl-helper.c \ morph3d.c pipeobjs.c pipes.c rubik.c s1_1.c s1_2.c s1_3.c \ s1_4.c s1_5.c s1_6.c s1_b.c shark.c sproingies.c \ sproingiewrap.c stairs.c superquadrics.c swim.c whale.c \ - xlock-gl.c xpm-ximage.c glplanet.c pulsar.c \ + xlock-gl.c fps.c xpm-ximage.c glplanet.c pulsar.c \ extrusion.c extrusion-helix2.c extrusion-helix3.c \ extrusion-helix4.c extrusion-joinoffset.c extrusion-screw.c \ - extrusion-taper.c extrusion-twistoid.c sierpinski3d.c gflux.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 circuit.c OBJS = xscreensaver-gl-helper.o \ atlantis.o b_draw.o b_lockglue.o b_sphere.o bubble3d.o \ @@ -81,27 +85,34 @@ OBJS = xscreensaver-gl-helper.o \ morph3d.o pipeobjs.o pipes.o rubik.o s1_1.o s1_2.o s1_3.o \ s1_4.o s1_5.o s1_6.o s1_b.o shark.o sproingies.o \ sproingiewrap.o stairs.o superquadrics.o swim.o whale.o \ - xlock-gl.o xpm-ximage.o glplanet.o pulsar.o \ + xlock-gl.o fps.o xpm-ximage.o glplanet.o pulsar.o \ extrusion.o extrusion-helix2.o extrusion-helix3.o \ extrusion-helix4.o extrusion-joinoffset.o extrusion-screw.o \ - extrusion-taper.o extrusion-twistoid.o sierpinski3d.o gflux.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 circuit.o GL_EXES = cage gears moebius pipes sproingies stairs superquadrics \ morph3d rubik atlantis lament bubble3d glplanet pulsar \ - sierpinski3d gflux + sierpinski3d gflux stonerview starwars gltext molecule \ + dangerball circuit GLE_EXES = extrusion -UTIL_EXES = xscreensaver-gl-helper +GL_UTIL_EXES = xscreensaver-gl-helper HACK_EXES = @GL_EXES@ @GLE_EXES@ -EXES = $(HACK_EXES) $(UTIL_EXES) +EXES = @GL_UTIL_EXES@ $(HACK_EXES) -HACK_OBJS = screenhack-gl.o xlock-gl.o $(HACK_BIN)/xlockmore.o \ +HACK_OBJS = screenhack-gl.o xlock-gl.o fps.o $(HACK_BIN)/xlockmore.o \ $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \ $(UTILS_BIN)/visual-gl.o $(UTILS_BIN)/usleep.o \ $(UTILS_BIN)/yarandom.o $(UTILS_BIN)/hsv.o \ $(UTILS_BIN)/colors.o -HDRS = atlantis.h bubble3d.h buildlwo.h e_textures.h xpm-ximage.h -GL_MEN = lament.man xscreensaver-gl-helper.man gflux.man +HDRS = atlantis.h bubble3d.h buildlwo.h e_textures.h xpm-ximage.h \ + tube.h sphere.h stonerview-move.h stonerview-osc.h \ + glutstroke.h glut_roman.h +GL_MEN = gflux.man lament.man starwars.man gltext.man \ + molecule.man xscreensaver-gl-helper.man MEN = @GL_MEN@ EXTRAS = README Makefile.in @@ -118,70 +129,74 @@ 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:: $(UTIL_EXES) - @if [ ! -d $(install_prefix)$(bindir) ]; then \ - $(INSTALL_DIRS) $(install_prefix)$(bindir) ; \ - fi ; \ - exes="$(UTIL_EXES)" ; \ - for program in $$exes; do \ - echo $(INSTALL_PROGRAM) $$program \ - $(install_prefix)$(bindir)/$$program ; \ - $(INSTALL_PROGRAM) $$program \ - $(install_prefix)$(bindir)/$$program ; \ - done +install-program:: $(EXES) + @exes="@GL_UTIL_EXES@" ; \ + idir="$(install_prefix)$(bindir)" ; \ + 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 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="$(HACK_EXES)" ; \ - for program in $$exes; do \ - echo rm -f $(install_prefix)$(HACKDIR)/$$program ; \ - rm -f $(install_prefix)$(HACKDIR)/$$program ; \ - done + 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="$(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 ; \ + 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: - -rm -f *.o a.out core $(EXES) + -rm -f *.o a.out core $(EXES) molecules.h distclean: clean -rm -f Makefile TAGS *~ "#"* @@ -197,7 +212,7 @@ depend: # close. This excludes dependencies on files in /usr/include, etc. It tries # to include only dependencies on files which are themselves a part of this # package. -distdepend:: +distdepend:: molecules.h @echo updating dependencies in `pwd`/Makefile.in... ; \ $(DEPEND) -w 0 -f - \ -s '# DO NOT DELETE: updated by make distdepend' $(DEPEND_FLAGS) -- \ @@ -211,7 +226,8 @@ distdepend:: -e 's@ \.\./@ $$(HACK_SRC)/@g' \ -e 's@ \([^$$]\)@ $$(srcdir)/\1@g' \ -e 's@ $$(srcdir)/\(.*config.h\)@ \1@g' \ - -e 's@ $$(HACK_SRC)/\(.*config.h\)@ ../\1@g' ; \ + -e 's@ $$(HACK_SRC)/\(.*config.h\)@ ../\1@g' \ + -e 's@ $$(srcdir)/\(.*molecules.h\)@ \1@g' ; \ echo '' \ ) > /tmp/distdepend.$$$$ && \ mv Makefile.in Makefile.in.bak && \ @@ -268,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) @@ -309,8 +325,8 @@ B3D = b_sphere.o b_draw.o b_lockglue.o bubble3d: bubble3d.o $(HACK_OBJS) $(B3D) $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(B3D) $(HACK_LIBS) -glplanet: glplanet.o $(HACK_OBJS) xpm-ximage.o - $(CC_HACK) -o $@ $@.o $(HACK_OBJS) xpm-ximage.o $(XPM_LIBS) +glplanet: glplanet.o sphere.o xpm-ximage.o $(HACK_OBJS) + $(CC_HACK) -o $@ $@.o sphere.o xpm-ximage.o $(HACK_OBJS) $(XPM_LIBS) pulsar: pulsar.o $(HACK_OBJS) $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(HACK_LIBS) @@ -327,6 +343,44 @@ sierpinski3d: sierpinski3d.o $(HACK_OBJS) gflux: gflux.o $(HACK_OBJS) $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(HACK_LIBS) +SW_OBJS=starwars.o glut_stroke.o glut_swidth.o +starwars: $(SW_OBJS) $(HACK_OBJS) + $(CC_HACK) -o $@ $(SW_OBJS) $(HACK_OBJS) $(HACK_LIBS) + +GLT_OBJS=gltext.o glut_stroke.o glut_swidth.o tube.o +gltext: $(GLT_OBJS) $(HACK_OBJS) + $(CC_HACK) -o $@ $(GLT_OBJS) $(HACK_OBJS) $(HACK_LIBS) + +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 \ + $(UTILS_BIN)/yarandom.o +stonerview: $(STONER_OBJS) + $(CC_HACK) -o $@ $(STONER_OBJS) $(HACK_LIBS) + +molecules.h: + @tmp=molecules.h.$$$$ ; \ + rm -f $$tmp ; \ + echo "building molecules.h from $(HACK_SRC)/images/molecules/*.pdb" ; \ + for f in $(HACK_SRC)/images/molecules/*.pdb ; do \ + $(SHELL) $(UTILS_SRC)/ad2c "$$f" | \ + sed 's/",$$/\\n"/' >> $$tmp ; \ + echo ',' >> $$tmp ; \ + done ; \ + mv $$tmp 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) + ############################################################################## # # DO NOT DELETE: updated by make distdepend @@ -348,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 @@ -570,6 +626,17 @@ xlock-gl.o: $(UTILS_SRC)/grabscreen.h xlock-gl.o: $(UTILS_SRC)/visual.h xlock-gl.o: $(HACK_SRC)/xlockmoreI.h xlock-gl.o: $(UTILS_SRC)/xshm.h +fps.o: ../../config.h +fps.o: $(HACK_SRC)/screenhack.h +fps.o: $(UTILS_SRC)/yarandom.h +fps.o: $(UTILS_SRC)/usleep.h +fps.o: $(UTILS_SRC)/resources.h +fps.o: $(UTILS_SRC)/hsv.h +fps.o: $(UTILS_SRC)/colors.h +fps.o: $(UTILS_SRC)/grabscreen.h +fps.o: $(UTILS_SRC)/visual.h +fps.o: $(HACK_SRC)/xlockmoreI.h +fps.o: $(UTILS_SRC)/xshm.h xpm-ximage.o: ../../config.h glplanet.o: $(HACK_SRC)/xlockmore.h glplanet.o: ../../config.h @@ -583,6 +650,7 @@ glplanet.o: $(UTILS_SRC)/colors.h glplanet.o: $(UTILS_SRC)/grabscreen.h glplanet.o: $(UTILS_SRC)/visual.h glplanet.o: $(UTILS_SRC)/xshm.h +glplanet.o: $(srcdir)/sphere.h glplanet.o: $(HACK_SRC)/images/earth.xbm glplanet.o: $(srcdir)/xpm-ximage.h pulsar.o: $(HACK_SRC)/xlockmore.h @@ -640,4 +708,98 @@ gflux.o: $(UTILS_SRC)/colors.h gflux.o: $(UTILS_SRC)/grabscreen.h gflux.o: $(UTILS_SRC)/visual.h gflux.o: $(UTILS_SRC)/xshm.h +stonerview.o: ../../config.h +stonerview.o: $(UTILS_SRC)/yarandom.h +stonerview.o: $(srcdir)/stonerview-move.h +stonerview-move.o: ../../config.h +stonerview-move.o: $(UTILS_SRC)/yarandom.h +stonerview-move.o: $(srcdir)/stonerview-osc.h +stonerview-move.o: $(srcdir)/stonerview-move.h +stonerview-osc.o: ../../config.h +stonerview-osc.o: $(UTILS_SRC)/yarandom.h +stonerview-osc.o: $(srcdir)/stonerview-osc.h +stonerview-view.o: ../../config.h +stonerview-view.o: $(UTILS_SRC)/vroot.h +stonerview-view.o: $(UTILS_SRC)/version.h +stonerview-view.o: $(UTILS_SRC)/yarandom.h +stonerview-view.o: $(srcdir)/stonerview-osc.h +stonerview-view.o: $(srcdir)/stonerview-move.h +starwars.o: $(HACK_SRC)/xlockmore.h +starwars.o: ../../config.h +starwars.o: $(HACK_SRC)/xlockmoreI.h +starwars.o: $(HACK_SRC)/screenhack.h +starwars.o: $(UTILS_SRC)/yarandom.h +starwars.o: $(UTILS_SRC)/usleep.h +starwars.o: $(UTILS_SRC)/resources.h +starwars.o: $(UTILS_SRC)/hsv.h +starwars.o: $(UTILS_SRC)/colors.h +starwars.o: $(UTILS_SRC)/grabscreen.h +starwars.o: $(UTILS_SRC)/visual.h +starwars.o: $(UTILS_SRC)/xshm.h +starwars.o: $(srcdir)/glutstroke.h +starwars.o: $(srcdir)/glut_roman.h +glut_stroke.o: ../../config.h +glut_stroke.o: $(srcdir)/glutstroke.h +glut_swidth.o: ../../config.h +glut_swidth.o: $(srcdir)/glutstroke.h +gltext.o: $(HACK_SRC)/xlockmore.h +gltext.o: ../../config.h +gltext.o: $(HACK_SRC)/xlockmoreI.h +gltext.o: $(HACK_SRC)/screenhack.h +gltext.o: $(UTILS_SRC)/yarandom.h +gltext.o: $(UTILS_SRC)/usleep.h +gltext.o: $(UTILS_SRC)/resources.h +gltext.o: $(UTILS_SRC)/hsv.h +gltext.o: $(UTILS_SRC)/colors.h +gltext.o: $(UTILS_SRC)/grabscreen.h +gltext.o: $(UTILS_SRC)/visual.h +gltext.o: $(UTILS_SRC)/xshm.h +gltext.o: $(srcdir)/tube.h +gltext.o: $(srcdir)/glutstroke.h +gltext.o: $(srcdir)/glut_roman.h +molecule.o: $(HACK_SRC)/xlockmore.h +molecule.o: ../../config.h +molecule.o: $(HACK_SRC)/xlockmoreI.h +molecule.o: $(HACK_SRC)/screenhack.h +molecule.o: $(UTILS_SRC)/yarandom.h +molecule.o: $(UTILS_SRC)/usleep.h +molecule.o: $(UTILS_SRC)/resources.h +molecule.o: $(UTILS_SRC)/hsv.h +molecule.o: $(UTILS_SRC)/colors.h +molecule.o: $(UTILS_SRC)/grabscreen.h +molecule.o: $(UTILS_SRC)/visual.h +molecule.o: $(UTILS_SRC)/xshm.h +molecule.o: $(srcdir)/sphere.h +molecule.o: $(srcdir)/tube.h +molecule.o: molecules.h +dangerball.o: $(HACK_SRC)/xlockmore.h +dangerball.o: ../../config.h +dangerball.o: $(HACK_SRC)/xlockmoreI.h +dangerball.o: $(HACK_SRC)/screenhack.h +dangerball.o: $(UTILS_SRC)/yarandom.h +dangerball.o: $(UTILS_SRC)/usleep.h +dangerball.o: $(UTILS_SRC)/resources.h +dangerball.o: $(UTILS_SRC)/hsv.h +dangerball.o: $(UTILS_SRC)/colors.h +dangerball.o: $(UTILS_SRC)/grabscreen.h +dangerball.o: $(UTILS_SRC)/visual.h +dangerball.o: $(UTILS_SRC)/xshm.h +dangerball.o: $(srcdir)/sphere.h +dangerball.o: $(srcdir)/tube.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