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

diff --git a/Makefile.in b/Makefile.in
index 63792cb5..bd6dd28b 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@
@@ -7,15 +7,14 @@ 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 \
 		  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.$$$$ ;						     \
@@ -325,10 +325,10 @@ www::
     fi ;								    \
   fi ;									    \
 									    \
-  git commit -a -m "$$VERS" . ;						    \
-  git tag -a "v$$VERS" -m "$$VERS" . ;					    \
+  git tag -a "v$$VERS" -m "$$VERS" ;					    \
+  git commit -m "$$VERS" . ;						    \
 									    \
-  ( cd $$DEST ;	git pull . ) ;						    \
+  ( cd $$DEST ;	git pull ) ;						    \
 									    \
   cp -p $$NAME $$DNAME ;						    \
   cp -p $$NAME2 $$DNAME2 ;						    \
@@ -371,9 +371,9 @@ www::
     exit 1 ;								    \
   fi ;									    \
 									    \
+  git tag -a "v$$VERS" -m "$$VERS" ;					    \
   git commit -m "$$VERS" . ;						    \
-  git tag -a "v$$VERS" -m "$$VERS" . ;					    \
-  git push . ;								    \
+  git push ;								    \
 
 
 count::