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

diff --git a/Makefile.in b/Makefile.in
index 67c88cfc..aa233b8a 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-2010 Jamie Zawinski.
 # the `../configure' script generates `Makefile' from this file.
 
 @SET_MAKE@
@@ -6,17 +6,21 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 SHELL		= /bin/sh
-SUBDIRS		= utils driver hacks hacks/glx po
-TARFILES	= README README.VMS README.debugging INSTALL xscreensaver.lsm \
+SUBDIRS 	= utils driver hacks hacks/glx po
+#SUBDIRS 	= utils driver hacks hacks/glx
+SUBDIRS2	= $(SUBDIRS) OSX
+TARFILES	= README README.hacking README.VMS INSTALL \
 		  configure configure.in Makefile.in config.h.in \
 		  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 \
+		  xscreensaver.spec \
+		  xscreensaver.xcodeproj/project.pbxproj
 
 TAR		= tar
 
-MAKE_SUBDIR = for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) $@) || exit 5; done
+MAKE_SUBDIR  = for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit 5; done
+MAKE_SUBDIR2 = for dir in $(SUBDIRS2); do $(MAKE) -C $$dir $@ || exit 5; done
 
 default::
 	@$(MAKE_SUBDIR)
@@ -40,15 +44,19 @@ depend::
 	@$(MAKE_SUBDIR)
 distdepend::
 	@$(MAKE) update_spec_version
-	@$(MAKE_SUBDIR)
+	@$(MAKE_SUBDIR2)
+	@$(MAKE) -C po update-po
+
 TAGS:: tags
 tags::
 	@$(MAKE_SUBDIR)
+
 clean::
-	@$(MAKE_SUBDIR)
+	@$(MAKE_SUBDIR2)
+
 distclean:: clean
 	-rm -f config.h Makefile config.status config.cache config.log TAGS *~ "#"* intltool-extract intltool-merge intltool-update
-	@$(MAKE_SUBDIR)
+	@$(MAKE_SUBDIR2)
 
 dist:: tar
 
@@ -58,16 +66,13 @@ tar::
   sh config.status ;							    \
   rm -f configure ;							    \
   $(MAKE) configure ;							    \
