http://ftp.x.org/contrib/applications/xscreensaver-3.20.tar.gz

[xscreensaver] / hacks / glx / Makefile.in

diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in
index cd0820023cb153ee4248f19676f85024ae864c92..f50e987d174dec002e059b7871228469aaa58b41 100644 (file)
--- a/hacks/glx/Makefile.in
+++ b/hacks/glx/Makefile.in
@@ -42,8 +42,10 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
 #
 HACK_PRE       = $(LIBS) $(X_LIBS)
 HACK_POST      = $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) -lm
-HACK_LIBS      = $(HACK_PRE)            @GL_LIBS@ @HACK_LIBS@ $(HACK_POST)
-XPM_LIBS       = $(HACK_PRE) @XPM_LIBS@ @GL_LIBS@ @HACK_LIBS@ $(HACK_POST)
+HACK_POST2     = @GL_LIBS@ @HACK_LIBS@ $(HACK_POST)
+HACK_LIBS      = $(HACK_PRE)                       $(HACK_POST2)
+XPM_LIBS       = $(HACK_PRE)            @XPM_LIBS@ $(HACK_POST2)
+GLE_LIBS       = $(HACK_PRE) @GLE_LIBS@ @XPM_LIBS@ $(HACK_POST2)
 
 HACK_SRC       = $(srcdir)/..
 HACK_BIN       = ..
@@ -54,41 +56,54 @@ INCLUDES    = -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 \
-                 $(UTILS_SRC)/visual.c $(UTILS_SRC)/yarandom.c
+                 $(UTILS_SRC)/visual.c $(UTILS_SRC)/visual-gl.c \
+                 $(UTILS_SRC)/yarandom.c
 UTIL_OBJS      = $(UTILS_SRC)/colors.o $(UTILS_SRC)/hsv.o \
                  $(UTILS_SRC)/resources.o $(UTILS_SRC)/usleep.o \
-                 $(UTILS_SRC)/visual.o $(UTILS_SRC)/yarandom.o
+                 $(UTILS_SRC)/visual.o $(UTILS_SRC)/visual-gl.o \
+                  $(UTILS_SRC)/yarandom.o
 
 SRCS           = atlantis.c b_draw.c b_lockglue.c b_sphere.c bubble3d.c \
                  buildlwo.c cage.c dolphin.c gears.c lament.c moebius.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 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
 
 OBJS           = atlantis.o b_draw.o b_lockglue.o b_sphere.o bubble3d.o \
                  buildlwo.o cage.o dolphin.o gears.o lament.o moebius.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 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
 
 GL_EXES                = cage gears moebius pipes sproingies stairs superquadrics \
-                 morph3d rubik atlantis lament bubble3d glplanet pulsar
-EXES           = @GL_EXES@
+                 morph3d rubik atlantis lament bubble3d glplanet pulsar \
+                 sierpinski3d
+GLE_EXES       = extrusion
+EXES           = @GL_EXES@ @GLE_EXES@
 
 HACK_OBJS      = screenhack-gl.o xlock-gl.o $(HACK_BIN)/xlockmore.o \
                  $(UTILS_BIN)/resources.o $(UTILS_BIN)/visual.o \
-                 $(UTILS_BIN)/usleep.o $(UTILS_BIN)/yarandom.o \
-                 $(UTILS_BIN)/hsv.o $(UTILS_BIN)/colors.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
-MEN            = lament.man
+GL_MEN         = lament.man
+MEN            = @GL_MEN@
 EXTRAS         = README Makefile.in
 
 TARFILES       = $(SRCS) $(HDRS) $(MEN) $(EXTRAS)
 
 
+default: all
 all: $(EXES)
 
 install:   install-program   install-man
@@ -182,6 +197,7 @@ $(UTILS_BIN)/hsv.o:         $(UTILS_SRC)/hsv.c
 $(UTILS_BIN)/resources.o:      $(UTILS_SRC)/resources.c
 $(UTILS_BIN)/usleep.o:         $(UTILS_SRC)/usleep.c
 $(UTILS_BIN)/visual.o:         $(UTILS_SRC)/visual.c
+$(UTILS_BIN)/visual-gl.o:      $(UTILS_SRC)/visual-gl.c
 $(UTILS_BIN)/yarandom.o:       $(UTILS_SRC)/yarandom.c
 
 $(UTIL_OBJS):
@@ -249,7 +265,16 @@ bubble3d:  bubble3d.o      $(HACK_OBJS) $(B3D)
 glplanet:      glplanet.o      $(HACK_OBJS) xpm-ximage.o
        $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) xpm-ximage.o $(XPM_LIBS)
 
-pulsar:                pulsar.o                $(HACK_OBJS)
+pulsar:                pulsar.o        $(HACK_OBJS)
+       $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(HACK_LIBS)
+
+EXTRUSION_OBJS=extrusion.o extrusion-helix2.o extrusion-helix3.o    \
+       extrusion-helix4.o extrusion-joinoffset.o extrusion-screw.o \
+       extrusion-taper.o extrusion-twistoid.o
+extrusion:     $(EXTRUSION_OBJS) $(HACK_OBJS)
+       $(CC_HACK) -o $@ $(EXTRUSION_OBJS) $(HACK_OBJS) $(GLE_LIBS)
+
+sierpinski3d:  sierpinski3d.o  $(HACK_OBJS)
        $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(HACK_LIBS)
 
 
@@ -520,4 +545,28 @@ pulsar.o: $(UTILS_SRC)/colors.h
 pulsar.o: $(UTILS_SRC)/grabscreen.h
 pulsar.o: $(UTILS_SRC)/visual.h
 pulsar.o: $(UTILS_SRC)/xshm.h
+extrusion.o: $(HACK_SRC)/xlockmore.h
+extrusion.o: ../../config.h
+extrusion.o: $(HACK_SRC)/xlockmoreI.h
+extrusion.o: $(HACK_SRC)/screenhack.h
+extrusion.o: $(UTILS_SRC)/yarandom.h
+extrusion.o: $(UTILS_SRC)/usleep.h
+extrusion.o: $(UTILS_SRC)/resources.h
+extrusion.o: $(UTILS_SRC)/hsv.h
+extrusion.o: $(UTILS_SRC)/colors.h
+extrusion.o: $(UTILS_SRC)/grabscreen.h
+extrusion.o: $(UTILS_SRC)/visual.h
+extrusion.o: $(UTILS_SRC)/xshm.h
+sierpinski3d.o: $(HACK_SRC)/xlockmore.h
+sierpinski3d.o: ../../config.h
+sierpinski3d.o: $(HACK_SRC)/xlockmoreI.h
+sierpinski3d.o: $(HACK_SRC)/screenhack.h
+sierpinski3d.o: $(UTILS_SRC)/yarandom.h
+sierpinski3d.o: $(UTILS_SRC)/usleep.h
+sierpinski3d.o: $(UTILS_SRC)/resources.h
+sierpinski3d.o: $(UTILS_SRC)/hsv.h
+sierpinski3d.o: $(UTILS_SRC)/colors.h
+sierpinski3d.o: $(UTILS_SRC)/grabscreen.h
+sierpinski3d.o: $(UTILS_SRC)/visual.h
+sierpinski3d.o: $(UTILS_SRC)/xshm.h