projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://www.mirrorservice.org/sites/master.us.finkmirrors.net/distfiles/md5/fa43fdd68d...
[xscreensaver]
/
Makefile.in
diff --git
a/Makefile.in
b/Makefile.in
index 6fe2ba0ec3e652d872185de6943611853bc4d399..5711b06321b6a5e1e60fdb2db8bdebcda4069c4b 100644
(file)
--- a/
Makefile.in
+++ b/
Makefile.in
@@
-6,12
+6,14
@@
srcdir = @srcdir@
VPATH = @srcdir@
SHELL = /bin/sh
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 \
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
MAKE_SUBDIR = for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) $@) || exit 5; done
TAR = tar
MAKE_SUBDIR = for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) $@) || exit 5; done
@@
-20,38
+22,38
@@
default::
@$(MAKE_SUBDIR)
all::
@$(MAKE_SUBDIR)
@$(MAKE_SUBDIR)
all::
@$(MAKE_SUBDIR)
-install:
+install:
:
@$(MAKE_SUBDIR)
@$(MAKE_SUBDIR)
-install-program:
+install-program:
:
@$(MAKE_SUBDIR)
@$(MAKE_SUBDIR)
-install-man:
+install-man:
:
@$(MAKE_SUBDIR)
@$(MAKE_SUBDIR)
-install-strip:
+install-strip:
:
@$(MAKE_SUBDIR)
@$(MAKE_SUBDIR)
-uninstall:
+uninstall:
:
@$(MAKE_SUBDIR)
@$(MAKE_SUBDIR)
-uninstall-program:
+uninstall-program:
:
@$(MAKE_SUBDIR)
@$(MAKE_SUBDIR)
-uninstall-man:
+uninstall-man:
:
@$(MAKE_SUBDIR)
@$(MAKE_SUBDIR)
-depend:
+depend:
:
@$(MAKE_SUBDIR)
@$(MAKE_SUBDIR)
-distdepend:
+distdepend:
:
@$(MAKE) update_spec_version
@$(MAKE_SUBDIR)
@$(MAKE) update_spec_version
@$(MAKE_SUBDIR)
-TAGS: tags
-tags:
+TAGS:
:
tags
+tags:
:
@$(MAKE_SUBDIR)
@$(MAKE_SUBDIR)
-clean:
+clean:
:
@$(MAKE_SUBDIR)
@$(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)
@$(MAKE_SUBDIR)
-dist: tar
+dist:
:
tar
# This really makes me sick...
# This really makes me sick...
-tar:
+tar:
:
@ \
sh config.status ; \
rm -f configure ; \
@ \
sh config.status ; \
rm -f configure ; \
@@
-60,9
+62,11
@@
tar:
sh xscreensaver.lsm.sh > xscreensaver.lsm.$$$$ ; \
mv xscreensaver.lsm.$$$$ xscreensaver.lsm ; \
NAME=`sed -n \
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= ; \
rm -rf $$NAME ; ln -s . $$NAME ; \
FILES= ; \
+ ADIR=archive/ ; \
for subdir in $(SUBDIRS) ; do \
d=`pwd` ; \
cd $$subdir ; \
for subdir in $(SUBDIRS) ; do \
d=`pwd` ; \
cd $$subdir ; \
@@
-71,8
+75,8
@@
tar:
| sed \"s|^|$$subdir/|g;s| | $$subdir/|g\" \
` "; \
cd $$d ; done ; \
| sed \"s|^|$$subdir/|g;s| | $$subdir/|g\" \
` "; \
cd $$d ; done ; \
- echo creating tar file $$
{NAME}.tar.gz... ;
\
- GZIP="-9v" $(TAR) -vchzf $$
{NAME}.tar.gz
\
+ 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
`echo $(TARFILES) $$FILES | sed "s|^|$$NAME/|g; s| | $$NAME/|g" ` ; \
rm $$NAME
@@
-127,11
+131,12
@@
bump-version::
NEW=`echo $$MINOR + 1 | bc` ; \
NEW=`echo $$NEW | sed 's/^\([0-9]\)$$/0\1/'` ; \
D=`date '+%d-%b-%Y'`; \
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."; \
+ ADIR=archive/ ; \
+ if [ ! -f $${ADIR}xscreensaver-$$MAJOR.$$MINOR.tar.gz ]; then \
+ echo "WARNING: $${ADIR}xscreensaver-$$MAJOR.$$MINOR.tar.gz does not exist.";\
fi ; \
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; \
fi ; \
echo -n "Bumping $$MAJOR.$$MINOR to $$MAJOR.$$NEW ($$D), ok? "; \
read line; \
@@
-154,7
+159,7
@@
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` ; \
@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/^\(%define.version[^0-9]*\)\(.*\)/\1$$V/" \
< $$S > $$T ; \
T=/tmp/xs.$$$$ ; \
sed "s/^\(%define.version[^0-9]*\)\(.*\)/\1$$V/" \
< $$S > $$T ; \
@@
-171,17
+176,24
@@
rpm::
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'` ; \
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 ) ; \
rm -rf $$DIR ; \
mkdir $$DIR ; \
( cd $$DIR; mkdir BUILD RPMS RPMS/$$ARCH SOURCES SPECS SRPMS ) ; \
- cp -p
xscreensaver-$$VERS.tar.gz $$DIR/SOURCES/ ;
\
- rpm
--define "_topdir $$DIR"
\
-
--define "USE_GL yes"
\
-
-v -ba xscreensaver.spec ;
\
+ cp -p
$${ADIR}$$TGZ $$DIR/SOURCES/ ;
\
+ rpm
build --define "_topdir $$DIR"
\
+
--define "USE_GL yes"
\
+
-v -ba xscreensaver.spec ;
\
echo '' ; \
echo 'RPM build complete' ; \
echo '' ; \
echo '' ; \
echo 'RPM build complete' ; \
echo '' ; \
- rm -f $$DIR/
xscreensaver-$$VERS.tar.gz ;
\
+ 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/BUILD/xscreensaver-$$VERS ; \
mv $$DIR/SRPMS/xscreensaver*-$$VERS-*.rpm . ; \
mv $$DIR/RPMS/$$ARCH/xscreensaver*-$$VERS-*.rpm . ; \
@@
-193,7
+205,8
@@
test-tar::
@ \
VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ; \
D=xscreensaver-$$VERS ; \
@ \
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 ; \
if [ ! -f $$NAME ]; then \
echo "$$NAME does not exist! Did you forget to \`make tar'?" ; \
exit 1 ; \
@@
-206,7
+219,7
@@
test-tar::
chmod -R u+w $$D ; \
fi ; \
rm -rf $$D ; \
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 . ; \
cd $$D ; \
chmod -R a-w . ; \
chmod u+w . ; \
@@
-242,22
+255,25
@@
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" ; \
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 ; \
chmod a-w $$NAME ; \
\
if [ ! -f $$NAME ]; then \
echo "$$NAME does not exist! Did you forget to \`make tar'?" ; \
exit 1 ; \
fi ; \
chmod a-w $$NAME ; \
- if [ -f $$D
EST/$$NAME ]; then
\
- echo -n "WARNING: $$D
EST/$$NAME already exists! Overwrite? ";
\
+ if [ -f $$D
NAME ]; then
\
+ echo -n "WARNING: $$D
NAME already exists! Overwrite? ";
\
read line; \
if [ "x$$line" != "xyes" -a "x$$line" != "xy" ]; then \
exit 1 ; \
fi ; \
fi ; \
read line; \
if [ "x$$line" != "xyes" -a "x$$line" != "xy" ]; then \
exit 1 ; \
fi ; \
fi ; \
- cp -p $$NAME $$D
EST/$$NAME ;
\
- chmod u+w $$D
EST/$$NAME ;
\
+ cp -p $$NAME $$D
NAME ;
\
+ chmod u+w $$D
NAME ;
\
cd $$DEST ; \
\
TMP=/tmp/xd.$$$$ ; \
cd $$DEST ; \
\
TMP=/tmp/xd.$$$$ ; \
@@
-276,7
+292,7
@@
www::
else \
set -x ; \
fi ; \
else \
set -x ; \
fi ; \
- cvs add -kb $$
NAME ;
\
+ cvs add -kb $$
BNAME ;
\
cat $$TMP > download.html ; \
rm -f $$TMP ; \
\
cat $$TMP > download.html ; \
rm -f $$TMP ; \
\