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

diff --git a/Makefile.in b/Makefile.in
index 2127292b..f1a39486 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
@@ -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:
@@ -62,7 +65,7 @@ tar:
   mv xscreensaver.lsm.$$$$ xscreensaver.lsm ;				    \
   NAME=`sed -n								    \
   's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/xscreensaver-\1/p' utils/version.h` ;  \
-  rm -f $$NAME ; ln -s . $$NAME ;					    \
+  rm -rf $$NAME ; ln -s . $$NAME ;					    \
   FILES= ;								    \
   for subdir in $(SUBDIRS) ; do						    \
     d=`pwd` ;								    \
@@ -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
@@ -127,6 +130,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,18 +155,98 @@ 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` ;  \
+  D=xscreensaver-$$VERS ;						    \
+  NAME="$$D.tar.gz" ;							    \
+  if [ ! -f $$NAME ]; then						    \
+    echo "$$NAME does not exist!  Did you forget to \`make tar'?" ;	    \
+    exit 1 ; 								    \
+  fi ;									    \
+									    \
+  set -e ;								    \
+  set -x ;								    \
+									    \
+  if [ -d $$D ]; then							    \
+   chmod -R u+w $$D ;							    \
+  fi ;									    \
+  rm -rf $$D ;								    \
+  zcat $$D.tar.gz | tar -xf - ;						    \
+  cd $$D ;								    \
+  chmod -R a-w . ;							    \
+  chmod u+w . ;								    \
+  mkdir BIN ;								    \
+  mkdir BIN/motif ;							    \
+  mkdir BIN/lesstif ;							    \
+  chmod a-w . ;								    \
+									    \
+  ( cd BIN/motif ;							    \
+    CC=cc ;								    \
+    export CC ;								    \
+    ../../configure --without-xpm --without-xdbe --without-xshm 	    \
+		    --with-motif=/usr/local/motif ;			    \
+    echo --------------------------------------------------------------- ;  \
+    gmake all ;								    \
+    ( cd driver; gmake tests ) ;					    \
+    echo --------------------------------------------------------------- ); \
+									    \
+  ( cd BIN/lesstif ;							    \
+    CC=cc ;								    \
+    export CC ;								    \
+    ../../configure --with-motif=/usr/local/lesstif ;			    \
+    echo --------------------------------------------------------------- ;  \
+    ( cd utils; gmake all ) ;						    \
+    ( cd driver; gmake all ) ;						    \
+    echo --------------------------------------------------------------- ); \
+									    \
+  chmod -R u+w .
+
+
 www::
 	@								    \
   DEST=$$HOME/www/xscreensaver ;					    \
   VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ;  \
-  NAME="xscreensaver-$$VERS.tar.gz" ;					    \
+  HEAD="xscreensaver-$$VERS" ;						    \
+  NAME="$$HEAD.tar.gz" ;						    \
+									    \
   if [ ! -f $$NAME ]; then						    \
     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;							    \
+    read line;								    \
     if [ "x$$line" != "xyes" -a "x$$line" != "xy" ]; then		    \
       exit 1 ; 								    \
     fi ;								    \
@@ -172,10 +256,9 @@ www::
   cd $$DEST ;								    \
 									    \
   TMP=/tmp/xd.$$$$ ;							    \
-  sed "s/xscreensaver-[0-9]\.[0-9][0-9]\.tar\.gz/$$NAME/g" index.html	    \
-    > $$TMP ;								    \
+  sed "s/xscreensaver-[0-9]\.[0-9][0-9]*/$$HEAD/g" download.html > $$TMP ;  \
   echo '' ;								    \
-  diff -u0 index.html $$TMP ;						    \
+  diff -u0 download.html $$TMP ;					    \
   echo '' ;								    \
 									    \
   OLDEST=`ls xscreensaver*.tar.gz | head -1` ;				    \
@@ -189,6 +272,17 @@ www::
     set -x ;								    \
   fi ;									    \
   cvs add -kb $$NAME ;							    \
-  cat $$TMP > index.html ;						    \
+  cat $$TMP > download.html ;						    \
   rm -f $$TMP ;								    \
+									    \
+  (cd ..; $(MAKE) xscreensaver/changelog.html );			    \
+  cvs diff -u0 changelog.html ;						    \
+  set +x ;								    \
+									    \
+  echo -n "Ok? ";							    \
+  read line;								    \
+  if [ "x$$line" != "xyes" -a "x$$line" != "xy" ]; then			    \
+    exit 1 ;								    \
+  fi ;									    \
+									    \
   cvs commit -m "$$VERS"