[netperf-dev] netperf2 commit notice r73 - trunk

[raj at netperf.org]

Author: raj
Date: 2006-04-18 14:20:49 -0700 (Tue, 18 Apr 2006)
New Revision: 73

Modified:
   trunk/Makefile.am
   trunk/Makefile.in
   trunk/Release_Notes
   trunk/configure
   trunk/configure.ac
Log:
Fix some typos, add a dist-hook to remove .svn/'s from the tar file and
build a .zip file to make life easier on Windows folks.  Amazing what one
can learn from reading the automake documentation :)


Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2006-04-17 21:39:33 UTC (rev 72)
+++ trunk/Makefile.am	2006-04-18 21:20:49 UTC (rev 73)
@@ -1,2 +1,5 @@
 SUBDIRS = src doc
 EXTRA_DIST =  m4/ README.* Release_Notes inet_ntop.c
+
+dist-hook:
+	rm -rf `find $(distdir) -name .svn`
\ No newline at end of file

Modified: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in	2006-04-17 21:39:33 UTC (rev 72)
+++ trunk/Makefile.in	2006-04-18 21:20:49 UTC (rev 73)
@@ -355,6 +355,9 @@
 	      || exit 1; \
 	  fi; \
 	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@@ -364,8 +367,15 @@
 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
 
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__remove_distdir)
+
 dist dist-all: distdir
 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
 	$(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
@@ -505,13 +515,13 @@
 
 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
 	clean-generic clean-recursive ctags ctags-recursive dist \
-	dist-all dist-gzip distcheck distclean distclean-generic \
-	distclean-hdr distclean-recursive distclean-tags distcleancheck \
-	distdir distuninstallcheck dvi dvi-am dvi-recursive info \
-	info-am info-recursive install install-am install-data \
-	install-data-am install-data-recursive install-exec \
-	install-exec-am install-exec-recursive install-info \
-	install-info-am install-info-recursive install-man \
+	dist-all dist-gzip dist-zip distcheck distclean \
+	distclean-generic distclean-hdr distclean-recursive \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am dvi-recursive info info-am info-recursive install \
+	install-am install-data install-data-am install-data-recursive \
+	install-exec install-exec-am install-exec-recursive \
+	install-info install-info-am install-info-recursive install-man \
 	install-recursive install-strip installcheck installcheck-am \
 	installdirs installdirs-am installdirs-recursive \
 	maintainer-clean maintainer-clean-generic \
@@ -520,6 +530,9 @@
 	ps-recursive tags tags-recursive uninstall uninstall-am \
 	uninstall-info-am uninstall-info-recursive uninstall-recursive
 
+
+dist-hook:
+	rm -rf `find $(distdir) -name .svn`
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Modified: trunk/Release_Notes
===================================================================
--- trunk/Release_Notes	2006-04-17 21:39:33 UTC (rev 72)
+++ trunk/Release_Notes	2006-04-18 21:20:49 UTC (rev 73)
@@ -24,7 +24,7 @@
    HP-UX.
 
 *) The netcpu_sysctl method becomes calibration-free, courtesy of 
-   Adnrew Gallatin
+   Andrew Gallatin
 
 These are the Release Notes for Revision 2.4.1 of netperf:
 

Modified: trunk/configure
===================================================================
--- trunk/configure	2006-04-17 21:39:33 UTC (rev 72)
+++ trunk/configure	2006-04-18 21:20:49 UTC (rev 73)
@@ -1688,8 +1688,8 @@
 
 
 # Define the identity of the package.
- PACKAGE=netperf
- VERSION=2.4.2
+ PACKAGE='netperf'
+ VERSION='2.4.2'
 
 
 cat >>confdefs.h <<_ACEOF

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-04-17 21:39:33 UTC (rev 72)
+++ trunk/configure.ac	2006-04-18 21:20:49 UTC (rev 73)
@@ -10,7 +10,7 @@
 # use the target version rather than host - one day we may want cross-compile
 AC_CANONICAL_TARGET
 AC_CONFIG_SRCDIR([src/hist.h])
-AM_INIT_AUTOMAKE(netperf, 2.4.2)
+AM_INIT_AUTOMAKE([dist-zip])
 AM_CONFIG_HEADER(config.h)
 # AC_CONFIG_HEADER(config.h)