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

[xscreensaver] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index c919051831d5c5f738a4134fd808958100539261..a94868146bfa2996dd16ecf3ef6ff792320de598 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,7 +6,7 @@ srcdir          = @srcdir@
 VPATH          = @srcdir@
 
 SHELL          = /bin/sh
-SUBDIRS        = utils jwxyz hacks hacks/glx driver po
+SUBDIRS        = utils jwxyz hacks/images hacks hacks/glx driver po
 SUBDIRS2       = $(SUBDIRS) OSX android
 TARFILES       = README README.hacking README.VMS INSTALL \
                  configure configure.in Makefile.in config.h.in \
@@ -18,21 +18,21 @@ TARFILES    = README README.hacking README.VMS INSTALL \
 
 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::
@@ -44,7 +44,7 @@ depend::
 distdepend::
        @$(MAKE) update_spec_version
        @$(MAKE_SUBDIR2)
-       @$(MAKE) -C po update-po
+       @cd po ; $(MAKE) update-po
 
 TAGS:: tags
 tags::
@@ -121,7 +121,7 @@ configure::
  --x-includes=DIR        X include files are in DIR\n \
  --x-libraries=DIR       X library files are in DIR/m; \
                                                                             \
-               s@mandir=.\$${prefix}/man.@mandir=\\\$${datadir}/man@;       \
+               s@mandir=.\$$\{prefix}/man.@mandir=\\\$${datadir}/man@;       \
                                                                             \
                s@rm -f conftest@rm -rf conftest@g;                          \
                                                                             \
@@ -230,55 +230,6 @@ 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 jwxyz; gmake all ) ;                                              \
-    ( cd driver; gmake all ) ;                                             \
-    echo --------------------------------------------------------------- ); \
-                                                                           \
-  chmod -R u+w .
-
 dmg::
        $(MAKE) -C OSX release dmg
 apk::
@@ -363,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;                                                             \