[netperf-dev] netperf4 commit notice r25 - trunk/src

[raj at netperf.org]

Author: raj
Date: 2005-11-29 13:13:43 -0800 (Tue, 29 Nov 2005)
New Revision: 25

Modified:
   trunk/src/Makefile.am
   trunk/src/Makefile.in
Log:
Update the Makefile(s) to also build the vst tests.  One of these days we'll
need to break things out or allow them to be deselected at configure time?


Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2005-11-29 20:19:16 UTC (rev 24)
+++ trunk/src/Makefile.am	2005-11-29 21:13:43 UTC (rev 25)
@@ -22,7 +22,7 @@
 include_HEADERS = netperf.h netconfidence.h
 
 # in theory, the stuff below should deal with creating the requisite libs
-lib_LTLIBRARIES = nettest_bsd.la netsysstats.la nettest_dns.la
+lib_LTLIBRARIES = nettest_bsd.la netsysstats.la nettest_dns.la nettest_vst.la
 
 nettest_bsd_la_SOURCES = nettest_bsd.c nettest_bsd.h
 nettest_bsd_la_LDFLAGS = -module
@@ -30,6 +30,9 @@
 nettest_dns_la_SOURCES = nettest_dns.c nettest_dns.h
 nettest_dns_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: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in	2005-11-29 20:19:16 UTC (rev 24)
+++ trunk/src/Makefile.in	2005-11-29 21:13:43 UTC (rev 25)
@@ -161,7 +161,7 @@
 include_HEADERS = netperf.h netconfidence.h
 
 # in theory, the stuff below should deal with creating the requisite libs
-lib_LTLIBRARIES = nettest_bsd.la netsysstats.la nettest_dns.la
+lib_LTLIBRARIES = nettest_bsd.la netsysstats.la nettest_dns.la nettest_vst.la
 
 nettest_bsd_la_SOURCES = nettest_bsd.c nettest_bsd.h
 nettest_bsd_la_LDFLAGS = -module
@@ -169,6 +169,9 @@
 nettest_dns_la_SOURCES = nettest_dns.c nettest_dns.h
 nettest_dns_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
@@ -196,6 +199,9 @@
 nettest_dns_la_LIBADD =
 am_nettest_dns_la_OBJECTS = nettest_dns.lo
 nettest_dns_la_OBJECTS = $(am_nettest_dns_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)
 
@@ -223,7 +229,8 @@
 @AMDEP_TRUE@	./$(DEPDIR)/netsysstats_ at NETSYS_SOURCE@.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/netsysstats_common.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/nettest_bsd.Plo \
- at AMDEP_TRUE@	./$(DEPDIR)/nettest_dns.Plo
+ at AMDEP_TRUE@	./$(DEPDIR)/nettest_dns.Plo \
+ at AMDEP_TRUE@	./$(DEPDIR)/nettest_vst.Plo
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
@@ -232,14 +239,14 @@
 LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 DIST_SOURCES = $(netsysstats_la_SOURCES) $(nettest_bsd_la_SOURCES) \
-	$(nettest_dns_la_SOURCES) $(netperf_SOURCES) \
-	$(netserver_SOURCES)
+	$(nettest_dns_la_SOURCES) $(nettest_vst_la_SOURCES) \
+	$(netperf_SOURCES) $(netserver_SOURCES)
 HEADERS = $(include_HEADERS)
 
 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.in Makefile.am \
 	missing/get_expiration_time.c missing/getaddrinfo.c \
 	missing/getopt.c missing/getopt1.c missing/inet_ntop.c
-SOURCES = $(netsysstats_la_SOURCES) $(nettest_bsd_la_SOURCES) $(nettest_dns_la_SOURCES) $(netperf_SOURCES) $(netserver_SOURCES)
+SOURCES = $(netsysstats_la_SOURCES) $(nettest_bsd_la_SOURCES) $(nettest_dns_la_SOURCES) $(nettest_vst_la_SOURCES) $(netperf_SOURCES) $(netserver_SOURCES)
 
 all: all-am
 
@@ -284,6 +291,8 @@
 	$(LINK) -rpath $(libdir) $(nettest_bsd_la_LDFLAGS) $(nettest_bsd_la_OBJECTS) $(nettest_bsd_la_LIBADD) $(LIBS)
 nettest_dns.la: $(nettest_dns_la_OBJECTS) $(nettest_dns_la_DEPENDENCIES) 
 	$(LINK) -rpath $(libdir) $(nettest_dns_la_LDFLAGS) $(nettest_dns_la_OBJECTS) $(nettest_dns_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)
@@ -340,6 +349,7 @@
 @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@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/nettest_dns.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" \