X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=Makefile.in;h=e085de53a6fd9cefb244db1a1ad7aa3cc1a14480;hp=10235b17e97896ecd373fb8ed8e4f019fcc7c877;hb=ffd8c0873576a9e3065696a624dce6b766b77062;hpb=a719ec12b8b2563112366a8ac3196816fd64d2c7 diff --git a/Makefile.in b/Makefile.in index 10235b17..e085de53 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in --- xscreensaver, Copyright (c) 1999 Jamie Zawinski. +# Makefile.in --- xscreensaver, Copyright (c) 1999-2004 Jamie Zawinski. # the `../configure' script generates `Makefile' from this file. @SET_MAKE@ @@ -6,54 +6,54 @@ srcdir = @srcdir@ VPATH = @srcdir@ SHELL = /bin/sh -SUBDIRS = utils driver hacks hacks/glx +SUBDIRS = utils driver hacks hacks/glx po TARFILES = README README.VMS README.debugging INSTALL xscreensaver.lsm \ configure configure.in Makefile.in config.h.in \ - config.h-vms install-sh setup.com config.guess \ - config.sub makevms.com screenblank.txt \ - xscreensaver.lsm.sh xscreensaver.spec + config.h-vms install-sh setup.com config.guess aclocal.m4 \ + config.sub makevms.com \ + intltool-merge.in intltool-extract.in intltool-update.in \ + xscreensaver.lsm.sh xscreensaver.spec \ + TAR = tar -COMPRESS = gzip --verbose --best -COMPRESS_EXT = gz -# COMPRESS = compress -# COMPRESS_EXT = Z MAKE_SUBDIR = for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) $@) || exit 5; done +default:: + @$(MAKE_SUBDIR) all:: @$(MAKE_SUBDIR) -install: +install:: @$(MAKE_SUBDIR) -install-program: +install-program:: @$(MAKE_SUBDIR) -install-man: +install-man:: @$(MAKE_SUBDIR) -install-strip: +install-strip:: @$(MAKE_SUBDIR) -uninstall: +uninstall:: @$(MAKE_SUBDIR) -uninstall-program: +uninstall-program:: @$(MAKE_SUBDIR) -uninstall-man: +uninstall-man:: @$(MAKE_SUBDIR) -depend: +depend:: @$(MAKE_SUBDIR) -distdepend: +distdepend:: @$(MAKE) update_spec_version @$(MAKE_SUBDIR) -TAGS: tags -tags: +TAGS:: tags +tags:: @$(MAKE_SUBDIR) -clean: +clean:: @$(MAKE_SUBDIR) -distclean: clean - -rm -f config.h Makefile config.status config.cache config.log TAGS *~ "#"* +distclean:: clean + -rm -f config.h Makefile config.status config.cache config.log TAGS *~ "#"* intltool-extract intltool-merge intltool-update @$(MAKE_SUBDIR) -dist: tar +dist:: tar # This really makes me sick... -tar: +tar:: @ \ sh config.status ; \ rm -f configure ; \ @@ -62,9 +62,11 @@ tar: sh xscreensaver.lsm.sh > xscreensaver.lsm.$$$$ ; \ mv xscreensaver.lsm.$$$$ xscreensaver.lsm ; \ NAME=`sed -n \ - 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/xscreensaver-\1/p' utils/version.h` ; \ + 's/[^0-9]*\([0-9]\.[0-9][0-9]*b\?[0-9]*\).*/xscreensaver-\1/p' \ + utils/version.h` ; \ rm -rf $$NAME ; ln -s . $$NAME ; \ FILES= ; \ + ADIR=archive/ ; \ for subdir in $(SUBDIRS) ; do \ d=`pwd` ; \ cd $$subdir ; \ @@ -73,10 +75,9 @@ tar: | sed \"s|^|$$subdir/|g;s| | $$subdir/|g\" \ ` "; \ cd $$d ; done ; \ - echo creating tar file $${NAME}.tar.$(COMPRESS_EXT)... ; \ - $(TAR) -vchf - \ - `echo $(TARFILES) $$FILES | sed "s|^|$$NAME/|g; s| | $$NAME/|g" ` \ - | $(COMPRESS) > $${NAME}.tar.$(COMPRESS_EXT) ; \ + echo creating tar file $$ADIR$$NAME.tar.gz... ; \ + GZIP="-9v" $(TAR) -vchzf $$ADIR$$NAME.tar.gz \ + `echo $(TARFILES) $$FILES | sed "s|^|$$NAME/|g; s| | $$NAME/|g" ` ; \ rm $$NAME @@ -129,12 +130,13 @@ bump-version:: MAJOR="$$1"; MINOR="$$2"; \ NEW=`echo $$MINOR + 1 | bc` ; \ NEW=`echo $$NEW | sed 's/^\([0-9]\)$$/0\1/'` ; \ - D=`date '+%d-%b-%y'`; \ - if [ ! -f xscreensaver-$$MAJOR.$$MINOR.tar.gz ]; then \ - echo "WARNING: xscreensaver-$$MAJOR.$$MINOR.tar.gz does not exist."; \ + D=`date '+%d-%b-%Y'`; \ + ADIR=archive/ ; \ + if [ ! -f $${ADIR}xscreensaver-$$MAJOR.$$MINOR.tar.gz ]; then \ + echo "WARNING: $${ADIR}xscreensaver-$$MAJOR.$$MINOR.tar.gz does not exist.";\ fi ; \ - if [ -f xscreensaver-$$MAJOR.$$NEW.tar.gz ]; then \ - echo "WARNING: xscreensaver-$$MAJOR.$$NEW.tar.gz already exists."; \ + 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? "; \ read line; \ @@ -153,13 +155,17 @@ bump-version:: echo "overwrote $$SRC"; \ ls -lFd $$SRC +bump_version:: bump-version +tick-version:: bump-version +tick_version:: bump-version + update_spec_version:: @S=$(srcdir)/xscreensaver.spec ; \ U=$(srcdir)/utils/version.h ; \ V=`sed -n 's/.*\([0-9][0-9]*\.[0-9]*\).*/\1/p' < $$U` ; \ - echo -n "Updating version number in $$S to \"$$V\"... " ; \ + echo -n "Updating $$S to \"$$V\"... " ; \ T=/tmp/xs.$$$$ ; \ - sed "s/^\(Version:[^0-9]*\)\(.*\)/\1$$V/" \ + sed "s/^\(%define.version[^0-9]*\)\(.*\)/\1$$V/" \ < $$S > $$T ; \ if cmp -s $$S $$T ; then \ echo "unchanged." ; \ @@ -170,16 +176,41 @@ update_spec_version:: rm $$T rpm:: - @ \ - VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ; \ - cp -p xscreensaver-$$VERS.tar.gz /usr/src/redhat/SOURCES/ ; \ - rpm -ba xscreensaver.spec + @ \ + VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ; \ + DIR=`pwd`/rpm_build ; \ + ARCH=`rpm --showrc | sed -n 's/^build arch *: //p'` ; \ + ADIR=archive/ ; \ + TGZ=xscreensaver-$$VERS.tar.gz ; \ + if [ ! -f $${ADIR}$$TGZ ]; then \ + echo "$${ADIR}$$TGZ does not exist! Did you forget to \`make tar'?" ; \ + exit 1 ; \ + fi ; \ + rm -rf /var/tmp/xscreensaver-$$VERS-root ; \ + rm -rf $$DIR ; \ + mkdir $$DIR ; \ + ( cd $$DIR; mkdir BUILD RPMS RPMS/$$ARCH SOURCES SPECS SRPMS ) ; \ + cp -p $${ADIR}$$TGZ $$DIR/SOURCES/ ; \ + rpmbuild --define "_topdir $$DIR" \ + --define "USE_GL yes" \ + -v -ba xscreensaver.spec ; \ + echo '' ; \ + echo 'RPM build complete' ; \ + echo '' ; \ + rm -f $$DIR/$$TGZ ; \ + rm -rf $$DIR/BUILD/xscreensaver-$$VERS ; \ + mv $$DIR/SRPMS/xscreensaver*-$$VERS-*.rpm . ; \ + mv $$DIR/RPMS/$$ARCH/xscreensaver*-$$VERS-*.rpm . ; \ + rm -rf $$DIR ; \ + echo '' ; \ + ls -lFG xscreensaver*-$$VERS-*.rpm test-tar:: @ \ VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ; \ D=xscreensaver-$$VERS ; \ - NAME="$$D.tar.gz" ; \ + ADIR=archive/ ; \ + NAME="$${ADIR}$$D.tar.gz" ; \ if [ ! -f $$NAME ]; then \ echo "$$NAME does not exist! Did you forget to \`make tar'?" ; \ exit 1 ; \ @@ -192,42 +223,32 @@ test-tar:: chmod -R u+w $$D ; \ fi ; \ rm -rf $$D ; \ - zcat $$D.tar.gz | tar -xf - ; \ + zcat $${ADIR}$$D.tar.gz | tar -xf - ; \ cd $$D ; \ chmod -R a-w . ; \ chmod u+w . ; \ mkdir BIN ; \ - mkdir BIN/athena ; \ mkdir BIN/motif ; \ mkdir BIN/lesstif ; \ chmod a-w . ; \ \ - ( cd BIN/athena ; \ - CC=cc ; \ - export CC ; \ - ../../configure --with-athena ; \ - echo --------------------------------------------------------------- ; \ - gmake ; \ - echo --------------------------------------------------------------- ); \ - \ ( cd BIN/motif ; \ CC=cc ; \ export CC ; \ ../../configure --without-xpm --without-xdbe --without-xshm \ --with-motif=/usr/local/motif ; \ echo --------------------------------------------------------------- ; \ - gmake ; \ - ( cd driver; gmake xscreensaver-demo-Xaw ) ; \ + gmake all ; \ + ( cd driver; gmake tests ) ; \ echo --------------------------------------------------------------- ); \ \ ( cd BIN/lesstif ; \ CC=cc ; \ export CC ; \ - ../../configure --with-motif=/usr/local/lesstif ; \ + ../../configure --with-motif=/usr/local/lesstif --without-gnome ; \ echo --------------------------------------------------------------- ; \ - ( cd utils; gmake ) ; \ - ( cd driver; gmake ) ; \ - ( cd driver; gmake xscreensaver-demo-Xaw ) ; \ + ( cd utils; gmake all ) ; \ + ( cd driver; gmake all ) ; \ echo --------------------------------------------------------------- ); \ \ chmod -R u+w . @@ -238,27 +259,31 @@ www:: DEST=$$HOME/www/xscreensaver ; \ VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ; \ HEAD="xscreensaver-$$VERS" ; \ - NAME="$$HEAD.tar.gz" ; \ + ADIR=archive/ ; \ + BNAME="$$HEAD.tar.gz" ; \ + NAME="$$ADIR$$BNAME" ; \ + DNAME="$$DEST/$$HEAD.tar.gz" ; \ \ if [ ! -f $$NAME ]; then \ echo "$$NAME does not exist! Did you forget to \`make tar'?" ; \ exit 1 ; \ fi ; \ - if [ -f $$DEST/$$NAME ]; then \ - echo -n "WARNING: $$DEST/$$NAME already exists! Overwrite? "; \ + chmod a-w $$NAME ; \ + if [ -f $$DNAME ]; then \ + echo -n "WARNING: $$DNAME already exists! Overwrite? "; \ read line; \ if [ "x$$line" != "xyes" -a "x$$line" != "xy" ]; then \ exit 1 ; \ fi ; \ fi ; \ - cp -p $$NAME $$DEST/$$NAME ; \ - chmod u+w $$DEST/$$NAME ; \ + cp -p $$NAME $$DNAME ; \ + chmod u+w $$DNAME ; \ cd $$DEST ; \ \ TMP=/tmp/xd.$$$$ ; \ sed "s/xscreensaver-[0-9]\.[0-9][0-9]*/$$HEAD/g" download.html > $$TMP ; \ echo '' ; \ - diff -u0 download.html $$TMP ; \ + diff -U0 download.html $$TMP ; \ echo '' ; \ \ OLDEST=`ls xscreensaver*.tar.gz | head -1` ; \ @@ -271,12 +296,12 @@ www:: else \ set -x ; \ fi ; \ - cvs add -kb $$NAME ; \ + cvs add -kb $$BNAME ; \ cat $$TMP > download.html ; \ rm -f $$TMP ; \ \ (cd ..; $(MAKE) xscreensaver/changelog.html ); \ - cvs diff -u0 changelog.html ; \ + cvs diff -U0 changelog.html ; \ set +x ; \ \ echo -n "Ok? "; \ @@ -286,3 +311,30 @@ www:: fi ; \ \ 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: " ; \ + ( ( cd hacks; make -s INSTALL=true install-program install-scripts ) ; \ + ( cd hacks/glx; make -s INSTALL=true install-program ) ) | \ + grep true | \ + grep -v helper | \ + grep -v ljlatest | \ + wc -l