X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2FMakefile.in;h=8c1bae01774cf128213e4e8f6ef831e60d84793d;hb=c596d1306f5f92f7eab76224d3b049980a14adcb;hp=16b8bd68e6b661a5d09e440e08b6a2a46de60dab;hpb=f54438ea00f152166e68073e98000fd3a00f65cd;p=xscreensaver

diff --git a/hacks/glx/Makefile.in b/hacks/glx/Makefile.in
index 16b8bd68..8c1bae01 100644
--- 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,53 @@ 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
+		  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
 
 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
+		  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
 
 GL_EXES		= cage gears moebius pipes sproingies stairs superquadrics \
-		  morph3d rubik atlantis lament bubble3d glplanet
-EXES		= @GL_EXES@
+		  morph3d rubik atlantis lament bubble3d glplanet pulsar
+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 +196,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,6 +264,15 @@ 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)
+	$(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)
+
 
 ##############################################################################
 #
@@ -505,4 +529,28 @@ glplanet.o: $(UTILS_SRC)/visual.h
 glplanet.o: $(UTILS_SRC)/xshm.h
 glplanet.o: $(HACK_SRC)/images/earth.xbm
 glplanet.o: $(srcdir)/xpm-ximage.h
+pulsar.o: $(HACK_SRC)/xlockmore.h
+pulsar.o: ../../config.h
+pulsar.o: $(HACK_SRC)/xlockmoreI.h
+pulsar.o: $(HACK_SRC)/screenhack.h
+pulsar.o: $(UTILS_SRC)/yarandom.h
+pulsar.o: $(UTILS_SRC)/usleep.h
+pulsar.o: $(UTILS_SRC)/resources.h
+pulsar.o: $(UTILS_SRC)/hsv.h
+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