X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.in;h=67c88cfc70e9c235b2dd46711ab3129ffbc3d2ea;hb=96a411663168b0ba5432b407a83be55f3df0c802;hp=ba7f47d8245ecb107bca435f4c83259768f92ef7;hpb=3f9592851ce4ed76a9979bfdd6ec7dc5c457e183;p=xscreensaver

diff --git a/Makefile.in b/Makefile.in
index ba7f47d8..67c88cfc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -10,8 +10,7 @@ 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 aclocal.m4 \
-		  config.sub makevms.com screenblank.txt \
-		  install-sh \
+		  config.sub makevms.com \
 		  intltool-merge.in intltool-extract.in intltool-update.in \
 		  xscreensaver.lsm.sh xscreensaver.spec \
 
@@ -23,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
+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 ;							    \
@@ -63,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/ ;							    \
@@ -155,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 ;							    \
@@ -187,9 +191,9 @@ rpm::
   mkdir $$DIR ;								   \
   ( cd $$DIR; mkdir BUILD RPMS RPMS/$$ARCH SOURCES SPECS SRPMS ) ;	   \
   cp -p $${ADIR}$$TGZ $$DIR/SOURCES/ ;					   \
-  rpm --define "_topdir $$DIR"						   \
-      --define "USE_GL yes"						   \
-      -v -ba xscreensaver.spec ;					   \
+  rpmbuild --define "_topdir $$DIR"					   \
+           --define "USE_GL yes"					   \
+           -v -ba xscreensaver.spec ;					   \
   echo '' ;								   \
   echo 'RPM build complete' ;						   \
   echo '' ;								   \
@@ -307,3 +311,13 @@ www::
   fi ;									    \
 									    \
   cvs commit -m "$$VERS"
+
+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