Commit 7bf7e1b8 authored by Mike Hibler's avatar Mike Hibler
Browse files

Arrange for our version of iperf to be installed in /usr/local/etc/emulab

parent da1b6560
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -21,8 +21,10 @@ endif
ifeq ($(host_cpu),arm)
TARGETS =
ITARGETS =
else
TARGETS = src/emulab-iperf
ITARGETS = iperf-install
endif
all: $(TARGETS)
......@@ -43,12 +45,10 @@ build-iperf: Makefile
client: all
ifeq ($(host_cpu),arm)
client-install:
else
client-install: Makefile
$(MAKE) -f Makefile install
endif
iperf-install: build-iperf
$(INSTALL_PROGRAM) -s src/iperf $(CLIENT_BINDIR)/emulab-iperf
client-install: $(ITARGETS)
# Note: GNU make wants to pass options in MAKEFLAGS (w) that are compatible
# with BSD make. So we just force configure to assume/use gmake for BSD.
......
......@@ -55,49 +55,6 @@ diff -c src/Client.cpp:1.1 src/Client.cpp:1.3
if ( delay > 0 ) {
delay_loop( delay );
Index: src/Makefile.in
===================================================================
RCS file: /usr/flux/CVS/emulab-iperf/src/Makefile.in,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 Makefile.in
*** src/Makefile.in 24 Oct 2005 15:18:33 -0000 1.1.1.1
--- src/Makefile.in 24 Oct 2005 16:06:10 -0000
***************
*** 38,44 ****
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
! bin_PROGRAMS = iperf$(EXEEXT)
subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--- 38,44 ----
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
! bin_PROGRAMS = emulab-iperf$(EXEEXT)
subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
***************
*** 266,273 ****
clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
! iperf$(EXEEXT): $(iperf_OBJECTS) $(iperf_DEPENDENCIES)
! @rm -f iperf$(EXEEXT)
$(CXXLINK) $(iperf_LDFLAGS) $(iperf_OBJECTS) $(iperf_LDADD) $(LIBS)
mostlyclean-compile:
--- 266,273 ----
clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
! emulab-iperf$(EXEEXT): $(iperf_OBJECTS) $(iperf_DEPENDENCIES)
! @rm -f emulab-iperf$(EXEEXT)
$(CXXLINK) $(iperf_LDFLAGS) $(iperf_OBJECTS) $(iperf_LDADD) $(LIBS)
mostlyclean-compile:
Index: src/main.cpp
===================================================================
RCS file: /usr/flux/CVS/emulab-iperf/src/main.cpp,v
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment