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

[xscreensaver] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 0c7821b24365da3150a3d93bcda54a88df86a7f1..00a5d99d389b004972cd77624be251c89281547b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -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:
@@ -85,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
@@ -172,8 +174,15 @@ update_spec_version::
 rpm::
        @                                                                   \
   VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ;  \
-  cp -p xscreensaver-$$VERS.tar.gz /usr/src/redhat/SOURCES/ ;              \
-  rpm -ba xscreensaver.spec
+  DIR=/usr/src/redhat ;                                                            \
+  cp -p xscreensaver-$$VERS.tar.gz $$DIR/SOURCES/ ;                        \
+  rpm -ba xscreensaver.spec ;                                              \
+  rm -f $$DIR/xscreensaver-$$VERS.tar.gz ;                                 \
+  rm -rf $$DIR/BUILD/xscreensaver-$$VERS ;                                 \
+  mv $$DIR/RPMS/i386/xscreensaver-$$VERS-*.rpm . ;                         \
+  mv $$DIR/SRPMS/xscreensaver-$$VERS-*.rpm . ;                             \
+  echo '' ;                                                                \
+  ls -lFG xscreensaver-$$VERS-*.rpm
 
 test-tar::
        @                                                                   \
@@ -197,26 +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 --without-xpm --with-motif=/usr/local/motif ;          \
+    ../../configure --without-xpm --without-xdbe --without-xshm            \
+                   --with-motif=/usr/local/motif ;                         \
     echo --------------------------------------------------------------- ;  \
-    gmake ;                                                                \
-    ( cd driver; gmake xscreensaver-demo-Xaw ) ;                           \
+    gmake all ;                                                                    \
+    ( cd driver; gmake tests ) ;                                           \
     echo --------------------------------------------------------------- ); \
                                                                            \
   ( cd BIN/lesstif ;                                                       \
@@ -224,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 .
@@ -243,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;                                                             \