X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.in;h=ccbe5f8bac240442bb73f59cdc74bfd7607afcee;hb=2762a7d7cf8d83e68b8f635941f6609119d630ae;hp=99b6f4a257bb5abef0f2deb39794dd6ab717bc7c;hpb=6b1c86cf395f59389e4ece4ea8f4bea2c332745b;p=xscreensaver

diff --git a/Makefile.in b/Makefile.in
index 99b6f4a2..ccbe5f8b 100644
--- a/Makefile.in
+++ b/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 \
@@ -18,8 +19,8 @@ TARFILES	= README README.hacking README.VMS INSTALL \
 
 TAR		= tar
 
-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
+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
 
 default::
 	@$(MAKE_SUBDIR)
@@ -44,7 +45,7 @@ depend::
 distdepend::
 	@$(MAKE) update_spec_version
 	@$(MAKE_SUBDIR2)
-	@cd po ; $(MAKE) generate_potfiles_in
+	@$(MAKE) -C po update-po
 
 TAGS:: tags
 tags::
@@ -80,6 +81,7 @@ tar::
       ` ";								    \
     cd $$d ; done ;							    \
   echo creating tar file $$ADIR$$NAME.tar.gz... ;			    \
+  export COPYFILE_DISABLE=true ;					    \
   GZIP="-9v" $(TAR) -vchzf $$ADIR$$NAME.tar.gz			            \
     `echo $(TARFILES) $$FILES | sed "s|^|$$NAME/|g; s| | $$NAME/|g" ` ;	    \
   rm $$NAME
@@ -92,9 +94,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 '							     \
@@ -277,7 +284,7 @@ test-tar::
   chmod -R u+w .
 
 dmg::
-	cd OSX ; $(MAKE) release dmg
+	$(MAKE) -C OSX release dmg
 
 www::
 	@								    \
@@ -321,27 +328,30 @@ 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 | 					    \
+      fgrep -v 5.14 |							    \
+      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 ;								    \
 									    \
-  (cd ..; $(MAKE) xscreensaver/changelog.html				    \
-		  xscreensaver/screenshots/index.html );		    \
+  $(MAKE) -C ../ xscreensaver/changelog.html xscreensaver/screenshots/index.html; \
   cvs diff -U0 changelog.html ;						    \
   set +x ;								    \
 									    \
@@ -353,22 +363,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::
 	@ \