optification

[xscreensaver] / xscreensaver / Makefile.in

diff --git a/xscreensaver/Makefile.in b/xscreensaver/Makefile.in
index 99b6f4a..f63429d 100644 (file)
--- a/xscreensaver/Makefile.in
+++ b/xscreensaver/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in --- xscreensaver, Copyright (c) 1999-2005 Jamie Zawinski.
+# Makefile.in --- xscreensaver, Copyright (c) 1999-2010 Jamie Zawinski.
 # the `../configure' script generates `Makefile' from this file.
 
 @SET_MAKE@
@@ -6,7 +6,8 @@ srcdir          = @srcdir@
 VPATH          = @srcdir@
 
 SHELL          = /bin/sh
-SUBDIRS                = utils driver hacks hacks/glx po
+SUBDIRS        = utils driver hacks hacks/glx po
+#SUBDIRS       = utils driver hacks hacks/glx
 SUBDIRS2       = $(SUBDIRS) OSX
 TARFILES       = README README.hacking README.VMS INSTALL \
                  configure configure.in Makefile.in config.h.in \
@@ -44,7 +45,7 @@ depend::
 distdepend::
        @$(MAKE) update_spec_version
        @$(MAKE_SUBDIR2)
-       @cd po ; $(MAKE) generate_potfiles_in
+       @cd po ; $(MAKE) update-po
 
 TAGS:: tags
 tags::
@@ -54,8 +55,8 @@ clean::
        @$(MAKE_SUBDIR2)
 
 distclean:: clean
-       -rm -f config.h Makefile config.status config.cache config.log TAGS *~ "#"* intltool-extract intltool-merge intltool-update
        @$(MAKE_SUBDIR2)
+       -rm -f config.h Makefile config.status config.cache config.log TAGS *~ "#"* intltool-extract intltool-merge intltool-update
 
 dist:: tar
 
@@ -92,9 +93,14 @@ tar::
 # out options we don't use.  Odds are good that this will fail with any version
 # of autoconf other than the ones I've tried (2.12 and 2.13.)
 #
+# NOTE: we now require autoconf 2.63 or earlier, because later versions have
+# the "Expanded-Before-Required" change and I can't make any sense of it.
+# If someone wants to send me a patch to make configure.in work with 2.64
+# or later, feel free.  Personally, I can't be bothered.
+#
 configure::
-       autoconf
-       autoheader
+       autoconf263
+       autoheader263
        @TMP=configure.$$$$ ;                                                \
        echo "munging configure's --help message..." ;                       \
        ( perl -e '                                                          \
@@ -321,21 +327,23 @@ www::
   cd $$DEST ;                                                              \
                                                                            \
   TMP=/tmp/xd.$$$$ ;                                                       \
-  sed "s/xscreensaver-5\.[0-9][0-9ab]*/$$HEAD/g" download.html > $$TMP ;  \
+  sed "s/xscreensaver-5\.[0-9][0-9ab]*/$$HEAD/g" download.html > $$TMP ;    \
   echo '' ;                                                                \
   diff -U0 download.html $$TMP ;                                           \
   echo '' ;                                                                \
                                                                            \
-  OLDEST=`ls xscreensaver*.tar.gz | head -1` ;                             \
-  /bin/echo -n "Delete $$DEST/$$OLDEST? ";                                 \
-  read line;                                                               \
-  if [ "x$$line" = "xyes" -o "x$$line" = "xy" ]; then                      \
-    set -x ;                                                               \
-    rm $$OLDEST ;                                                          \
-    cvs remove $$OLDEST ;                                                  \
-  else                                                                     \
-    set -x ;                                                               \
-  fi ;                                                                     \
+  for EXT in tar.gz dmg ; do                                               \
+    OLDEST=`ls xscreensaver*.$$EXT | head -n 1` ;                          \
+    /bin/echo -n "Delete $$DEST/$$OLDEST? ";                               \
+    read line;                                                             \
+    if [ "x$$line" = "xyes" -o "x$$line" = "xy" ]; then                            \
+      set -x ;                                                             \
+      rm $$OLDEST ;                                                        \
+      cvs remove $$OLDEST ;                                                \
+      set +x ;                                                             \
+    fi ;                                                                   \
+  done ;                                                                   \
+  set -x ;                                                                 \
   cvs add -kb $$BNAME $$BNAME2 ;                                           \
   cat $$TMP > download.html ;                                              \
   rm -f $$TMP ;                                                                    \
@@ -353,22 +361,6 @@ www::
                                                                            \
   cvs commit -m "$$VERS"
 
-check_years::
-       @for file in `find . -name '*.*' \
-               \! -name '*~' \! -name '*.o' \! -name '*.gz' \! -name '*.Z' \
-               \! -name '*.po' \! -name 'config.*'  \! -name '*.glade*' \
-               \! -name '*.m4' \! -name '*.pdb' \! -name '*.xpm' \
-               \! -name '*.jpg' \! -name '*.gif' \! -name '*.eps' \
-               \! -name '*.png' \! -name '*.tif' \! -name '*.bak' \
-               | sort` \
-       ; do \
-         y=`date -r "$$file" '+%Y'` ; \
-         if ! ( grep "\b$$y\b" $$file >/dev/null ); then \
-           if ( grep "opyright\|(c)\|\.BR" $$file >/dev/null ); then \
-             echo "$$file              does not mention $$y" ; \
-           fi ; \
-         fi ; \
-       done
 
 count::
        @ \