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

diff --git a/Makefile.in b/Makefile.in
index 89d3a43b..10235b17 100644
--- 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
@@ -39,6 +39,7 @@ uninstall-man:
 depend:
 	@$(MAKE_SUBDIR)
 distdepend:
+	@$(MAKE) update_spec_version
 	@$(MAKE_SUBDIR)
 TAGS: tags
 tags:
@@ -84,7 +85,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
@@ -127,6 +128,7 @@ bump-version::
   set - $$VERS ;							    \
   MAJOR="$$1"; MINOR="$$2";						    \
   NEW=`echo $$MINOR + 1 | bc` ;						    \
+  NEW=`echo $$NEW | sed 's/^\([0-9]\)$$/0\1/'` ;			    \
   D=`date '+%d-%b-%y'`;							    \
   if [ ! -f xscreensaver-$$MAJOR.$$MINOR.tar.gz ]; then			    \
     echo "WARNING: xscreensaver-$$MAJOR.$$MINOR.tar.gz does not exist.";    \
@@ -151,6 +153,28 @@ 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/^\(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` ;  \
+  cp -p xscreensaver-$$VERS.tar.gz /usr/src/redhat/SOURCES/ ;		    \
+  rpm -ba xscreensaver.spec
+
 test-tar::
 	@								    \
   VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ;  \
@@ -189,10 +213,11 @@ test-tar::
   ( 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 ) ;						    \
+    gmake ;								    \
+    ( cd driver; gmake xscreensaver-demo-Xaw ) ;			    \
     echo --------------------------------------------------------------- ); \
 									    \
   ( cd BIN/lesstif ;							    \
@@ -202,9 +227,10 @@ test-tar::
     echo --------------------------------------------------------------- ;  \
     ( cd utils; gmake ) ;						    \
     ( cd driver; gmake ) ;						    \
+    ( cd driver; gmake xscreensaver-demo-Xaw ) ;			    \
     echo --------------------------------------------------------------- ); \
 									    \
-  chmod -R u+w . ;							    \
+  chmod -R u+w .
 
 
 www::
@@ -251,6 +277,7 @@ www::
 									    \
   (cd ..; $(MAKE) xscreensaver/changelog.html );			    \
   cvs diff -u0 changelog.html ;						    \
+  set +x ;								    \
 									    \
   echo -n "Ok? ";							    \
   read line;								    \