X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.in;h=17c698d5c6b6b56700a576789fc5a3d5eba57db2;hb=39809ded547bdbb08207d3e514950425215b4410;hp=1d29b54b009833b4e775f45557f2775b087cbf46;hpb=dba664f31aa87285db4d76cf8c5e66335299703a;p=xscreensaver

diff --git a/Makefile.in b/Makefile.in
index 1d29b54b..17c698d5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,34 +6,33 @@ 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 \
 		  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 $(MAKE) -C $$dir $@ || exit 5; done
-MAKE_SUBDIR2 = for dir in $(SUBDIRS2); do $(MAKE) -C $$dir $@ || exit 5; done
+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
 
 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::
@@ -45,7 +44,7 @@ depend::
 distdepend::
 	@$(MAKE) update_spec_version
 	@$(MAKE_SUBDIR2)
-	@$(MAKE) -C po update-po
+	@cd po ; $(MAKE) update-po
 
 TAGS:: tags
 tags::
@@ -231,56 +230,10 @@ rpm::
   echo '' ;								   \
   ls -lFG xscreensaver*-$$VERS-*.rpm
 
-test-tar::
-	@								    \
-  VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' utils/version.h` ;  \
-  D=xscreensaver-$$VERS ;						    \
-  ADIR=archive/ ;							    \
-  NAME="$${ADIR}$$D.tar.gz" ;						    \
-  if [ ! -f $$NAME ]; then						    \
-    echo "$$NAME does not exist!  Did you forget to \`make tar'?" ;	    \
-    exit 1 ; 								    \
-  fi ;									    \
-									    \
-  set -e ;								    \
-  set -x ;								    \
-									    \
-  if [ -d $$D ]; then							    \
-   chmod -R u+w $$D ;							    \
-  fi ;									    \
-  rm -rf $$D ;								    \
-  zcat $${ADIR}$$D.tar.gz | tar -xf - ;					    \
-  cd $$D ;								    \
-  chmod -R a-w . ;							    \
-  chmod u+w . ;								    \
-  mkdir BIN ;								    \
-  mkdir BIN/motif ;							    \
-  mkdir BIN/lesstif ;							    \
-  chmod a-w . ;								    \
-									    \
-  ( cd BIN/motif ;							    \
-    CC=cc ;								    \
-    export CC ;								    \
-    ../../configure --without-xpm --without-xdbe --without-xshm 	    \
-		    --with-motif=/usr/local/motif ;			    \
-    echo --------------------------------------------------------------- ;  \
-    gmake all ;								    \
-    ( cd driver; gmake tests ) ;					    \
-    echo --------------------------------------------------------------- ); \
-									    \
-  ( cd BIN/lesstif ;							    \
-    CC=cc ;								    \
-    export CC ;								    \
-    ../../configure --with-motif=/usr/local/lesstif --without-gnome ;	    \
-    echo --------------------------------------------------------------- ;  \
-    ( cd utils; gmake all ) ;						    \
-    ( cd driver; gmake all ) ;						    \
-    echo --------------------------------------------------------------- ); \
-									    \
-  chmod -R u+w .
-
 dmg::
 	$(MAKE) -C OSX release dmg
+apk::
+	$(MAKE) -C android apk
 
 www::
 	@								    \
@@ -294,6 +247,9 @@ 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!" ;					    \
@@ -310,6 +266,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? ";	    \
@@ -324,16 +284,24 @@ www::
     if [ "x$$line" != "xyes" -a "x$$line" != "xy" ]; then		    \
       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 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 ;						    \
-  chmod u+w $$DNAME $$DNAME2 ;						    \
+  cp -p $$NAME3 $$DNAME3 ;						    \
+  chmod u+w $$DNAME $$DNAME2 $$DNAME3 ;					    \
   cp -p OSX/updates.xml $$DEST ;					    \
   cd $$DEST ;								    \
 									    \
@@ -346,6 +314,7 @@ www::
   for EXT in tar.gz dmg ; do						    \
     OLDEST=`ls xscreensaver*.$$EXT | 					    \
       fgrep -v 5.14 |							    \
+      fgrep -v 5.34 |							    \
       head -n 1` ;							    \
     /bin/echo -n "Delete $$DEST/$$OLDEST? ";				    \
     read line;								    \
@@ -360,7 +329,7 @@ www::
   cat $$TMP > download.html ;						    \
   rm -f $$TMP ;								    \
 									    \
-  git add $$BNAME $$BNAME2 ;						    \
+  git add $$BNAME $$BNAME2 $$BNAME3 ;					    \
 									    \
   $(MAKE) -C ../ xscreensaver/changelog.html xscreensaver/screenshots/index.html; \
   git diff changelog.html ;						    \
@@ -372,8 +341,8 @@ www::
     exit 1 ;								    \
   fi ;									    \
 									    \
-  git commit -m "$$VERS" . ;						    \
   git tag -a "v$$VERS" -m "$$VERS" ;					    \
+  git commit -m "$$VERS" . ;						    \
   git push ;								    \