Commit 26880ebd authored by Mike Hibler's avatar Mike Hibler
Browse files

Tweaks to iperf makefile (and caller makefile) to avoid GNU vs. BSD make

issues.  This setup worked for me on FBSD 4&5, RHL9 and FC4.
parent 2c9ae239
......@@ -107,7 +107,7 @@ control-install: binaries
$(INSTALL_PROGRAM) $(SCRIPT_PROXY) $(INSTALL_BINDIR)
client: all
$(MAKE) --no-print-directory -C iperf
$(MAKE) -C iperf client
client-install: client
@if test ! -x '/usr/local/bin/rude' -o \
......@@ -129,8 +129,8 @@ client-install: client
$(INSTALL_PROGRAM) $(LTEVENT) $(DESTDIR)$(CLIENT_BINDIR)/$(LTEVENT)
$(INSTALL_PROGRAM) $(SCRIPT) $(DESTDIR)$(CLIENT_BINDIR)/$(SCRIPT)
$(INSTALL_PROGRAM) $(SCRIPT_RUN) $(DESTDIR)$(CLIENT_BINDIR)/$(SCRIPT_RUN)
$(MAKE) --no-print-directory -C iperf client-install
$(MAKE) -C iperf client-install
clean:
rm -f *.o $(TESTS) $(SCRIPT) $(SCRIPT_RUN) weblinktest linktest_control
$(MAKE) --no-print-directory -C iperf clean
$(MAKE) -C iperf clean
......@@ -16,27 +16,33 @@ all: src/emulab-iperf
include $(TESTBED_SRCDIR)/GNUmakerules
# Next two rules for linux, where make=gmake.
%-am: force
make $(MAKEFLAGS) -f Makefile $@
%-am: Makefile force
$(MAKE) -f Makefile $@
%-recursive: force
make $(MAKEFLAGS) -f Makefile $@
%-recursive: Makefile force
$(MAKE) -f Makefile $@
src/emulab-iperf: iperf-2.0.2 config.status build-iperf
build-iperf:
make $(MAKEFLAGS) -f Makefile all
build-iperf: Makefile
$(MAKE) -f Makefile all
client-install:
make $(MAKEFLAGS) -f Makefile install
client: all
client-install: Makefile
$(MAKE) -f Makefile install
# 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.
config.status:
$(SRCDIR)/iperf-2.0.2/configure
MAKE=$(MAKE) $(SRCDIR)/iperf-2.0.2/configure
iperf-2.0.2:
$(SRCDIR)/iperf-fetch.sh $(SRCDIR)
clean:
make $(MAKEFLAGS) -f Makefile clean
clean: Makefile
$(MAKE) -f Makefile clean
Makefile: config.status
force: ;
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