X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=Makefile.in;h=e085de53a6fd9cefb244db1a1ad7aa3cc1a14480;hp=c310f27ad91f913082c1432e5fd29d22a01c19ba;hb=ffd8c0873576a9e3065696a624dce6b766b77062;hpb=a1d41b2aa6e18bf9a49b914a99dda8232c5d7762

diff --git a/Makefile.in b/Makefile.in
index c310f27a..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,12 +6,14 @@ 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
 
 MAKE_SUBDIR = for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) $@) || exit 5; done
@@ -20,38 +22,38 @@ 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 ;							    \
@@ -60,7 +62,8 @@ 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/ ;							    \
@@ -73,7 +76,7 @@ tar:
       ` ";								    \
     cd $$d ; done ;							    \
   echo creating tar file $$ADIR$$NAME.tar.gz... ;			    \
-  GZIP="-9v" $(TAR) -vchzf $$ADIR$$NAME.tar.gz			    \
+  GZIP="-9v" $(TAR) -vchzf $$ADIR$$NAME.tar.gz			            \
     `echo $(TARFILES) $$FILES | sed "s|^|$$NAME/|g; s| | $$NAME/|g" ` ;	    \
   rm $$NAME
 
@@ -152,11 +155,15 @@ 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/^\(%define.version[^0-9]*\)\(.*\)/\1$$V/"		    \
 	  < $$S > $$T ;							    \
@@ -174,17 +181,23 @@ rpm::
   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}xscreensaver-$$VERS.tar.gz $$DIR/SOURCES/ ;		   \
-  rpm --define "_topdir $$DIR"						   \
-      --define "USE_GL yes"						   \
-      -v -ba xscreensaver.spec ;					   \
+  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/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 . ;			   \
@@ -270,7 +283,7 @@ www::
   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` ;				    \
@@ -288,7 +301,7 @@ www::
   rm -f $$TMP ;								    \
 									    \
   (cd ..; $(MAKE) xscreensaver/changelog.html );			    \
-  cvs diff -u0 changelog.html ;						    \
+  cvs diff -U0 changelog.html ;						    \
   set +x ;								    \
 									    \
   echo -n "Ok? ";							    \
@@ -298,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