projects / xscreensaver / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
http://packetstormsecurity.org/UNIX/admin/xscreensaver-4.00.tar.gz
[xscreensaver] / hacks / Makefile.in
diff --git a/hacks/Makefile.in b/hacks/Makefile.in
index e0586ed011604726701a634d002bc8e37e6144d4..69d0fe432191b43c00bcefb720df0c21f8e817c9 100644 (file)
--- a/hacks/Makefile.in
+++ b/hacks/Makefile.in
@@ -35,7 +35,9 @@ INSTALL_SCRIPT  = @INSTALL_SCRIPT@
 INSTALL_SETUID  = @INSTALL_SETUID@
 INSTALL_DATA   = @INSTALL_DATA@
 INSTALL_DIRS   = @INSTALL_DIRS@
+GNOME_DATADIR  = @GNOME_DATADIR@
 HACKDIR                = @HACKDIR@
+HACK_CONF_DIR  = @HACK_CONF_DIR@
 
 X_CFLAGS       = @X_CFLAGS@
 X_LIBS         = @X_LIBS@
@@ -89,7 +91,7 @@ SRCS          = attraction.c blitspin.c bouboule.c braid.c bubbles.c \
                  phosphor.c xmatrix.c petri.c shadebobs.c xsublim.c ccurve.c \
                  blaster.c bumps.c ripples.c xteevee.c xspirograph.c \
                  nerverot.c xrayswarm.c hyperball.c zoom.c whirlwindwarp.c \
-                 rotzoomer.c
+                 rotzoomer.c whirlygig.c speedmine.c vermiculate.c
 SCRIPTS                = vidwhacker webcollage
 
 OBJS           = attraction.o blitspin.o bouboule.o braid.o bubbles.o \
@@ -110,7 +112,7 @@ OBJS                = attraction.o blitspin.o bouboule.o braid.o bubbles.o \
                  phosphor.o xmatrix.o petri.o shadebobs.o xsublim.o ccurve.o \
                  blaster.o bumps.o ripples.o xteevee.o xspirograph.o \
                  nerverot.o xrayswarm.o hyperball.o zoom.o whirlwindwarp.o \
-                 rotzoomer.o
+                 rotzoomer.o whirlygig.o speedmine.o vermiculate.o
 
 NEXES          = attraction blitspin bouboule braid bubbles decayscreen deco \
                  drift flag flame forest vines galaxy grav greynetic halo \
@@ -124,7 +126,8 @@ NEXES               = attraction blitspin bouboule braid bubbles decayscreen deco \
                  demon loop t3d penetrate deluxe compass squiral xflame \
                  wander spotlight critical phosphor xmatrix petri shadebobs \
                  xsublim ccurve blaster bumps ripples xteevee xspirograph \
-                 nerverot xrayswarm hyperball zoom whirlwindwarp rotzoomer
+                 nerverot xrayswarm hyperball zoom whirlwindwarp rotzoomer \
+                 whirlygig speedmine vermiculate
 SEXES          = sonar
 EXES           = $(NEXES) $(SEXES)
 
@@ -154,9 +157,11 @@ MEN                = attraction.man blitspin.man bouboule.man braid.man \
                  vidwhacker.man webcollage.man xsublim.man distort.man \
                  phosphor.man xmatrix.man xteevee.man xflame.man petri.man \
                  nerverot.man zoom.man whirlwindwarp.man hyperball.man \
-                 rotzoomer.man
+                 rotzoomer.man whirlygig.man speedmine.man penetrate.man
 STAR           = *
 EXTRAS         = README Makefile.in xlock_23.h .gdbinit \
+                 config/README \
+                 config/$(STAR).xml \
                  images/$(STAR).xbm \
                  images/$(STAR).xpm \
                  images/bubbles/$(STAR).pov \
@@ -175,8 +180,8 @@ TARFILES    = $(SRCS) $(HDRS) $(SCRIPTS) $(MEN) $(EXTRAS) $(VMSFILES)
 default: all
 all: $(EXES)
 
-install:   install-program   install-scripts install-man
-uninstall: uninstall-program uninstall-man
+install:   install-program   install-scripts install-xml install-man
+uninstall: uninstall-program uninstall-xml uninstall-man
 
 install-strip:
        $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' \
@@ -199,8 +204,23 @@ install-program:: $(EXES)
          sinst="$(INSTALL_PROGRAM)" ;                                  \
        fi ;                                                            \
        for program in $(SEXES); do                                     \
-         echo $$sinst $$program $(install_prefix)$(HACKDIR)/$$program ;\
-              $$sinst $$program $(install_prefix)$(HACKDIR)/$$program ;\
+         instargs="$$program $(install_prefix)$(HACKDIR)/$$program" ;  \
+         echo $$sinst $$instargs ;                                     \
+         if   $$sinst $$instargs ; then                                \
+             true ;                                                    \
+         elif [ @SETUID_HACKS@ = yes ]; then                           \
+           echo $(INSTALL_PROGRAM) $$instargs ;                        \
+           if   $(INSTALL_PROGRAM) $$instargs ; then                   \
+             echo "" ;                                                 \
+             echo "WARNING: unable to install $$program setuid:"       \
+                  "installed non-setuid instead." ;                    \
+             echo "" ;                                                 \
+           else                                                        \
+             exit 1 ;                                                  \
+           fi ;                                                        \
+         else                                                          \
+           exit 1 ;                                                    \
+         fi ;                                                          \
        done
 
 install-scripts: $(SCRIPTS) munge-scripts