-  $(MAKE) distdepend ;							    \
-  sh xscreensaver.lsm.sh > xscreensaver.lsm.$$$$ ;			    \
-  mv xscreensaver.lsm.$$$$ xscreensaver.lsm ;				    \
-  NAME=`sed -n								    \
-  's/[^0-9]*\([0-9]\.[0-9][0-9]*b\?[0-9]*\).*/xscreensaver-\1/p' 	    \
-	utils/version.h` ;						    \
+  $(MAKE) version-date distdepend ;					    \
+  VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' utils/version.h` ;  \
+  NAME="xscreensaver-$$VERS" ;						    \
   rm -rf $$NAME ; ln -s . $$NAME ;					    \
   FILES= ;								    \
   ADIR=archive/ ;							    \
-  for subdir in $(SUBDIRS) ; do						    \
+  for subdir in $(SUBDIRS2) ; do					    \
     d=`pwd` ;								    \
     cd $$subdir ;							    \
     FILES="$$FILES `$(MAKE) echo_tarfiles				    \
@@ -76,7 +81,8 @@ tar::
       ` ";								    \
     cd $$d ; done ;							    \
   echo creating tar file $$ADIR$$NAME.tar.gz... ;			    \
-  GZIP="-9v" $(TAR) -vchzf $$ADIR$$NAME.tar.gz			            \
+  export COPYFILE_DISABLE=true ;					    \
+  GZIP="-9v" $(TAR) -vczf $$ADIR$$NAME.tar.gz			            \
     `echo $(TARFILES) $$FILES | sed "s|^|$$NAME/|g; s| | $$NAME/|g" ` ;	    \
   rm $$NAME
 
@@ -90,6 +96,7 @@ tar::
 #
 configure::
 	autoconf
+	autoheader
 	@TMP=configure.$$$$ ;						     \
 	echo "munging configure's --help message..." ;			     \
 	( perl -e '							     \
@@ -100,8 +107,6 @@ configure::
 		s/^(Configuration:)$$/\n$$1\n/m;			     \
 		s/^(Directory and file names:)$$/\n$$1\n/m;		     \
 		s/^  --sbindir=.*\n//m;					     \
-		s/^  --libexecdir.*\n//m;				     \
-		s/^  --datadir.*\n.*\n//m;				     \
 		s/^  --sysconfdir.*\n//m;				     \
 		s/^  --sharedstatedir.*\n.*\n//m;			     \
 		s/^  --localstatedir.*\n//m;				     \
@@ -116,6 +121,10 @@ configure::
  --x-includes=DIR        X include files are in DIR\n \
  --x-libraries=DIR       X library files are in DIR/m; \
 									     \
+		s@mandir=.\$${prefix}/man.@mandir=\\\$${datadir}/man@;       \
+									     \
+		s@rm -f conftest@rm -rf conftest@g;			     \
+									     \
 		print;'							     \
 	< configure							     \
 	> $$TMP &&							     \
@@ -125,7 +134,7 @@ configure::
 bump-version::
 	@								    \
   SRC=utils/version.h ;							    \
-  VERS=`sed -n 's/[^0-9]*\([0-9]\)\.\([0-9][0-9]*\).*/\1 \2/p' $$SRC` ;	    \
+  VERS=`sed -n 's/[^0-9]*\([0-9]\)\.\([0-9][^. ]*\).*/\1 \2/p' $$SRC` ;	    \
   set - $$VERS ;							    \
   MAJOR="$$1"; MINOR="$$2";						    \
   NEW=`echo $$MINOR + 1 | bc` ;						    \
@@ -138,7 +147,7 @@ bump-version::
   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? ";	    \
+  /bin/echo -n "Bumping $$MAJOR.$$MINOR to $$MAJOR.$$NEW ($$D), ok? ";	    \
   read line;								    \
   if [ "x$$line" != "xyes" -a  "x$$line" != "xy" ]; then		    \
     exit 1 ; 								    \
@@ -147,7 +156,7 @@ bump-version::
   sed -e "s/\([0-9]\.[0-9][0-9]*\)/$$MAJOR.$$NEW/"			    \
       -e "s/\(([0-9][0-9]*-[A-Za-z][a-z][a-z]-[0-9][0-9][0-9]*\))/($$D)/"   \
         $$SRC > $$TMP ;							    \
-  echo -n "New version and date are ";					    \
+  /bin/echo -n "New version and date are ";				    \
   sed -n "s/[^0-9]*\([0-9]\.[0-9][0-9]*\) (\([-A-Za-z0-9]*\)).*/\1, \2./p"  \
      $$TMP;								    \
   cat $$TMP > $$SRC ;							    \
@@ -159,13 +168,29 @@ bump_version:: bump-version
 tick-version:: bump-version
 tick_version:: bump-version
 
+version-date::
+	@								    \
+  SRC=utils/version.h ;							    \
+  D=`date '+%d-%b-%Y'`;							    \
+  TMP=/tmp/bv.$$ ;							    \
+  sed -e "s/([0-9][^()]*)/($$D)/" < $$SRC > $$TMP ;			    \
+  /bin/echo -n "Updating date in $$SRC to \"$$D\"... " ;		    \
+  if cmp -s $$SRC $$TMP ; then						    \
+    echo "unchanged." ;							    \
+  else									    \
+    cat $$TMP > $$SRC ;							    \
+    echo "done." ;							    \
+  fi ;									    \
+  rm -f $$TMP
+
+
 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 $$S to \"$$V\"... " ;				    \
+	VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' < $$U` ;	    \
+	/bin/echo -n "Updating $$S to \"$$VERS\"... " ;			    \
 	T=/tmp/xs.$$$$ ;						    \
-	sed "s/^\(%define.version[^0-9]*\)\(.*\)/\1$$V/"		    \
+	sed "s/^\(%define.version[^0-9]*\)\(.*\)/\1$$VERS/"		    \
 	  < $$S > $$T ;							    \
 	if cmp -s $$S $$T ; then					    \
 	  echo "unchanged." ;						    \
@@ -177,7 +202,7 @@ update_spec_version::
 
 rpm::
 	@								   \
-  VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ; \
+  VERS=`sed -n 's/[^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/ ;							   \
@@ -207,7 +232,7 @@ rpm::
 
 test-tar::
 	@								    \
-  VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ;  \
+  VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' utils/version.h` ;  \
   D=xscreensaver-$$VERS ;						    \
   ADIR=archive/ ;							    \
   NAME="$${ADIR}$$D.tar.gz" ;						    \
@@ -253,58 +278,79 @@ test-tar::
 									    \
   chmod -R u+w .
 
+dmg::
+	$(MAKE) -C OSX release dmg
 
 www::
 	@								    \
   DEST=$$HOME/www/xscreensaver ;					    \
