From http://www.jwz.org/xscreensaver/xscreensaver-5.31.tar.gz

[xscreensaver] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index c905925fffa0a74b4aff69dede985baf0abf8e0c..4be400dfb1e6ccf31473a85bd5d932f9570256cc 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in --- xscreensaver, Copyright (c) 1999-2010 Jamie Zawinski.
+# Makefile.in --- xscreensaver, Copyright (c) 1999-2014 Jamie Zawinski.
 # the `../configure' script generates `Makefile' from this file.
 
 @SET_MAKE@
@@ -7,12 +7,11 @@ VPATH         = @srcdir@
 
 SHELL          = /bin/sh
 SUBDIRS        = utils driver hacks hacks/glx po
-#SUBDIRS       = utils driver hacks hacks/glx
-SUBDIRS2       = $(SUBDIRS) OSX
+SUBDIRS2       = $(SUBDIRS) OSX android
 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
@@ -82,7 +81,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 +93,10 @@ 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
+       aclocal
+       autoconf
+       autoheader
        @TMP=configure.$$$$ ;                                                \
        echo "munging configure's --help message..." ;                       \
        ( perl -e '                                                          \
@@ -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 tag -a "v$$VERS" -m "$$VERS" ;                                       \
+  git commit -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,23 +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 ;                                                                    \
                                                                            \
+  git add $$BNAME $$BNAME2 ;                                               \
+                                                                           \
   $(MAKE) -C ../ xscreensaver/changelog.html xscreensaver/screenshots/index.html; \
-  cvs diff -U0 changelog.html ;                                                    \
+  git diff changelog.html ;                                                \
   set +x ;                                                                 \
                                                                            \
   /bin/echo -n "Ok? ";                                                     \
@@ -359,7 +371,9 @@ www::
     exit 1 ;                                                               \
   fi ;                                                                     \
                                                                            \
-  cvs commit -m "$$VERS"
+  git tag -a "v$$VERS" -m "$$VERS" ;                                       \
+  git commit -m "$$VERS" . ;                                               \
+  git push ;                                                               \
 
 
 count::