[netperf-dev] netperf4 commit notice r170 - in
branches/glib_migration: . doc include src suites suites/dns
raj at netperf.org
raj at netperf.org
Tue Apr 18 17:24:50 PDT 2006
Author: raj
Date: 2006-04-18 17:24:48 -0700 (Tue, 18 Apr 2006)
New Revision: 170
Modified:
branches/glib_migration/Makefile.in
branches/glib_migration/configure
branches/glib_migration/configure.ac
branches/glib_migration/doc/Makefile.in
branches/glib_migration/include/Makefile.in
branches/glib_migration/src/Makefile.am
branches/glib_migration/src/Makefile.in
branches/glib_migration/suites/Makefile.am
branches/glib_migration/suites/Makefile.in
branches/glib_migration/suites/dns/Makefile.in
Log:
Now the rest
Modified: branches/glib_migration/Makefile.in
===================================================================
--- branches/glib_migration/Makefile.in 2006-04-19 00:24:26 UTC (rev 169)
+++ branches/glib_migration/Makefile.in 2006-04-19 00:24:48 UTC (rev 170)
@@ -96,6 +96,8 @@
WANT_DISK_TRUE = @WANT_DISK_TRUE@
WANT_DNS_FALSE = @WANT_DNS_FALSE@
WANT_DNS_TRUE = @WANT_DNS_TRUE@
+WANT_VST_FALSE = @WANT_VST_FALSE@
+WANT_VST_TRUE = @WANT_VST_TRUE@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -151,7 +153,7 @@
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = suites/disk/Makefile netperf-config
+CONFIG_CLEAN_FILES = netperf-config
SCRIPTS = $(bin_SCRIPTS)
DIST_SOURCES =
@@ -204,8 +206,6 @@
distclean-hdr:
-rm -f config.h stamp-h1
-suites/disk/Makefile: $(top_builddir)/config.status $(top_srcdir)/suites/disk/Makefile.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
netperf-config: $(top_builddir)/config.status netperf-config.in
cd $(top_builddir) && $(SHELL) ./config.status $@
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
@@ -379,7 +379,7 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkinstalldirs) $(distdir)/. $(distdir)/suites/disk
+ $(mkinstalldirs) $(distdir)/.
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
Modified: branches/glib_migration/configure
===================================================================
--- branches/glib_migration/configure 2006-04-19 00:24:26 UTC (rev 169)
+++ branches/glib_migration/configure 2006-04-19 00:24:48 UTC (rev 170)
@@ -463,7 +463,7 @@
#endif"
ac_config_libobj_dir=src/missing
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PKG_CONFIG ac_pt_PKG_CONFIG WANT_DNS_TRUE WANT_DNS_FALSE WANT_DISK_TRUE WANT_DISK_FALSE NETSYS_SOURCE LIBOJBS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PKG_CONFIG ac_pt_PKG_CONFIG WANT_DNS_TRUE WANT_DNS_FALSE WANT_DISK_TRUE WANT_DISK_FALSE WANT_VST_TRUE WANT_VST_FALSE NETSYS_SOURCE LIBOJBS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1042,6 +1042,7 @@
--enable-histogram include individual op timing, may affect result
--enable-dns build the DNS performance test suite
--enable-disk build the DISK performance test suite
+ --enable-vst build the VST performance test suite
--enable-demo emit interim results during the run. May affect results.
--enable-unixdomain include Unix Domain socket tests
--enable-dlpi include Unix Domain socket tests
@@ -3673,7 +3674,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3676 "configure"' > conftest.$ac_ext
+ echo '#line 3677 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5257,7 +5258,7 @@
# Provide some information about the compiler.
-echo "$as_me:5260:" \
+echo "$as_me:5261:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6318,11 +6319,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6321: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6322: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6325: \$? = $ac_status" >&5
+ echo "$as_me:6326: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6586,11 +6587,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6589: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6590: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6593: \$? = $ac_status" >&5
+ echo "$as_me:6594: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6690,11 +6691,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6693: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6694: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6697: \$? = $ac_status" >&5
+ echo "$as_me:6698: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9015,7 +9016,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9018 "configure"
+#line 9019 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9115,7 +9116,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9118 "configure"
+#line 9119 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11453,11 +11454,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11456: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11457: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11460: \$? = $ac_status" >&5
+ echo "$as_me:11461: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11557,11 +11558,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11560: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11561: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11564: \$? = $ac_status" >&5
+ echo "$as_me:11565: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13118,11 +13119,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13121: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13122: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13125: \$? = $ac_status" >&5
+ echo "$as_me:13126: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13222,11 +13223,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13225: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13226: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13229: \$? = $ac_status" >&5
+ echo "$as_me:13230: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15412,11 +15413,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15415: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15416: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15419: \$? = $ac_status" >&5
+ echo "$as_me:15420: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15680,11 +15681,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15683: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15684: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15687: \$? = $ac_status" >&5
+ echo "$as_me:15688: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15784,11 +15785,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15787: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15788: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15791: \$? = $ac_status" >&5
+ echo "$as_me:15792: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -21658,6 +21659,7 @@
WANT_DNS_FALSE=
fi
+
# see if we should be enabling dns support
echo "$as_me:$LINENO: checking whether to include disk support" >&5
@@ -21707,6 +21709,55 @@
fi
+# see if we should be enabling vst support
+
+echo "$as_me:$LINENO: checking whether to include vst support" >&5
+echo $ECHO_N "checking whether to include vst support... $ECHO_C" >&6
+
+# Check whether --enable-vst or --disable-vst was given.
+if test "${enable_vst+set}" = set; then
+ enableval="$enable_vst"
+
+fi;
+
+case "$enable_vst" in
+ yes)
+ use_vst=true
+ ;;
+ no)
+ use_vst=false
+ ;;
+ '')
+ # whatever
+ use_vst=false
+ ;;
+ *)
+ { { echo "$as_me:$LINENO: error: --enable-vst takes yes or no" >&5
+echo "$as_me: error: --enable-vst takes yes or no" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+esac
+
+if $use_vst
+then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+
+
+if test "$use_vst" = true; then
+ WANT_VST_TRUE=
+ WANT_VST_FALSE='#'
+else
+ WANT_VST_TRUE='#'
+ WANT_VST_FALSE=
+fi
+
+
# see if we should be enabling demo support
echo "$as_me:$LINENO: checking whether to include demo support" >&5
@@ -23109,7 +23160,7 @@
# now spit it all out
- ac_config_files="$ac_config_files Makefile include/Makefile src/Makefile doc/Makefile suites/Makefile suites/dns/Makefile suites/disk/Makefile netperf-config"
+ ac_config_files="$ac_config_files Makefile include/Makefile src/Makefile doc/Makefile suites/Makefile suites/dns/Makefile suites/disk/Makefile suites/vst/Makefile netperf-config"
cat >confcache <<\_ACEOF
@@ -23245,6 +23296,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${WANT_VST_TRUE}" && test -z "${WANT_VST_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"WANT_VST\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WANT_VST\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -23696,6 +23754,7 @@
"suites/Makefile" ) CONFIG_FILES="$CONFIG_FILES suites/Makefile" ;;
"suites/dns/Makefile" ) CONFIG_FILES="$CONFIG_FILES suites/dns/Makefile" ;;
"suites/disk/Makefile" ) CONFIG_FILES="$CONFIG_FILES suites/disk/Makefile" ;;
+ "suites/vst/Makefile" ) CONFIG_FILES="$CONFIG_FILES suites/vst/Makefile" ;;
"netperf-config" ) CONFIG_FILES="$CONFIG_FILES netperf-config" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
@@ -23857,6 +23916,8 @@
s, at WANT_DNS_FALSE@,$WANT_DNS_FALSE,;t t
s, at WANT_DISK_TRUE@,$WANT_DISK_TRUE,;t t
s, at WANT_DISK_FALSE@,$WANT_DISK_FALSE,;t t
+s, at WANT_VST_TRUE@,$WANT_VST_TRUE,;t t
+s, at WANT_VST_FALSE@,$WANT_VST_FALSE,;t t
s, at NETSYS_SOURCE@,$NETSYS_SOURCE,;t t
s, at LIBOJBS@,$LIBOJBS,;t t
s, at LTLIBOBJS@,$LTLIBOBJS,;t t
Modified: branches/glib_migration/configure.ac
===================================================================
--- branches/glib_migration/configure.ac 2006-04-19 00:24:26 UTC (rev 169)
+++ branches/glib_migration/configure.ac 2006-04-19 00:24:48 UTC (rev 170)
@@ -223,6 +223,7 @@
fi
AM_CONDITIONAL([WANT_DNS], [test "$use_dns" = true])
+
# see if we should be enabling dns support
AC_MSG_CHECKING(whether to include disk support)
@@ -256,6 +257,39 @@
AM_CONDITIONAL([WANT_DISK], [test "$use_disk" = true])
+# see if we should be enabling vst support
+
+AC_MSG_CHECKING(whether to include vst support)
+
+AC_ARG_ENABLE(vst,
+ [AS_HELP_STRING([--enable-vst],
+ [build the VST performance test suite]) ])
+
+case "$enable_vst" in
+ yes)
+ use_vst=true
+ ;;
+ no)
+ use_vst=false
+ ;;
+ '')
+ # whatever
+ use_vst=false
+ ;;
+ *)
+ AC_MSG_ERROR([--enable-vst takes yes or no])
+ ;;
+esac
+
+if $use_vst
+then
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+fi
+
+AM_CONDITIONAL([WANT_VST], [test "$use_vst" = true])
+
# see if we should be enabling demo support
AC_MSG_CHECKING(whether to include demo support)
@@ -705,6 +739,7 @@
suites/Makefile
suites/dns/Makefile
suites/disk/Makefile
+ suites/vst/Makefile
netperf-config])
AC_OUTPUT
Modified: branches/glib_migration/doc/Makefile.in
===================================================================
--- branches/glib_migration/doc/Makefile.in 2006-04-19 00:24:26 UTC (rev 169)
+++ branches/glib_migration/doc/Makefile.in 2006-04-19 00:24:48 UTC (rev 170)
@@ -100,6 +100,8 @@
WANT_DISK_TRUE = @WANT_DISK_TRUE@
WANT_DNS_FALSE = @WANT_DNS_FALSE@
WANT_DNS_TRUE = @WANT_DNS_TRUE@
+WANT_VST_FALSE = @WANT_VST_FALSE@
+WANT_VST_TRUE = @WANT_VST_TRUE@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
Modified: branches/glib_migration/include/Makefile.in
===================================================================
--- branches/glib_migration/include/Makefile.in 2006-04-19 00:24:26 UTC (rev 169)
+++ branches/glib_migration/include/Makefile.in 2006-04-19 00:24:48 UTC (rev 170)
@@ -96,6 +96,8 @@
WANT_DISK_TRUE = @WANT_DISK_TRUE@
WANT_DNS_FALSE = @WANT_DNS_FALSE@
WANT_DNS_TRUE = @WANT_DNS_TRUE@
+WANT_VST_FALSE = @WANT_VST_FALSE@
+WANT_VST_TRUE = @WANT_VST_TRUE@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
Modified: branches/glib_migration/src/Makefile.am
===================================================================
--- branches/glib_migration/src/Makefile.am 2006-04-19 00:24:26 UTC (rev 169)
+++ branches/glib_migration/src/Makefile.am 2006-04-19 00:24:48 UTC (rev 170)
@@ -28,15 +28,13 @@
# test libraries can find them
include_HEADERS = netperf.h netconfidence.h netperf_hist.h
-# in theory, the stuff below should deal with creating the requisite libs
-lib_LTLIBRARIES = nettest_bsd.la netsysstats.la nettest_vst.la
+# in theory, the stuff below should deal with creating the requisite
+# "core" libs. optional libs are in suites/
+lib_LTLIBRARIES = nettest_bsd.la netsysstats.la
nettest_bsd_la_SOURCES = nettest_bsd.c nettest_bsd.h
nettest_bsd_la_LDFLAGS = -module
-nettest_vst_la_SOURCES = nettest_vst.c nettest_vst.h
-nettest_vst_la_LDFLAGS = -module
-
# the USE_CPU_SOURCE will pick the apropriate file based on the platform
netsysstats_la_SOURCES = netsysstats_common.c netsysstats.h $(USE_CPU_SOURCE)
netsysstats_la_LDFLAGS = -module
Modified: branches/glib_migration/src/Makefile.in
===================================================================
--- branches/glib_migration/src/Makefile.in 2006-04-19 00:24:26 UTC (rev 169)
+++ branches/glib_migration/src/Makefile.in 2006-04-19 00:24:48 UTC (rev 170)
@@ -98,6 +98,8 @@
WANT_DISK_TRUE = @WANT_DISK_TRUE@
WANT_DNS_FALSE = @WANT_DNS_FALSE@
WANT_DNS_TRUE = @WANT_DNS_TRUE@
+WANT_VST_FALSE = @WANT_VST_FALSE@
+WANT_VST_TRUE = @WANT_VST_TRUE@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -172,15 +174,13 @@
# test libraries can find them
include_HEADERS = netperf.h netconfidence.h netperf_hist.h
-# in theory, the stuff below should deal with creating the requisite libs
-lib_LTLIBRARIES = nettest_bsd.la netsysstats.la nettest_vst.la
+# in theory, the stuff below should deal with creating the requisite
+# "core" libs. optional libs are in suites/
+lib_LTLIBRARIES = nettest_bsd.la netsysstats.la
nettest_bsd_la_SOURCES = nettest_bsd.c nettest_bsd.h
nettest_bsd_la_LDFLAGS = -module
-nettest_vst_la_SOURCES = nettest_vst.c nettest_vst.h
-nettest_vst_la_LDFLAGS = -module
-
# the USE_CPU_SOURCE will pick the apropriate file based on the platform
netsysstats_la_SOURCES = netsysstats_common.c netsysstats.h $(USE_CPU_SOURCE)
netsysstats_la_LDFLAGS = -module
@@ -206,9 +206,6 @@
nettest_bsd_la_LIBADD =
am_nettest_bsd_la_OBJECTS = nettest_bsd.lo
nettest_bsd_la_OBJECTS = $(am_nettest_bsd_la_OBJECTS)
-nettest_vst_la_LIBADD =
-am_nettest_vst_la_OBJECTS = nettest_vst.lo
-nettest_vst_la_OBJECTS = $(am_nettest_vst_la_OBJECTS)
bin_PROGRAMS = netperf$(EXEEXT) netserver$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
@@ -234,8 +231,7 @@
@AMDEP_TRUE@ ./$(DEPDIR)/netserver.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/netsysstats_ at NETSYS_SOURCE@.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/netsysstats_common.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/nettest_bsd.Plo \
- at AMDEP_TRUE@ ./$(DEPDIR)/nettest_vst.Plo
+ at AMDEP_TRUE@ ./$(DEPDIR)/nettest_bsd.Plo
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
@@ -244,15 +240,14 @@
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
DIST_SOURCES = $(netsysstats_la_SOURCES) $(nettest_bsd_la_SOURCES) \
- $(nettest_vst_la_SOURCES) $(netperf_SOURCES) \
- $(netserver_SOURCES)
+ $(netperf_SOURCES) $(netserver_SOURCES)
DATA = $(netperf_DATA)
HEADERS = $(include_HEADERS)
DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.in Makefile.am \
missing/getaddrinfo.c missing/inet_ntop.c
-SOURCES = $(netsysstats_la_SOURCES) $(nettest_bsd_la_SOURCES) $(nettest_vst_la_SOURCES) $(netperf_SOURCES) $(netserver_SOURCES)
+SOURCES = $(netsysstats_la_SOURCES) $(nettest_bsd_la_SOURCES) $(netperf_SOURCES) $(netserver_SOURCES)
all: all-am
@@ -295,8 +290,6 @@
$(LINK) -rpath $(libdir) $(netsysstats_la_LDFLAGS) $(netsysstats_la_OBJECTS) $(netsysstats_la_LIBADD) $(LIBS)
nettest_bsd.la: $(nettest_bsd_la_OBJECTS) $(nettest_bsd_la_DEPENDENCIES)
$(LINK) -rpath $(libdir) $(nettest_bsd_la_LDFLAGS) $(nettest_bsd_la_OBJECTS) $(nettest_bsd_la_LIBADD) $(LIBS)
-nettest_vst.la: $(nettest_vst_la_OBJECTS) $(nettest_vst_la_DEPENDENCIES)
- $(LINK) -rpath $(libdir) $(nettest_vst_la_LDFLAGS) $(nettest_vst_la_OBJECTS) $(nettest_vst_la_LIBADD) $(LIBS)
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
@@ -350,7 +343,6 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/netsysstats_ at NETSYS_SOURCE@.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/netsysstats_common.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nettest_bsd.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nettest_vst.Plo at am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
Modified: branches/glib_migration/suites/Makefile.am
===================================================================
--- branches/glib_migration/suites/Makefile.am 2006-04-19 00:24:26 UTC (rev 169)
+++ branches/glib_migration/suites/Makefile.am 2006-04-19 00:24:48 UTC (rev 170)
@@ -2,8 +2,11 @@
DNS_OPT = dns
endif
if WANT_DISK
- DISK_OPT = disc
+ DISK_OPT = disk
endif
+if WANT_VST
+ VST_OPT = vst
+endif
-SUBDIRS = $(DNS_OPT) $(DISK_OPT)
+SUBDIRS = $(DNS_OPT) $(DISK_OPT) $(VST_OPT)
Modified: branches/glib_migration/suites/Makefile.in
===================================================================
--- branches/glib_migration/suites/Makefile.in 2006-04-19 00:24:26 UTC (rev 169)
+++ branches/glib_migration/suites/Makefile.in 2006-04-19 00:24:48 UTC (rev 170)
@@ -96,6 +96,8 @@
WANT_DISK_TRUE = @WANT_DISK_TRUE@
WANT_DNS_FALSE = @WANT_DNS_FALSE@
WANT_DNS_TRUE = @WANT_DNS_TRUE@
+WANT_VST_FALSE = @WANT_VST_FALSE@
+WANT_VST_TRUE = @WANT_VST_TRUE@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
@@ -142,9 +144,10 @@
target_os = @target_os@
target_vendor = @target_vendor@
@WANT_DNS_TRUE at DNS_OPT = dns
- at WANT_DISK_TRUE@DISK_OPT = disc
+ at WANT_DISK_TRUE@DISK_OPT = disk
+ at WANT_VST_TRUE@VST_OPT = vst
-SUBDIRS = $(DNS_OPT) $(DISK_OPT)
+SUBDIRS = $(DNS_OPT) $(DISK_OPT) $(VST_OPT)
subdir = suites
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -158,7 +161,7 @@
installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive
DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-DIST_SUBDIRS = dns disc
+DIST_SUBDIRS = dns disk vst
all: all-recursive
.SUFFIXES:
Modified: branches/glib_migration/suites/dns/Makefile.in
===================================================================
--- branches/glib_migration/suites/dns/Makefile.in 2006-04-19 00:24:26 UTC (rev 169)
+++ branches/glib_migration/suites/dns/Makefile.in 2006-04-19 00:24:48 UTC (rev 170)
@@ -96,6 +96,8 @@
WANT_DISK_TRUE = @WANT_DISK_TRUE@
WANT_DNS_FALSE = @WANT_DNS_FALSE@
WANT_DNS_TRUE = @WANT_DNS_TRUE@
+WANT_VST_FALSE = @WANT_VST_FALSE@
+WANT_VST_TRUE = @WANT_VST_TRUE@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
More information about the netperf-dev
mailing list