-  VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ;  \
+  VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' utils/version.h` ;  \
   HEAD="xscreensaver-$$VERS" ;						    \
   ADIR=archive/ ;							    \
   BNAME="$$HEAD.tar.gz" ;						    \
   NAME="$$ADIR$$BNAME" ;						    \
   DNAME="$$DEST/$$HEAD.tar.gz" ;					    \
+  BNAME2="$$HEAD.dmg" ;							    \
+  NAME2="$$ADIR$$BNAME2" ;						    \
+  DNAME2="$$DEST/$$HEAD.dmg" ;						    \
 									    \
   if [ ! -f $$NAME ]; then						    \
     echo "$$NAME does not exist!  Did you forget to \`make tar'?" ;	    \
     exit 1 ; 								    \
   fi ;									    \
+  if [ ! -f $$NAME2 ]; then						    \
+    echo "$$NAME2 does not exist!  Did you forget to \`make dmg'?" ;	    \
+    exit 1 ; 								    \
+  fi ;									    \
   chmod a-w $$NAME ;							    \
   if [ -f $$DNAME ]; then						    \
-    echo -n "WARNING: $$DNAME already exists!  Overwrite? ";		    \
+    /bin/echo -n "WARNING: $$DNAME already exists!  Overwrite? ";	    \
+    read line;								    \
+    if [ "x$$line" != "xyes" -a "x$$line" != "xy" ]; then		    \
+      exit 1 ; 								    \
+    fi ;								    \
+  fi ;									    \
+  if [ -f $$DNAME2 ]; then						    \
+    /bin/echo -n "WARNING: $$DNAME2 already exists!  Overwrite? ";	    \
     read line;								    \
     if [ "x$$line" != "xyes" -a "x$$line" != "xy" ]; then		    \
       exit 1 ; 								    \
     fi ;								    \
   fi ;									    \
   cp -p $$NAME $$DNAME ;						    \
-  chmod u+w $$DNAME ;							    \
+  cp -p $$NAME2 $$DNAME2 ;						    \
+  chmod u+w $$DNAME $$DNAME2 ;						    \
   cd $$DEST ;								    \
 									    \
   TMP=/tmp/xd.$$$$ ;							    \
-  sed "s/xscreensaver-[0-9]\.[0-9][0-9]*/$$HEAD/g" download.html > $$TMP ;  \
+  sed "s/xscreensaver-5\.[0-9][0-9ab]*/$$HEAD/g" download.html > $$TMP ;    \
   echo '' ;								    \
-  diff -u0 download.html $$TMP ;					    \
+  diff -U0 download.html $$TMP ;					    \
   echo '' ;								    \
 									    \
-  OLDEST=`ls xscreensaver*.tar.gz | head -1` ;				    \
-  echo -n "Delete $$DEST/$$OLDEST? ";					    \
-  read line;								    \
-  if [ "x$$line" = "xyes" -o "x$$line" = "xy" ]; then			    \
-    set -x ;								    \
-    rm $$OLDEST ;							    \
-    cvs remove $$OLDEST ;						    \
-  else									    \
-    set -x ;								    \
-  fi ;									    \
-  cvs add -kb $$BNAME ;							    \
+  for EXT in tar.gz dmg ; do						    \
+    OLDEST=`ls xscreensaver*.$$EXT | 					    \
+      fgrep -v 5.14 |							    \
+      head -n 1` ;							    \
+    /bin/echo -n "Delete $$DEST/$$OLDEST? ";				    \
+    read line;								    \
+    if [ "x$$line" = "xyes" -o "x$$line" = "xy" ]; then			    \
+      set -x ;								    \
+      rm $$OLDEST ;							    \
+      cvs remove $$OLDEST ;						    \
+      set +x ;								    \
+    fi ;								    \
+  done ;								    \
+  set -x ;								    \
+  cvs add -kb $$BNAME $$BNAME2 ;					    \
   cat $$TMP > download.html ;						    \
   rm -f $$TMP ;								    \
 									    \
-  (cd ..; $(MAKE) xscreensaver/changelog.html );			    \
-  cvs diff -u0 changelog.html ;						    \
+  $(MAKE) -C ../ xscreensaver/changelog.html xscreensaver/screenshots/index.html; \
+  cvs diff -U0 changelog.html ;						    \
   set +x ;								    \
 									    \
-  echo -n "Ok? ";							    \
+  /bin/echo -n "Ok? ";							    \
   read line;								    \
   if [ "x$$line" != "xyes" -a "x$$line" != "xy" ]; then			    \
     exit 1 ;								    \
@@ -312,9 +358,10 @@ www::
 									    \
   cvs commit -m "$$VERS"
 
+
 count::
 	@ \
-  echo -n "Current hack count: " ; \
+  /bin/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 | \