X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2FMakefile.in;h=a65a6742bb40b2b1fa3de4d9ee5f77288d7ffd1c;hb=96bdd7cf6ea60c418a76921acaf0e34d6f5be930;hp=25ddc2ca98a8af4e60bc32949845428746d63b32;hpb=723c9eeee862766a1534b2ce17b78adbfac1c3be;p=xscreensaver diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in index 25ddc2ca..a65a6742 100644 --- a/hacks/glx/Makefile.in +++ b/hacks/glx/Makefile.in @@ -14,7 +14,11 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ mandir = @mandir@ -man1dir = $(mandir)/man1 +# maybe this should be 6 (games)? +mansuffix = 1 +manNdir = $(mandir)/man$(mansuffix) + +# maybe this should be 6 (games)? mansuffix = 1 CC = @CC@ @@ -81,7 +85,15 @@ SRCS = xscreensaver-gl-helper.c \ menger.c engine.c flipscreen3d.c font-ximage.c \ grab-ximage.c glsnake.c boxed.c glforestfire.c sballs.c \ cubenetic.c spheremonics.c marching.c lavalite.c rotator.c \ - trackball.c gltrackball.c queens.c endgame.c chessmodels.c + trackball.c gltrackball.c queens.c endgame.c chessmodels.c \ + glblur.c gllist.c flurry.c flurry-smoke.c flurry-spark.c \ + flurry-star.c flurry-texture.c atunnel.c tunnel_draw.c \ + flyingtoasters.c toaster.c toaster_base.c toaster_handle.c \ + toaster_handle2.c toaster_jet.c toaster_knob.c \ + toaster_slots.c toaster_wing.c toast.c toast2.c \ + bouncingcow.c cow_face.c cow_hide.c cow_hoofs.c cow_horns.c \ + cow_tail.c cow_udder.c glslideshow.c jigglypuff.c klein.c \ + hypertorus.c glmatrix.c cubestorm.c glknots.c blocktube.c OBJS = xscreensaver-gl-helper.o \ atlantis.o b_draw.o b_lockglue.o b_sphere.o bubble3d.o \ @@ -99,14 +111,24 @@ OBJS = xscreensaver-gl-helper.o \ menger.o engine.o flipscreen3d.o font-ximage.o \ grab-ximage.o glsnake.o boxed.o glforestfire.o sballs.o \ cubenetic.o spheremonics.o marching.o lavalite.o rotator.o \ - trackball.o gltrackball.o queens.o endgame.o chessmodels.o + trackball.o gltrackball.o queens.o endgame.o chessmodels.o \ + glblur.o gllist.o flurry.o flurry-smoke.o flurry-spark.o \ + flurry-star.o flurry-texture.o atunnel.o tunnel_draw.o \ + flyingtoasters.o toaster.o toaster_base.o toaster_handle.o \ + toaster_handle2.o toaster_jet.o toaster_knob.o \ + toaster_slots.o toaster_wing.o toast.o toast2.o \ + bouncingcow.o cow_face.o cow_hide.o cow_hoofs.o cow_horns.o \ + cow_tail.o cow_udder.o glslideshow.o jigglypuff.o klein.o \ + hypertorus.o glmatrix.o cubestorm.o glknots.o blocktube.o GL_EXES = cage gears moebius pipes sproingies stairs superquadrics \ morph3d rubik atlantis lament bubble3d glplanet pulsar \ sierpinski3d gflux stonerview starwars gltext molecule \ dangerball circuit menger engine flipscreen3d glsnake boxed \ glforestfire sballs cubenetic spheremonics lavalite queens \ - endgame + endgame glblur flurry atunnel flyingtoasters bouncingcow \ + glslideshow jigglypuff klein hypertorus glmatrix cubestorm \ + glknots blocktube GLE_EXES = extrusion GL_UTIL_EXES = xscreensaver-gl-helper HACK_EXES = @GL_EXES@ @GLE_EXES@ @@ -123,7 +145,7 @@ HDRS = atlantis.h bubble3d.h buildlwo.h e_textures.h xpm-ximage.h \ grab-ximage.h font-ximage.h tube.h sphere.h boxed.h \ stonerview-move.h stonerview-osc.h glutstroke.h \ glut_roman.h marching.h rotator.h trackball.h gltrackball.h \ - chessmodels.h + chessmodels.h chessgames.h gllist.h flurry.h tunnel_draw.h GL_MEN = atlantis.man boxed.man bubble3d.man cage.man circuit.man \ cubenetic.man dangerball.man engine.man extrusion.man \ flipscreen3d.man gears.man gflux.man glforestfire.man \ @@ -132,9 +154,12 @@ GL_MEN = atlantis.man boxed.man bubble3d.man cage.man circuit.man \ pulsar.man queens.man rubik.man sballs.man sierpinski3d.man \ spheremonics.man sproingies.man stairs.man starwars.man \ stonerview.man superquadrics.man xscreensaver-gl-helper.man \ - endgame.man + endgame.man flurry.man glblur.man atunnel.man \ + flyingtoasters.man bouncingcow.man glslideshow.man \ + jigglypuff.man klein.man hypertorus.man glmatrix.man \ + cubestorm.man glknots.man blocktube.man MEN = @GL_MEN@ -EXTRAS = README Makefile.in +EXTRAS = README Makefile.in dxf2gl.pl TARFILES = $(SRCS) $(HDRS) $(MEN) $(EXTRAS) @@ -178,7 +203,7 @@ install-program:: $(EXES) install-man: $(MEN) @men="$(MEN)" ; \ - idir="$(install_prefix)$(man1dir)" ; \ + idir="$(install_prefix)$(manNdir)" ; \ if [ ! -d $$idir ]; then \ $(INSTALL_DIRS) $$idir ; \ fi ; \ @@ -208,7 +233,7 @@ uninstall-program:: uninstall-man: @men="$(MEN)" ; \ - idir="$(install_prefix)$(man1dir)" ; \ + idir="$(install_prefix)$(manNdir)" ; \ for man in $$men; do \ instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ; \ echo rm -f $$idir/$$instname ; \ @@ -351,9 +376,19 @@ 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) +ATUNNEL_OBJS = $(HACK_OBJS) tunnel_draw.o xpm-ximage.o +atunnel: atunnel.o $(ATUNNEL_OBJS) + $(CC_HACK) -o $@ $@.o $(ATUNNEL_OBJS) $(HACK_LIBS) $(XPM_LIBS) + cage: cage.o $(HACK_OBJS) $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(HACK_LIBS) +FLURRY_OBJS_1 = flurry-smoke.o flurry-spark.o flurry-star.o flurry-texture.o +FLURRY_OBJS = $(FLURRY_OBJS_1) $(HACK_OBJS) + +flurry: flurry.o $(FLURRY_OBJS) + $(CC_HACK) -o $@ $@.o $(FLURRY_OBJS) $(HACK_LIBS) -lm + gears: gears.o $(HACK_OBJS) $(TRACK_OBJS) $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(TRACK_OBJS) $(HACK_LIBS) @@ -376,7 +411,7 @@ rubik: rubik.o $(HACK_OBJS) stairs: stairs.o $(HACK_OBJS) $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(HACK_LIBS) -SPROINGIES = sproingiewrap.o buildlwo.o \ +SPROINGIES = sproingiewrap.o gllist.o \ s1_1.o s1_2.o s1_3.o s1_4.o s1_5.o s1_6.o s1_b.o sproingies: sproingies.o $(HACK_OBJS) $(SPROINGIES) $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(SPROINGIES) $(HACK_LIBS) @@ -404,8 +439,8 @@ extrusion: $(EXTRUSION_OBJS) $(HACK_OBJS) sierpinski3d: sierpinski3d.o $(HACK_OBJS) $(TRACK_OBJS) $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(TRACK_OBJS) $(HACK_LIBS) -gflux: gflux.o $(HACK_OBJS) $(GRAB_OBJS) - $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(GRAB_OBJS) $(HACK_LIBS) +gflux: gflux.o $(HACK_OBJS) $(TRACK_OBJS) $(GRAB_OBJS) + $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(TRACK_OBJS) $(GRAB_OBJS) $(HACK_LIBS) SW_OBJS=starwars.o glut_stroke.o glut_swidth.o starwars: $(SW_OBJS) $(HACK_OBJS) @@ -425,11 +460,11 @@ circuit: circuit.o $(HACK_OBJS) font-ximage.o menger: menger.o $(HACK_OBJS) $(TRACK_OBJS) $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(TRACK_OBJS) $(HACK_LIBS) -engine: engine.o $(HACK_OBJS) - $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(HACK_LIBS) +engine: engine.o $(HACK_OBJS) $(TRACK_OBJS) + $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(TRACK_OBJS) $(HACK_LIBS) -flipscreen3d: flipscreen3d.o $(HACK_OBJS) $(GRAB_OBJS) - $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(GRAB_OBJS) $(HACK_LIBS) +flipscreen3d: flipscreen3d.o $(HACK_OBJS) $(GRAB_OBJS) $(TRACK_OBJS) + $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(GRAB_OBJS) $(TRACK_OBJS) $(HACK_LIBS) glsnake: glsnake.o $(HACK_OBJS) $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(HACK_LIBS) @@ -460,6 +495,47 @@ CHESSOBJS=chessmodels.o $(TRACK_OBJS) $(HACK_OBJS) endgame: endgame.o $(CHESSOBJS) $(CC_HACK) -o $@ $@.o $(CHESSOBJS) $(HACK_LIBS) +glblur: glblur.o $(HACK_OBJS) $(TRACK_OBJS) + $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(TRACK_OBJS) $(HACK_LIBS) + +TOASTOBJS1=\ + toaster.o toaster_base.o toaster_handle.o toaster_handle2.o \ + toaster_jet.o toaster_knob.o toaster_slots.o toaster_wing.o \ + toast.o toast2.o +TOASTOBJS=flyingtoasters.o gllist.o $(TOASTOBJS1) xpm-ximage.o +flyingtoasters: $(TOASTOBJS) $(TRACK_OBJS) $(HACK_OBJS) + $(CC_HACK) -o $@ $(TOASTOBJS) $(TRACK_OBJS) $(HACK_OBJS) $(XPM_LIBS) + +COWOBJS1=\ + cow_face.o cow_hide.o cow_hoofs.o cow_horns.o cow_tail.o cow_udder.o +COWOBJS=bouncingcow.o gllist.o $(COWOBJS1) xpm-ximage.o +bouncingcow: $(COWOBJS) $(TRACK_OBJS) $(HACK_OBJS) + $(CC_HACK) -o $@ $(COWOBJS) $(TRACK_OBJS) $(HACK_OBJS) $(XPM_LIBS) + +glslideshow: glslideshow.o $(HACK_OBJS) $(GRAB_OBJS) + $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(GRAB_OBJS) $(HACK_LIBS) + +jigglypuff: jigglypuff.o xpm-ximage.o $(HACK_OBJS) $(TRACK_OBJS) + $(CC_HACK) -o $@ $@.o xpm-ximage.o $(HACK_OBJS) $(TRACK_OBJS) $(XPM_LIBS) + +klein: klein.o $(HACK_OBJS) $(TRACK_OBJS) + $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(TRACK_OBJS) $(HACK_LIBS) + +hypertorus: hypertorus.o $(HACK_OBJS) + $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(HACK_LIBS) + +glmatrix: glmatrix.o $(HACK_OBJS) xpm-ximage.o + $(CC_HACK) -o $@ $@.o $(HACK_OBJS) xpm-ximage.o $(XPM_LIBS) + +cubestorm: cubestorm.o $(TRACK_OBJS) $(HACK_OBJS) + $(CC_HACK) -o $@ $@.o $(TRACK_OBJS) $(HACK_OBJS) $(HACK_LIBS) + +glknots: glknots.o tube.o $(TRACK_OBJS) $(HACK_OBJS) + $(CC_HACK) -o $@ $@.o tube.o $(TRACK_OBJS) $(HACK_OBJS) $(HACK_LIBS) + +blocktube: blocktube.o $(HACK_OBJS) xpm-ximage.o + $(CC_HACK) -o $@ $@.o $(HACK_OBJS) xpm-ximage.o $(HACK_LIBS) $(XPM_LIBS) + # This one works differently (it's not xlock-like.) # STONER_OBJS=stonerview.o stonerview-move.o stonerview-osc.o stonerview-view.o \ @@ -493,10 +569,24 @@ atlantis.o: $(srcdir)/atlantis.h atlantis.o: ../../config.h atlantis.o: $(HACK_SRC)/images/sea-texture.xpm atlantis.o: $(srcdir)/xpm-ximage.h +atunnel.o: ../../config.h +atunnel.o: $(HACK_SRC)/images/tunnel0.xpm +atunnel.o: $(HACK_SRC)/images/tunnel1.xpm +atunnel.o: $(HACK_SRC)/images/tunnel2.xpm +atunnel.o: $(srcdir)/tunnel_draw.h +atunnel.o: $(srcdir)/xpm-ximage.h b_draw.o: $(srcdir)/bubble3d.h b_draw.o: ../../config.h b_lockglue.o: $(srcdir)/bubble3d.h b_lockglue.o: ../../config.h +blocktube.o: ../../config.h +blocktube.o: $(HACK_SRC)/images/blocktube.xpm +blocktube.o: $(srcdir)/xpm-ximage.h +bouncingcow.o: ../../config.h +bouncingcow.o: $(srcdir)/gllist.h +bouncingcow.o: $(srcdir)/gltrackball.h +bouncingcow.o: $(srcdir)/rotator.h +bouncingcow.o: $(srcdir)/xpm-ximage.h boxed.o: $(srcdir)/boxed.h boxed.o: ../../config.h b_sphere.o: $(srcdir)/bubble3d.h @@ -509,19 +599,31 @@ cage.o: $(srcdir)/e_textures.h chessmodels.o: $(srcdir)/chessmodels.h circuit.o: ../../config.h circuit.o: $(srcdir)/font-ximage.h +cow_face.o: $(srcdir)/gllist.h +cow_hide.o: $(srcdir)/gllist.h +cow_hoofs.o: $(srcdir)/gllist.h +cow_horns.o: $(srcdir)/gllist.h +cow_tail.o: $(srcdir)/gllist.h +cow_udder.o: $(srcdir)/gllist.h cubenetic.o: ../../config.h cubenetic.o: $(srcdir)/gltrackball.h cubenetic.o: $(srcdir)/rotator.h +cubestorm.o: ../../config.h +cubestorm.o: $(srcdir)/gltrackball.h +cubestorm.o: $(srcdir)/rotator.h dangerball.o: ../../config.h dangerball.o: $(srcdir)/gltrackball.h dangerball.o: $(srcdir)/rotator.h dangerball.o: $(srcdir)/sphere.h dangerball.o: $(srcdir)/tube.h dolphin.o: $(srcdir)/atlantis.h +endgame.o: $(srcdir)/chessgames.h endgame.o: $(srcdir)/chessmodels.h endgame.o: ../../config.h endgame.o: $(srcdir)/gltrackball.h engine.o: ../../config.h +engine.o: $(srcdir)/gltrackball.h +engine.o: $(srcdir)/rotator.h extrusion-helix2.o: ../../config.h extrusion-helix3.o: ../../config.h extrusion-helix4.o: ../../config.h @@ -533,24 +635,62 @@ extrusion-screw.o: ../../config.h extrusion-taper.o: ../../config.h extrusion-twistoid.o: ../../config.h flipscreen3d.o: ../../config.h +flipscreen3d.o: $(srcdir)/gltrackball.h flipscreen3d.o: $(srcdir)/grab-ximage.h +flurry.o: ../../config.h +flurry.o: $(srcdir)/flurry.h +flurry.o: $(srcdir)/gltrackball.h +flurry.o: $(srcdir)/rotator.h +flurry-smoke.o: $(srcdir)/flurry.h +flurry-smoke.o: $(srcdir)/gltrackball.h +flurry-smoke.o: $(srcdir)/rotator.h +flurry-spark.o: $(srcdir)/flurry.h +flurry-spark.o: $(srcdir)/gltrackball.h +flurry-spark.o: $(srcdir)/rotator.h +flurry-star.o: $(srcdir)/flurry.h +flurry-star.o: $(srcdir)/gltrackball.h +flurry-star.o: $(srcdir)/rotator.h +flurry-texture.o: $(srcdir)/flurry.h +flurry-texture.o: $(srcdir)/gltrackball.h +flurry-texture.o: $(srcdir)/rotator.h +flyingtoasters.o: ../../config.h +flyingtoasters.o: $(srcdir)/gllist.h +flyingtoasters.o: $(srcdir)/gltrackball.h +flyingtoasters.o: $(HACK_SRC)/images/chromesphere.xpm +flyingtoasters.o: $(HACK_SRC)/images/toast.xpm +flyingtoasters.o: $(srcdir)/xpm-ximage.h font-ximage.o: ../../config.h fps.o: ../../config.h gears.o: ../../config.h gears.o: $(srcdir)/gltrackball.h gears.o: $(srcdir)/rotator.h gflux.o: ../../config.h +gflux.o: $(srcdir)/gltrackball.h gflux.o: $(srcdir)/grab-ximage.h +glblur.o: ../../config.h +glblur.o: $(srcdir)/gltrackball.h +glblur.o: $(srcdir)/rotator.h glforestfire.o: ../../config.h glforestfire.o: $(HACK_SRC)/images/ground.xpm glforestfire.o: $(HACK_SRC)/images/tree.xpm glforestfire.o: $(srcdir)/xpm-ximage.h +glknots.o: ../../config.h +glknots.o: $(srcdir)/gltrackball.h +glknots.o: $(srcdir)/rotator.h +glknots.o: $(srcdir)/tube.h +gllist.o: $(srcdir)/gllist.h +glmatrix.o: ../../config.h +glmatrix.o: $(srcdir)/gllist.h +glmatrix.o: $(HACK_SRC)/images/matrix3.xpm +glmatrix.o: $(srcdir)/xpm-ximage.h glplanet.o: ../../config.h glplanet.o: $(srcdir)/gltrackball.h glplanet.o: $(HACK_SRC)/images/earth.xpm glplanet.o: $(srcdir)/rotator.h glplanet.o: $(srcdir)/sphere.h glplanet.o: $(srcdir)/xpm-ximage.h +glslideshow.o: ../../config.h +glslideshow.o: $(srcdir)/grab-ximage.h glsnake.o: ../../config.h gltext.o: ../../config.h gltext.o: $(srcdir)/gltrackball.h @@ -566,6 +706,14 @@ glut_stroke.o: $(srcdir)/glutstroke.h glut_swidth.o: ../../config.h glut_swidth.o: $(srcdir)/glutstroke.h grab-ximage.o: ../../config.h +hypertorus.o: ../../config.h +jigglypuff.o: ../../config.h +jigglypuff.o: $(srcdir)/gltrackball.h +jigglypuff.o: $(HACK_SRC)/images/jigglymap.xpm +jigglypuff.o: $(srcdir)/xpm-ximage.h +klein.o: ../../config.h +klein.o: $(srcdir)/gltrackball.h +klein.o: $(srcdir)/rotator.h lament.o: ../../config.h lament.o: $(srcdir)/gltrackball.h lament.o: $(HACK_SRC)/images/lament.xpm @@ -602,13 +750,13 @@ queens.o: $(srcdir)/gltrackball.h rotator.o: ../../config.h rotator.o: $(srcdir)/rotator.h rubik.o: ../../config.h -s1_1.o: $(srcdir)/buildlwo.h -s1_2.o: $(srcdir)/buildlwo.h -s1_3.o: $(srcdir)/buildlwo.h -s1_4.o: $(srcdir)/buildlwo.h -s1_5.o: $(srcdir)/buildlwo.h -s1_6.o: $(srcdir)/buildlwo.h -s1_b.o: $(srcdir)/buildlwo.h +s1_1.o: $(srcdir)/gllist.h +s1_2.o: $(srcdir)/gllist.h +s1_3.o: $(srcdir)/gllist.h +s1_4.o: $(srcdir)/gllist.h +s1_5.o: $(srcdir)/gllist.h +s1_6.o: $(srcdir)/gllist.h +s1_b.o: $(srcdir)/gllist.h sballs.o: ../../config.h sballs.o: $(HACK_SRC)/images/sball-bg.xpm sballs.o: $(HACK_SRC)/images/sball.xpm @@ -621,8 +769,8 @@ spheremonics.o: ../../config.h spheremonics.o: $(srcdir)/gltrackball.h spheremonics.o: $(srcdir)/rotator.h sphere.o: ../../config.h -sproingies.o: $(srcdir)/buildlwo.h sproingies.o: ../../config.h +sproingies.o: $(srcdir)/gllist.h sproingiewrap.o: ../../config.h stairs.o: ../../config.h stairs.o: $(srcdir)/e_textures.h @@ -642,10 +790,22 @@ stonerview-view.o: $(srcdir)/stonerview-osc.h superquadrics.o: ../../config.h swim.o: $(srcdir)/atlantis.h swim.o: ../../config.h +toast2.o: $(srcdir)/gllist.h +toaster_base.o: $(srcdir)/gllist.h +toaster_handle2.o: $(srcdir)/gllist.h +toaster_handle.o: $(srcdir)/gllist.h +toaster_jet.o: $(srcdir)/gllist.h +toaster_knob.o: $(srcdir)/gllist.h +toaster.o: $(srcdir)/gllist.h +toaster_slots.o: $(srcdir)/gllist.h +toaster_wing.o: $(srcdir)/gllist.h +toast.o: $(srcdir)/gllist.h trackball.o: ../../config.h trackball.o: $(srcdir)/trackball.h tube.o: ../../config.h tube.o: $(srcdir)/tube.h +tunnel_draw.o: ../../config.h +tunnel_draw.o: $(srcdir)/tunnel_draw.h whale.o: $(srcdir)/atlantis.h xlock-gl.o: ../../config.h xpm-ximage.o: ../../config.h