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

[xscreensaver] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index b094069d1007f60bc1d09b294d32f0ce9917733e..cf80264b42dd5b8491fc43b8450caa4e842eb85f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in --- xscreensaver, Copyright (c) 1999-2008 Jamie Zawinski.
+# Makefile.in --- xscreensaver, Copyright (c) 1999-2014 Jamie Zawinski.
 # the `../configure' script generates `Makefile' from this file.
 
 @SET_MAKE@
@@ -6,33 +6,33 @@ srcdir                = @srcdir@
 VPATH          = @srcdir@
 
 SHELL          = /bin/sh
-SUBDIRS                = utils driver hacks hacks/glx po
-SUBDIRS2       = $(SUBDIRS) OSX
+SUBDIRS        = utils jwxyz hacks hacks/glx driver po
+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
+                 OSX/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_SUBDIR2 = for dir in $(SUBDIRS2); do (cd $$dir; $(MAKE) $@) || exit 5; done
 
 default::
-       @$(MAKE_SUBDIR)
+       @+$(MAKE_SUBDIR)
 all::
-       @$(MAKE_SUBDIR)
+       @+$(MAKE_SUBDIR)
 install::
-       @$(MAKE_SUBDIR)
+       @+$(MAKE_SUBDIR)
 install-program::
-       @$(MAKE_SUBDIR)
+       @+$(MAKE_SUBDIR)
 install-man::
-       @$(MAKE_SUBDIR)
+       @+$(MAKE_SUBDIR)
 install-strip::
-       @$(MAKE_SUBDIR)
+       @+$(MAKE_SUBDIR)
 uninstall::
        @$(MAKE_SUBDIR)
 uninstall-program::
@@ -80,7 +80,8 @@ tar::
       ` ";                                                                 \
     cd $$d ; done ;                                                        \
   echo creating tar file $$ADIR$$NAME.tar.gz... ;                          \
-  GZIP="-9v" $(TAR) -vchzf $$ADIR$$NAME.tar.gz                             \
+  export COPYFILE_DISABLE=true ;                                           \
+  GZIP="-9v" $(TAR) -vczf $$ADIR$$NAME.tar.gz                              \
     `echo $(TARFILES) $$FILES | sed "s|^|$$NAME/|g; s| | $$NAME/|g" ` ;            \
   rm $$NAME
 
@@ -93,6 +94,7 @@ tar::
 # of autoconf other than the ones I've tried (2.12 and 2.13.)
 #
 configure::
+       aclocal
        autoconf
        autoheader
        @TMP=configure.$$$$ ;                                                \
@@ -271,13 +273,16 @@ test-tar::
     ../../configure --with-motif=/usr/local/lesstif --without-gnome ;      \
     echo --------------------------------------------------------------- ;  \
     ( cd utils; gmake all ) ;                                              \
+    ( cd jwxyz; gmake all ) ;                                              \
     ( cd driver; gmake all ) ;                                             \
     echo --------------------------------------------------------------- ); \
                                                                            \
   chmod -R u+w .
 
 dmg::
-       cd OSX ; $(MAKE) release dmg
+       $(MAKE) -C OSX release dmg
+apk::
+       $(MAKE) -C android apk
 
 www::
        @                                                                   \
@@ -291,6 +296,16 @@ www::
   BNAME2="$$HEAD.dmg" ;                                                            \
   NAME2="$$ADIR$$BNAME2" ;                                                 \
   DNAME2="$$DEST/$$HEAD.dmg" ;                                             \
+  BNAME3="$$HEAD.apk" ;                                                            \
+  NAME3="$$ADIR$$BNAME3" ;                                                 \
+  DNAME3="$$DEST/$$HEAD.apk" ;                                             \
+                                                                           \
+  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'?" ;        \
@@ -300,6 +315,10 @@ www::
     echo "$$NAME2 does not exist!  Did you forget to \`make dmg'?" ;       \
     exit 1 ;                                                               \
   fi ;                                                                     \
+  if [ ! -f $$NAME3 ]; then                                                \
+    echo "$$NAME3 does not exist!  Did you forget to \`make apk'?" ;       \
+    exit 1 ;                                                               \
+  fi ;                                                                     \
   chmod a-w $$NAME ;                                                       \
   if [ -f $$DNAME ]; then                                                  \
     /bin/echo -n "WARNING: $$DNAME already exists!  Overwrite? ";          \
@@ -315,9 +334,24 @@ www::
       exit 1 ;                                                                     \
     fi ;                                                                   \
   fi ;                                                                     \
+  if [ -f $$DNAME3 ]; then                                                 \
+    /bin/echo -n "WARNING: $$DNAME3 already exists!  Overwrite? ";         \
+    read line;                                                             \
+    if [ "x$$line" != "xyes" -a "x$$line" != "xy" ]; then                  \
+      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 $$NAME3 $$DNAME3 ;                                                 \
+  chmod u+w $$DNAME $$DNAME2 $$DNAME3 ;                                            \
+  cp -p OSX/updates.xml $$DEST ;                                           \
   cd $$DEST ;                                                              \
                                                                            \
   TMP=/tmp/xd.$$$$ ;                                                       \
@@ -327,24 +361,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 $$BNAME3 ;                                      \
+                                                                           \
+  $(MAKE) -C ../ xscreensaver/changelog.html xscreensaver/screenshots/index.html; \
+  git diff changelog.html ;                                                \
   set +x ;                                                                 \
                                                                            \
   /bin/echo -n "Ok? ";                                                     \
@@ -353,7 +389,9 @@ www::
     exit 1 ;                                                               \
   fi ;                                                                     \
                                                                            \
-  cvs commit -m "$$VERS"
+  git tag -a "v$$VERS" -m "$$VERS" ;                                       \
+  git commit -m "$$VERS" . ;                                               \
+  git push ;                                                               \
 
 
 count::