X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.in;h=63792cb599b2398b219fc14e2a1f27f2a898dbc2;hb=8afc01a67be4fbf3f1cc0fce9adf01b5289a21c6;hp=a99184a27da0250561160cd4064a57fdd5f25411;hpb=ec8d2b32b63649e6d32bdfb306eda062769af823;p=xscreensaver

diff --git a/Makefile.in b/Makefile.in
index a99184a2..63792cb5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -12,15 +12,15 @@ SUBDIRS2	= $(SUBDIRS) OSX
 TARFILES	= README README.hacking README.VMS INSTALL \
 		  configure configure.in Makefile.in config.h.in \
 		  config.h-vms install-sh setup.com config.guess aclocal.m4 \
-		  config.sub makevms.com \
+		  ax_pthread.m4 config.sub makevms.com \
 		  intltool-merge.in intltool-extract.in intltool-update.in \
 		  xscreensaver.spec \
 		  xscreensaver.xcodeproj/project.pbxproj
 
 TAR		= tar
 
-MAKE_SUBDIR  = for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) $@) || exit 5; done
-MAKE_SUBDIR2 = for dir in $(SUBDIRS2);do (cd $$dir; $(MAKE) $@) || exit 5; done
+MAKE_SUBDIR  = for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit 5; done
+MAKE_SUBDIR2 = for dir in $(SUBDIRS2); do $(MAKE) -C $$dir $@ || exit 5; done
 
 default::
 	@$(MAKE_SUBDIR)
@@ -45,7 +45,7 @@ depend::
 distdepend::
 	@$(MAKE) update_spec_version
 	@$(MAKE_SUBDIR2)
-	@cd po ; $(MAKE) update-po
+	@$(MAKE) -C po update-po
 
 TAGS:: tags
 tags::
@@ -82,7 +82,7 @@ tar::
     cd $$d ; done ;							    \
   echo creating tar file $$ADIR$$NAME.tar.gz... ;			    \
   export COPYFILE_DISABLE=true ;					    \
-  GZIP="-9v" $(TAR) -vchzf $$ADIR$$NAME.tar.gz			            \
+  GZIP="-9v" $(TAR) -vczf $$ADIR$$NAME.tar.gz			            \
     `echo $(TARFILES) $$FILES | sed "s|^|$$NAME/|g; s| | $$NAME/|g" ` ;	    \
   rm $$NAME
 
@@ -94,14 +94,9 @@ tar::
 # out options we don't use.  Odds are good that this will fail with any version
 # of autoconf other than the ones I've tried (2.12 and 2.13.)
 #
-# NOTE: we now require autoconf 2.63 or earlier, because later versions have
-# the "Expanded-Before-Required" change and I can't make any sense of it.
-# If someone wants to send me a patch to make configure.in work with 2.64
-# or later, feel free.  Personally, I can't be bothered.
-#
 configure::
-	autoconf263
-	autoheader263
+	autoconf
+	autoheader
 	@TMP=configure.$$$$ ;						     \
 	echo "munging configure's --help message..." ;			     \
 	( perl -e '							     \
@@ -284,7 +279,7 @@ test-tar::
   chmod -R u+w .
 
 dmg::
-	cd OSX ; $(MAKE) release dmg
+	$(MAKE) -C OSX release dmg
 
 www::
 	@								    \
@@ -299,6 +294,13 @@ www::
   NAME2="$$ADIR$$BNAME2" ;						    \
   DNAME2="$$DEST/$$HEAD.dmg" ;						    \
 									    \
+  if ! git diff --quiet ; then						    \
+    echo "uncommitted changes exist!" ;					    \
+    exit 1 ;								    \
+  fi ;									    \
+									    \
+  $(MAKE) -C OSX updates.xml ;						    \
+									    \
   if [ ! -f $$NAME ]; then						    \
     echo "$$NAME does not exist!  Did you forget to \`make tar'?" ;	    \
     exit 1 ; 								    \
@@ -322,9 +324,16 @@ www::
       exit 1 ; 								    \
     fi ;								    \
   fi ;									    \
+									    \
+  git commit -a -m "$$VERS" . ;						    \
+  git tag -a "v$$VERS" -m "$$VERS" . ;					    \
+									    \
+  ( cd $$DEST ;	git pull . ) ;						    \
+									    \
   cp -p $$NAME $$DNAME ;						    \
   cp -p $$NAME2 $$DNAME2 ;						    \
   chmod u+w $$DNAME $$DNAME2 ;						    \
+  cp -p OSX/updates.xml $$DEST ;					    \
   cd $$DEST ;								    \
 									    \
   TMP=/tmp/xd.$$$$ ;							    \
@@ -334,24 +343,26 @@ www::
   echo '' ;								    \
 									    \
   for EXT in tar.gz dmg ; do						    \
-    OLDEST=`ls xscreensaver*.$$EXT | head -n 1` ;			    \
+    OLDEST=`ls xscreensaver*.$$EXT | 					    \
+      fgrep -v 5.14 |							    \
+      head -n 1` ;							    \
     /bin/echo -n "Delete $$DEST/$$OLDEST? ";				    \
     read line;								    \
     if [ "x$$line" = "xyes" -o "x$$line" = "xy" ]; then			    \
       set -x ;								    \
       rm $$OLDEST ;							    \
-      cvs remove $$OLDEST ;						    \
+      git rm $$OLDEST ;							    \
       set +x ;								    \
     fi ;								    \
   done ;								    \
   set -x ;								    \
-  cvs add -kb $$BNAME $$BNAME2 ;					    \
   cat $$TMP > download.html ;						    \
   rm -f $$TMP ;								    \
 									    \
-  (cd ..; $(MAKE) xscreensaver/changelog.html				    \
-		  xscreensaver/screenshots/index.html );		    \
-  cvs diff -U0 changelog.html ;						    \
+  git add $$BNAME $$BNAME2 ;						    \
+									    \
+  $(MAKE) -C ../ xscreensaver/changelog.html xscreensaver/screenshots/index.html; \
+  git diff changelog.html ;						    \
   set +x ;								    \
 									    \
   /bin/echo -n "Ok? ";							    \
@@ -360,7 +371,9 @@ www::
     exit 1 ;								    \
   fi ;									    \
 									    \
-  cvs commit -m "$$VERS"
+  git commit -m "$$VERS" . ;						    \
+  git tag -a "v$$VERS" -m "$$VERS" . ;					    \
+  git push . ;								    \
 
 
 count::