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

[xscreensaver] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 1d29b54b009833b4e775f45557f2775b087cbf46..cf80264b42dd5b8491fc43b8450caa4e842eb85f 100644 (file)
--- 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::
@@ -274,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 --------------------------------------------------------------- ); \
                                                                            \
@@ -281,6 +281,8 @@ test-tar::
 
 dmg::
        $(MAKE) -C OSX release dmg
+apk::
+       $(MAKE) -C android apk
 
 www::
        @                                                                   \
@@ -294,6 +296,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 +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? ";          \
@@ -324,16 +333,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 ;                                                              \
                                                                            \
@@ -360,7 +377,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 +389,8 @@ www::
     exit 1 ;                                                               \
   fi ;                                                                     \
                                                                            \
-  git commit -m "$$VERS" . ;                                               \
   git tag -a "v$$VERS" -m "$$VERS" ;                                       \
+  git commit -m "$$VERS" . ;                                               \
   git push ;                                                               \