X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.in;h=f6f2efb57659ed5f86f3c872f704aafa6ad0e2f6;hb=6a1da724858673ac40aa13a9612340d8bed8c7b9;hp=117470d4992ab3551acfbbcdee9dfa77604ff09c;hpb=c28aecf9fc41e3a03494bacf7279745425e2fa18;p=xscreensaver diff --git a/Makefile.in b/Makefile.in index 117470d4..f6f2efb5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -22,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 ; \ @@ -155,6 +155,10 @@ 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 ; \ @@ -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,12 @@ 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 | \ + wc -l