X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.in;h=c919051831d5c5f738a4134fd808958100539261;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hp=aa233b8a504991dcbdd4d49d4b55a21647b3df2a;hpb=019de959b265701cd0c3fccbb61f2b69f06bf9ee;p=xscreensaver

diff --git a/Makefile.in b/Makefile.in
index aa233b8a..c9190518 100644
--- 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@
@@ -6,16 +6,15 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 SHELL		= /bin/sh
-SUBDIRS 	= utils driver hacks hacks/glx po
-#SUBDIRS 	= utils driver hacks hacks/glx
-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
 
@@ -95,6 +94,7 @@ tar::
 # of autoconf other than the ones I've tried (2.12 and 2.13.)
 #
 configure::
+	aclocal
 	autoconf
 	autoheader
 	@TMP=configure.$$$$ ;						     \
@@ -273,6 +273,7 @@ test-tar::
     ../../configure --with-motif=/usr/local/lesstif --without-gnome ;	    \
     echo --------------------------------------------------------------- ;  \
     ( cd utils; gmake all ) ;						    \
+    ( cd jwxyz; gmake all ) ;						    \
     ( cd driver; gmake all ) ;						    \
     echo --------------------------------------------------------------- ); \
 									    \
@@ -280,6 +281,8 @@ test-tar::
 
 dmg::
 	$(MAKE) -C OSX release dmg
+apk::
+	$(MAKE) -C android apk
 
 www::
 	@								    \
@@ -293,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'?" ;	    \
@@ -302,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? ";	    \
@@ -317,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.$$$$ ;							    \
@@ -337,17 +369,18 @@ www::
     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 $$BNAME3 ;					    \
+									    \
   $(MAKE) -C ../ xscreensaver/changelog.html xscreensaver/screenshots/index.html; \
-  cvs diff -U0 changelog.html ;						    \
+  git diff changelog.html ;						    \
   set +x ;								    \
 									    \
   /bin/echo -n "Ok? ";							    \
@@ -356,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::