[netperf-dev] netperf2 commit notice r112 - in trunk: . src
raj at netperf.org
raj at netperf.org
Mon May 14 10:00:39 PDT 2007
Author: raj
Date: 2007-05-14 10:00:37 -0700 (Mon, 14 May 2007)
New Revision: 112
Modified:
trunk/AUTHORS
trunk/Makefile.in
trunk/Release_Notes
trunk/configure
trunk/configure.ac
trunk/src/Makefile.am
trunk/src/Makefile.in
Log:
generate netperf_version.h via configure
Modified: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS 2007-04-25 21:53:20 UTC (rev 111)
+++ trunk/AUTHORS 2007-05-14 17:00:37 UTC (rev 112)
@@ -197,4 +197,7 @@
Patches to enable demo mode in the UDP_STREAM test
Emir Halepovic
-Feedback on the manual
\ No newline at end of file
+Feedback on the manual
+
+Kouhei Sutou
+Generate netperf_version.h via configure rather than makefile
\ No newline at end of file
Modified: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in 2007-04-25 21:53:20 UTC (rev 111)
+++ trunk/Makefile.in 2007-05-14 17:00:37 UTC (rev 112)
@@ -325,6 +325,7 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
+ $(mkinstalldirs) $(distdir)/src
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
Modified: trunk/Release_Notes
===================================================================
--- trunk/Release_Notes 2007-04-25 21:53:20 UTC (rev 111)
+++ trunk/Release_Notes 2007-05-14 17:00:37 UTC (rev 112)
@@ -10,7 +10,6 @@
added. The -V option will cause netperf/netserver to display its
version and exit.
-
*) Setting -I without setting -i will now implicitly set the iteration
minimum aand maximums as if a -i 10,3 were set. Also, some further
sanity checking on the bounds for each is made.
Modified: trunk/configure
===================================================================
--- trunk/configure 2007-04-25 21:53:20 UTC (rev 111)
+++ trunk/configure 2007-05-14 17:00:37 UTC (rev 112)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for netperf 2.4.4pre.
+# Generated by GNU Autoconf 2.61 for netperf 2.4.4pre2.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -572,8 +572,8 @@
# Identity of this package.
PACKAGE_NAME='netperf'
PACKAGE_TARNAME='netperf'
-PACKAGE_VERSION='2.4.4pre'
-PACKAGE_STRING='netperf 2.4.4pre'
+PACKAGE_VERSION='2.4.4pre2'
+PACKAGE_STRING='netperf 2.4.4pre2'
PACKAGE_BUGREPORT=''
ac_unique_file="src/hist.h"
@@ -1216,7 +1216,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures netperf 2.4.4pre to adapt to many kinds of systems.
+\`configure' configures netperf 2.4.4pre2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1287,7 +1287,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of netperf 2.4.4pre:";;
+ short | recursive ) echo "Configuration of netperf 2.4.4pre2:";;
esac
cat <<\_ACEOF
@@ -1389,7 +1389,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-netperf configure 2.4.4pre
+netperf configure 2.4.4pre2
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1403,7 +1403,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by netperf $as_me 2.4.4pre, which was
+It was created by netperf $as_me 2.4.4pre2, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2169,7 +2169,7 @@
# Define the identity of the package.
PACKAGE='netperf'
- VERSION='2.4.4pre'
+ VERSION='2.4.4pre2'
cat >>confdefs.h <<_ACEOF
@@ -9075,7 +9075,7 @@
# now spit it all out
-ac_config_files="$ac_config_files Makefile src/Makefile doc/Makefile"
+ac_config_files="$ac_config_files Makefile src/netperf_version.h src/Makefile doc/Makefile"
cat >confcache <<\_ACEOF
@@ -9488,7 +9488,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by netperf $as_me 2.4.4pre, which was
+This file was extended by netperf $as_me 2.4.4pre2, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -9541,7 +9541,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-netperf config.status 2.4.4pre
+netperf config.status 2.4.4pre2
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -9657,6 +9657,7 @@
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+ "src/netperf_version.h") CONFIG_FILES="$CONFIG_FILES src/netperf_version.h" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-04-25 21:53:20 UTC (rev 111)
+++ trunk/configure.ac 2007-05-14 17:00:37 UTC (rev 112)
@@ -2,11 +2,11 @@
# Process this file with autoconf to produce a configure script.
FULL-PACKAGE-NAME=netperf
-VERSION=2.4.4pre
+VERSION=2.4.4pre2
BUG-REPORT-ADDRESS=netperf-feedback at netperf.org
AC_PREREQ(2.59)
-AC_INIT(netperf, 2.4.4pre)
+AC_INIT(netperf, 2.4.4pre2)
# use the target version rather than host - one day we may want cross-compile
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/hist.h])
@@ -638,6 +638,7 @@
# now spit it all out
AC_CONFIG_FILES([Makefile
+ src/netperf_version.h
src/Makefile
doc/Makefile])
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2007-04-25 21:53:20 UTC (rev 111)
+++ trunk/src/Makefile.am 2007-05-14 17:00:37 UTC (rev 112)
@@ -1,5 +1,7 @@
#SUBDIRS = missing
+CLEANFILES = netperf_version.h
+
bin_PROGRAMS = netperf netserver
AM_CFLAGS = $(NETPERF_CFLAGS)
@@ -21,6 +23,3 @@
$(COMPILE) -o $@ -c $(srcdir)/missing/getaddrinfo.c
missing/inet_ntop.o: $(srcdir)/missing/inet_ntop.c
$(COMPILE) -o $@ -c $(srcdir)/missing/inet_ntop.c
-
-netperf_version.h: netperf_version.h.in ../configure
- sed -e 's|@VERSION\@|$(VERSION)|g' netperf_version.h.in > netperf_version.h
\ No newline at end of file
Modified: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in 2007-04-25 21:53:20 UTC (rev 111)
+++ trunk/src/Makefile.in 2007-05-14 17:00:37 UTC (rev 112)
@@ -128,6 +128,8 @@
target_os = @target_os@
target_vendor = @target_vendor@
+CLEANFILES = netperf_version.h
+
bin_PROGRAMS = netperf netserver
AM_CFLAGS = $(NETPERF_CFLAGS)
@@ -148,7 +150,7 @@
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_FILES = netperf_version.h
bin_PROGRAMS = netperf$(EXEEXT) netserver$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
@@ -187,7 +189,7 @@
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
DIST_SOURCES = $(netperf_SOURCES) $(netserver_SOURCES)
DIST_COMMON = $(srcdir)/Makefile.in Makefile.am missing/getaddrinfo.c \
- missing/inet_ntop.c
+ missing/inet_ntop.c netperf_version.h.in
SOURCES = $(netperf_SOURCES) $(netserver_SOURCES)
all: all-am
@@ -199,6 +201,8 @@
$(AUTOMAKE) --gnu src/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+netperf_version.h: $(top_builddir)/config.status netperf_version.h.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
@@ -382,6 +386,7 @@
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-rm -f $(CONFIG_CLEAN_FILES)
@@ -452,9 +457,6 @@
$(COMPILE) -o $@ -c $(srcdir)/missing/getaddrinfo.c
missing/inet_ntop.o: $(srcdir)/missing/inet_ntop.c
$(COMPILE) -o $@ -c $(srcdir)/missing/inet_ntop.c
-
-netperf_version.h: netperf_version.h.in ../configure
- sed -e 's|@VERSION\@|$(VERSION)|g' netperf_version.h.in > netperf_version.h
# 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:
More information about the netperf-dev
mailing list