X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=Makefile.in;h=f1a39486bbb1852b74b0a1e01b1fb0cbd996d014;hp=10235b17e97896ecd373fb8ed8e4f019fcc7c877;hb=06e9a7886a77cad92f9ddbc169d6d199a4d8b76d;hpb=a719ec12b8b2563112366a8ac3196816fd64d2c7

diff --git a/Makefile.in b/Makefile.in
index 10235b17..f1a39486 100644
--- 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:
@@ -159,7 +161,7 @@ update_spec_version::
 	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/^\(Version:[^0-9]*\)\(.*\)/\1$$V/"			    \
+	sed "s/^\(%define.version[^0-9]*\)\(.*\)/\1$$V/"		    \
 	  < $$S > $$T ;							    \
 	if cmp -s $$S $$T ; then					    \
 	  echo "unchanged." ;						    \
@@ -170,10 +172,17 @@ update_spec_version::
 	rm $$T
 
 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
+	@								   \
+  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::
 	@								    \
@@ -197,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 --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 ;							    \
@@ -225,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 .
@@ -244,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;								    \