X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.in;h=cdc566bc8d5942b291cb18ce76070e3b2f12acf6;hb=1d7308dd9032b39a92fda86e8c2db04218b45fbf;hp=12ab264afee9749bacdfff14c4b7d9f349eb7628;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver diff --git a/Makefile.in b/Makefile.in index 12ab264a..cdc566bc 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 \ @@ -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:: @@ -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 ' \ @@ -121,6 +127,8 @@ configure:: \ s@mandir=.\$${prefix}/man.@mandir=\\\$${datadir}/man@; \ \ + s@rm -f conftest@rm -rf conftest@g; \ + \ print;' \ < configure \ > $$TMP && \ @@ -143,7 +151,7 @@ bump-version:: if [ -f $${ADIR}xscreensaver-$$MAJOR.$$NEW.tar.gz ]; then \ echo "WARNING: $${ADIR}xscreensaver-$$MAJOR.$$NEW.tar.gz already exists.";\ fi ; \ - echo -n "Bumping $$MAJOR.$$MINOR to $$MAJOR.$$NEW ($$D), ok? "; \ + /bin/echo -n "Bumping $$MAJOR.$$MINOR to $$MAJOR.$$NEW ($$D), ok? "; \ read line; \ if [ "x$$line" != "xyes" -a "x$$line" != "xy" ]; then \ exit 1 ; \ @@ -152,7 +160,7 @@ bump-version:: sed -e "s/\([0-9]\.[0-9][0-9]*\)/$$MAJOR.$$NEW/" \ -e "s/\(([0-9][0-9]*-[A-Za-z][a-z][a-z]-[0-9][0-9][0-9]*\))/($$D)/" \ $$SRC > $$TMP ; \ - echo -n "New version and date are "; \ + /bin/echo -n "New version and date are "; \ sed -n "s/[^0-9]*\([0-9]\.[0-9][0-9]*\) (\([-A-Za-z0-9]*\)).*/\1, \2./p" \ $$TMP; \ cat $$TMP > $$SRC ; \ @@ -170,7 +178,7 @@ version-date:: D=`date '+%d-%b-%Y'`; \ TMP=/tmp/bv.$$ ; \ sed -e "s/([0-9][^()]*)/($$D)/" < $$SRC > $$TMP ; \ - echo -n "Updating date in $$SRC to \"$$D\"... " ; \ + /bin/echo -n "Updating date in $$SRC to \"$$D\"... " ; \ if cmp -s $$SRC $$TMP ; then \ echo "unchanged." ; \ else \ @@ -184,7 +192,7 @@ update_spec_version:: @S=$(srcdir)/xscreensaver.spec ; \ U=$(srcdir)/utils/version.h ; \ VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' < $$U` ; \ - echo -n "Updating $$S to \"$$VERS\"... " ; \ + /bin/echo -n "Updating $$S to \"$$VERS\"... " ; \ T=/tmp/xs.$$$$ ; \ sed "s/^\(%define.version[^0-9]*\)\(.*\)/\1$$VERS/" \ < $$S > $$T ; \ @@ -300,14 +308,14 @@ www:: fi ; \ chmod a-w $$NAME ; \ if [ -f $$DNAME ]; then \ - echo -n "WARNING: $$DNAME already exists! Overwrite? "; \ + /bin/echo -n "WARNING: $$DNAME already exists! Overwrite? "; \ read line; \ if [ "x$$line" != "xyes" -a "x$$line" != "xy" ]; then \ exit 1 ; \ fi ; \ fi ; \ if [ -f $$DNAME2 ]; then \ - echo -n "WARNING: $$DNAME2 already exists! Overwrite? "; \ + /bin/echo -n "WARNING: $$DNAME2 already exists! Overwrite? "; \ read line; \ if [ "x$$line" != "xyes" -a "x$$line" != "xy" ]; then \ exit 1 ; \ @@ -319,22 +327,24 @@ 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` ; \ - 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 ; \ -true cvs add -kb $$BNAME $$BNAME2 ; \ + 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 ; \ \ @@ -343,7 +353,7 @@ true cvs add -kb $$BNAME $$BNAME2 ; \ cvs diff -U0 changelog.html ; \ set +x ; \ \ - echo -n "Ok? "; \ + /bin/echo -n "Ok? "; \ read line; \ if [ "x$$line" != "xyes" -a "x$$line" != "xy" ]; then \ exit 1 ; \ @@ -351,26 +361,10 @@ true cvs add -kb $$BNAME $$BNAME2 ; \ \ 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:: @ \ - echo -n "Current hack count: " ; \ + /bin/echo -n "Current hack count: " ; \ ( ( cd hacks; make -s INSTALL=true install-program install-scripts ) ; \ ( cd hacks/glx; make -s INSTALL=true install-program ) ) | \ grep true | \