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

[xscreensaver] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 266f4db116cba152237e967ed11f0da07a04a9de..f1a39486bbb1852b74b0a1e01b1fb0cbd996d014 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in --- xscreensaver, Copyright (c) 1997 Jamie Zawinski.
+# Makefile.in --- xscreensaver, Copyright (c) 1999 Jamie Zawinski.
 # the `../configure' script generates `Makefile' from this file.
 
 @SET_MAKE@
@@ -11,7 +11,7 @@ TARFILES      = README README.VMS README.debugging INSTALL xscreensaver.lsm \
                  configure configure.in Makefile.in config.h.in \
                  config.h-vms install-sh setup.com config.guess \
                  config.sub makevms.com screenblank.txt \
-                 xscreensaver.lsm.sh
+                 xscreensaver.lsm.sh xscreensaver.spec
 TAR            = tar
 COMPRESS       = gzip --verbose --best
 COMPRESS_EXT   = gz
@@ -20,6 +20,8 @@ COMPRESS_EXT  = gz
 
 MAKE_SUBDIR = for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) $@) || exit 5; done
 
+default::
+       @$(MAKE_SUBDIR)
 all::
        @$(MAKE_SUBDIR)
 install:
@@ -39,6 +41,7 @@ uninstall-man:
 depend:
        @$(MAKE_SUBDIR)
 distdepend:
+       @$(MAKE) update_spec_version
        @$(MAKE_SUBDIR)
 TAGS: tags
 tags:
@@ -84,7 +87,7 @@ tar:
 # nearly impossible to customize --help blurb.  This horrid set of regexps
 # go through and clean up the help text, by inserting whitespace and ripping
 # out options we don't use.  Odds are good that this will fail with any version
-# of autoconf other than 2.12.
+# of autoconf other than the ones I've tried (2.12 and 2.13.)
 #
 configure::
        autoconf
@@ -152,6 +155,35 @@ bump-version::
   echo "overwrote $$SRC";                                                  \
   ls -lFd $$SRC
 
+update_spec_version::
+       @S=$(srcdir)/xscreensaver.spec ;                                    \
+       U=$(srcdir)/utils/version.h ;                                       \
+       V=`sed -n 's/.*\([0-9][0-9]*\.[0-9]*\).*/\1/p' < $$U` ;             \
+       echo -n "Updating version number in $$S to \"$$V\"... " ;           \
+       T=/tmp/xs.$$$$ ;                                                    \
+       sed "s/^\(%define.version[^0-9]*\)\(.*\)/\1$$V/"                    \
+         < $$S > $$T ;                                                     \
+       if cmp -s $$S $$T ; then                                            \
+         echo "unchanged." ;                                               \
+       else                                                                \
+         cat $$T > $$S ;                                                   \
+         echo "done." ;                                                    \
+       fi ;                                                                \
+       rm $$T
+
+rpm::
+       @                                                                  \
+  VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ; \
+  DIR=/usr/src/redhat ;                                                           \
+  cp -p xscreensaver-$$VERS.tar.gz $$DIR/SOURCES/ ;                       \
+  rpm --define "USE_GL yes" -ba xscreensaver.spec ;                       \
+  rm -f $$DIR/xscreensaver-$$VERS.tar.gz ;                                \
+  rm -rf $$DIR/BUILD/xscreensaver-$$VERS ;                                \
+  mv $$DIR/SRPMS/xscreensaver*-$$VERS-*.rpm . ;                                   \
+  mv $$DIR/RPMS/i386/xscreensaver*-$$VERS-*.rpm . ;                       \
+  echo '' ;                                                               \
+  ls -lFG xscreensaver*-$$VERS-*.rpm
+
 test-tar::
        @                                                                   \
   VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ;  \
@@ -174,27 +206,18 @@ test-tar::
   chmod -R a-w . ;                                                         \
   chmod u+w . ;                                                                    \
   mkdir BIN ;                                                              \
-  mkdir BIN/athena ;                                                       \
   mkdir BIN/motif ;                                                        \
   mkdir BIN/lesstif ;                                                      \
   chmod a-w . ;                                                                    \
                                                                            \
-  ( cd BIN/athena ;                                                        \
-    CC=cc ;                                                                \
-    export CC ;                                                                    \
-    ../../configure --with-athena ;                                        \
-    echo --------------------------------------------------------------- ;  \
-    gmake ;                                                                \
-    echo --------------------------------------------------------------- ); \
-                                                                           \
   ( cd BIN/motif ;                                                         \
     CC=cc ;                                                                \
     export CC ;                                                                    \
-    ../../configure --with-motif=/usr/local/motif ;                        \
+    ../../configure --without-xpm --without-xdbe --without-xshm            \
+                   --with-motif=/usr/local/motif ;                         \
     echo --------------------------------------------------------------- ;  \
-    ( cd utils; gmake ) ;                                                  \
-    ( cd driver; gmake ) ;                                                 \
-    ( cd driver; gmake xscreensaver-demo-Xaw ) ;                           \
+    gmake all ;                                                                    \
+    ( cd driver; gmake tests ) ;                                           \
     echo --------------------------------------------------------------- ); \
                                                                            \
   ( cd BIN/lesstif ;                                                       \
@@ -202,9 +225,8 @@ test-tar::
     export CC ;                                                                    \
     ../../configure --with-motif=/usr/local/lesstif ;                      \
     echo --------------------------------------------------------------- ;  \
-    ( cd utils; gmake ) ;                                                  \
-    ( cd driver; gmake ) ;                                                 \
-    ( cd driver; gmake xscreensaver-demo-Xaw ) ;                           \
+    ( cd utils; gmake all ) ;                                              \
+    ( cd driver; gmake all ) ;                                             \
     echo --------------------------------------------------------------- ); \
                                                                            \
   chmod -R u+w .
@@ -221,6 +243,7 @@ www::
     echo "$$NAME does not exist!  Did you forget to \`make tar'?" ;        \
     exit 1 ;                                                               \
   fi ;                                                                     \
+  chmod a-w $$NAME ;                                                       \
   if [ -f $$DEST/$$NAME ]; then                                                    \
     echo -n "WARNING: $$DEST/$$NAME already exists!  Overwrite? ";         \
     read line;                                                             \