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)
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 \
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 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
+ 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 \
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 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
+ 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 $(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 \
- stonerview-move.h stonerview-osc.h glutstroke.h glut_roman.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@
$(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:
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)
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)
starwars: $(SW_OBJS) $(HACK_OBJS)
$(CC_HACK) -o $@ $(SW_OBJS) $(HACK_OBJS) $(HACK_LIBS)
-GLT_OBJS=gltext.o glut_stroke.o glut_swidth.o
+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 $(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.)
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" | \
+ $(SHELL) $(UTILS_SRC)/ad2c "$$f" | \
sed 's/",$$/\\n"/' >> $$tmp ; \
echo ',' >> $$tmp ; \
done ; \
mv $$tmp molecules.h
-molecule: molecule.o $(HACK_OBJS)
- $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(HACK_LIBS)
+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)
##############################################################################
#
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
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
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
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: $(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: $(UTILS_SRC)/grabscreen.h
dangerball.o: $(UTILS_SRC)/visual.h
dangerball.o: $(UTILS_SRC)/xshm.h
-dangerball.o: $(srcdir)/glutstroke.h
-dangerball.o: $(srcdir)/glut_roman.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
projects / xscreensaver / blobdiff