@@ -219,6 +239,7 @@ install-scripts: $(SCRIPTS) munge-scripts
 munge-scripts: $(SCRIPTS)
        @tmp=/tmp/mf.$$$$ ;                                             \
        perl="${PERL}" ;                                                \
+       rm -f $$tmp ;                                                   \
        for program in $(SCRIPTS); do                                   \
          echo "adjusting location of perl in $$program..." ;           \
          sed "s@^\(#!\)\(/[^ ]*/perl[^ ]*\)\(.*\)\$$@\1$$perl\3@"      \
@@ -228,7 +249,8 @@ munge-scripts: $(SCRIPTS)
          else                                                          \
            cat $$tmp > ./$$program ;                                   \
          fi ;                                                          \
-       done
+       done ;                                                          \
+       rm -f $$tmp
 
 install-man: $(MEN)
        @men="$(MEN)" ;                                                 \
@@ -243,6 +265,18 @@ install-man: $(MEN)
            $(install_prefix)$(man1dir)/$$instname ;                    \
        done
 
+install-xml:
+       @if [ ! -d $(install_prefix)$(HACK_CONF_DIR) ]; then            \
+         $(INSTALL_DIRS) $(install_prefix)$(HACK_CONF_DIR) ;           \
+        fi ;                                                           \
+        cd $(srcdir)/config/ ;                                         \
+        for file in README $(STAR).xml ; do                            \
+          echo $(INSTALL_DATA) $$file                                  \
+           $(install_prefix)$(HACK_CONF_DIR)/$$file ;                  \
+         $(INSTALL_DATA) $$file                                        \
+           $(install_prefix)$(HACK_CONF_DIR)/$$file ;                  \
+       done
+
 uninstall-program:
        @for program in $(EXES) $(SCRIPTS); do                          \
          echo rm -f $(install_prefix)$(HACKDIR)/$$program ;            \
@@ -257,6 +291,13 @@ uninstall-man:
          rm -f $(install_prefix)$(man1dir)/$$instname ;                \
        done
 
+uninstall-xml:
+       @cd $(srcdir)/config/ ;                                         \
+        for file in README $(STAR).xml ; do                            \
+         echo rm -f $(install_prefix)$(HACK_CONF_DIR)/$$file ;         \
+         rm -f $(install_prefix)$(HACK_CONF_DIR)/$$file ;              \
+       done
+
 clean:
        -rm -f *.o a.out core $(EXES)
 
@@ -602,6 +643,15 @@ whirlwindwarp:     whirlwindwarp.o $(HACK_OBJS) $(COL)
 rotzoomer:     rotzoomer.o     $(HACK_OBJS) $(GRAB) $(SHM)
        $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(GRAB) $(SHM) $(HACK_LIBS)
 
+whirlygig:     whirlygig.o     $(HACK_OBJS) $(COL)
+       $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(COL) $(HACK_LIBS)
+
+speedmine:     speedmine.o     $(HACK_OBJS) $(COL)
+       $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(COL) $(HACK_LIBS)
+
+vermiculate:   vermiculate.o   $(HACK_OBJS) $(COL)
+       $(CC_HACK) -o $@ $@.o   $(HACK_OBJS) $(COL) $(HACK_LIBS)
+
 
 # The rules for those hacks which follow the `xlockmore' API.
 #
@@ -1055,10 +1105,18 @@ phosphor.o: $(srcdir)/screenhack.h
 phosphor.o: ../config.h
 xmatrix.o: $(srcdir)/screenhack.h
 xmatrix.o: ../config.h
-xmatrix.o: $(srcdir)/images/matrix.xpm
+xmatrix.o: $(srcdir)/images/matrix0.xpm
+xmatrix.o: $(srcdir)/images/matrix1.xpm
 xmatrix.o: $(srcdir)/images/matrix2.xpm
-xmatrix.o: $(srcdir)/images/matrix.xbm
+xmatrix.o: $(srcdir)/images/matrix0b.xpm
+xmatrix.o: $(srcdir)/images/matrix1b.xpm
+xmatrix.o: $(srcdir)/images/matrix2b.xpm
+xmatrix.o: $(srcdir)/images/matrix0.xbm
+xmatrix.o: $(srcdir)/images/matrix1.xbm
 xmatrix.o: $(srcdir)/images/matrix2.xbm
+xmatrix.o: $(srcdir)/images/matrix0b.xbm
+xmatrix.o: $(srcdir)/images/matrix1b.xbm
+xmatrix.o: $(srcdir)/images/matrix2b.xbm
 petri.o: $(srcdir)/screenhack.h
 petri.o: ../config.h
 shadebobs.o: $(srcdir)/screenhack.h
@@ -1088,4 +1146,10 @@ whirlwindwarp.o: $(srcdir)/screenhack.h
 whirlwindwarp.o: ../config.h
 rotzoomer.o: $(srcdir)/screenhack.h
 rotzoomer.o: ../config.h
+whirlygig.o: $(srcdir)/screenhack.h
+whirlygig.o: ../config.h
+speedmine.o: $(srcdir)/screenhack.h
+speedmine.o: ../config.h
+vermiculate.o: $(srcdir)/screenhack.h
+vermiculate.o: ../config.h
 
Archive of old xscreensaver versions (http://www.jwz.org/xscreensaver/)