diff options
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 77 |
1 files changed, 66 insertions, 11 deletions
diff --git a/Makefile.in b/Makefile.in index 42742d3..c713f1f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in --- xscreensaver, Copyright © 1999-2021 Jamie Zawinski. +# Makefile.in --- xscreensaver, Copyright © 1999-2024 Jamie Zawinski. # the `../configure' script generates `Makefile' from this file. @SET_MAKE@ @@ -11,12 +11,14 @@ SUBDIRS = utils jwxyz hacks/images hacks hacks/glx hacks/fonts \ SUBDIRS2 = $(SUBDIRS) OSX android TARFILES = README README.hacking INSTALL \ configure configure.ac Makefile.in config.h.in \ - install-sh config.guess aclocal.m4 \ + install-sh config.guess config.rpath aclocal.m4 \ ax_pthread.m4 config.sub \ intltool-merge.in intltool-extract.in intltool-update.in \ xscreensaver.spec -TAR = tar +TAR = gnutar +TAR_ARGS = --owner=0 --group=0 --posix --no-acls --no-xattrs --no-selinux + # Using $(MAKE) directly means the shell executes things even with "make -n" MAKE2 = $(MAKE) @@ -54,7 +56,7 @@ tags:: @$(MAKE_SUBDIR) clean:: - @$(MAKE_SUBDIR2) + @$(MAKE_SUBDIR) distclean:: clean @$(MAKE_SUBDIR2) @@ -94,7 +96,7 @@ _tar: echo creating tar file $$ADIR$$NAME.tar.gz... ; \ export COPYFILE_DISABLE=true ; \ export GZIP="-9v" ; \ - $(TAR) -vczf $$ADIR$$NAME.tar.gz -T "$$LIST" ; \ + $(TAR) -vczf $$ADIR$$NAME.tar.gz -T "$$LIST" $(TAR_ARGS) ; \ rm "$$LIST" "$$NAME" @@ -205,7 +207,7 @@ bump-version:: \ echo "Updated $$SRC version to \"$$VERS3\"" ; \ \ - $(MAKE) version-date ; \ + $(MAKE2) version-date ; \ ls -lFd $$SRC bump_version:: bump-version @@ -284,6 +286,22 @@ dmg:: apk:: $(MAKE2) -C android apk +# Update the version numbers in faq.html, bugs.html, etc. +www_versions:: + @ \ + DEST=$$HOME/www/xscreensaver ; \ + VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' utils/version.h | \ + head -1` ; \ + TMP=/tmp/xd.$$$$ ; \ + for f in $$DEST/*.html ; do \ + sed "s/\(CLASS=.latest.>\)[^<>]*\(<\)/\1$$VERS\2/gi" < "$$f" > "$$TMP" ;\ + if ! cmp -s "$$f" "$$TMP" ; then \ + diff -U0 "$$f" "$$TMP" ; \ + cp -p "$$TMP" "$$f" ; \ + fi ; \ + rm -f "$$TMP" ; \ + done + www:: @ \ DEST=$$HOME/www/xscreensaver ; \ @@ -306,6 +324,7 @@ www:: exit 1 ; \ fi ; \ \ + $(MAKE2) www_versions ; \ $(MAKE2) -C OSX updates.xml ; \ \ if [ ! -f $$NAME ]; then \ @@ -356,15 +375,16 @@ www:: cd $$DEST ; \ \ TMP=/tmp/xd.$$$$ ; \ - sed "s/xscreensaver-5\.[0-9][0-9ab]*/$$HEAD/g" download.html > $$TMP ; \ + sed "s/xscreensaver-[56]\.[0-9][0-9ab]*/$$HEAD/g" download.html > $$TMP ; \ echo '' ; \ diff -U0 download.html $$TMP ; \ echo '' ; \ \ - for EXT in tar.gz dmg ; do \ + for EXT in tar.gz dmg apk ; do \ OLDEST=`ls xscreensaver*.$$EXT | \ fgrep -v 5.14 | \ fgrep -v 5.34 | \ + fgrep -v 6.00 | \ head -n 1` ; \ /bin/echo -n "Delete $$DEST/$$OLDEST? "; \ read line; \ @@ -409,11 +429,30 @@ count:: echo " Total:" $$C ; \ -#cerebrum:: -# rsync -vax . cerebrum:src/xscreensaver/ \ +# Install symlinks pointing back to the source directory, for debugging. +install_links:: + @ \ + cwd=`pwd` ; \ + for d in $(SUBDIRS) ; do ( \ + cd $$d ; \ + $(MAKE2) install -k INSTALL=true INSTALL_DATA=true \ + INSTALL_DIRS=false SUID_FLAGS= 2>&- | \ + while read s ; do \ + set - $$s ; \ + if [ $$1 = true ]; then \ + a="$$cwd/$$d/$$2" ; \ + b="$$3" ; \ + a=`echo "$$a" | sed -e 's@/\./@/@' \ + -e 's@/[^/]*/\.\./@/@'` ; \ + echo "ln -sf $$a $$b" ; \ + ln -sf "$$a" "$$b" ; \ + fi ; \ + done ; \ + ) ; done + cerebrum:: - rsync -vax . pi@10.0.1.19:xscreensaver/ \ + rsync -vax . 10.0.1.12:xscreensaver/ \ --omit-dir-times \ --delete-during \ --exclude .git \ @@ -428,6 +467,10 @@ cerebrum:: --include xscreensaver-getimage-file \ --include xscreensaver-getimage-video \ --include xscreensaver-text \ + --exclude xscreensaver-5.45 \ + --exclude xscreensaver-6.00 \ + --exclude xscreensaver-6.01 \ + --exclude xscreensaver-6.02 \ --exclude '*~' \ --include '*.asm' \ --include '*.c' \ @@ -446,7 +489,19 @@ cerebrum:: --include '*.ttf' \ --include '*.otf' \ --include '*.ui' \ + --include '*.sh' \ + --include '*.pl' \ + --include '*.spec' \ + --include '*.ad' \ --include 'configure*' \ + --include 'config.sub' \ + --include 'config.guess' \ + --include 'config.rpath' \ + --include 'install-sh' \ + --include 'bin2c' \ + --include 'ad2c' \ + --include 'vidwhacker' \ + --include 'webcollage' \ --include '*/' \ --exclude '*' |