Minor tweaks to get the client side build working for the garcias

again.

capture/GNUmakefile.in

@@ -30,7 +30,6 @@ CFLAGS += -g -O2 -DLOG_DROPS -I${OBJDIR} -DLOG_TESTBED=$(LOG_TESTBED)
 
 ifeq ($(SYSTEM),Linux)
 ifeq ($(host_cpu),arm)
-LDFLAGS += -static
 else
 CFLAGS += -I/usr/kerberos/include
 LDFLAGS += -L/usr/kerberos/lib -lkrb5 -lk5crypto -lcom_err

event/linktest/iperf/GNUmakefile.in

@@ -19,7 +19,13 @@ ifeq ($(SYSTEM),CYGWIN)
 CONFIG_ARGS     = --disable-threads
 endif
 
-all:	src/emulab-iperf
+ifeq ($(host_cpu),arm)
+TARGETS =
+else
+TARGETS = src/emulab-iperf
+endif
+
+all: $(TARGETS)
 
 include $(TESTBED_SRCDIR)/GNUmakerules
 
@@ -37,8 +43,12 @@ build-iperf: Makefile
 
 client: all
 
+ifeq ($(host_cpu),arm)
+client-install:
+else
 client-install: Makefile
 	$(MAKE) -f Makefile install
+endif
 
 # 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.

os/GNUmakefile.in

@@ -44,6 +44,7 @@ endif
 client-install: client
 	$(INSTALL) -m 755 -o root -g wheel -d $(LBINDIR)
 	$(INSTALL_PROGRAM) $(SRCDIR)/install-tarfile $(LBINDIR)/install-tarfile
+	-mkdir -p $(DESTDIR)$(CLIENT_MANDIR)/man1
 	$(INSTALL) -m 644 $(SRCDIR)/install-tarfile.1 $(DESTDIR)$(CLIENT_MANDIR)/man1/install-tarfile.1
 	$(INSTALL_PROGRAM) $(SRCDIR)/install-rpm $(LBINDIR)/install-rpm
 ifeq ($(SYSTEM),FreeBSD)

tools/GNUmakefile.in

@@ -11,17 +11,26 @@ SUBDIR		= tools
 
 include $(OBJDIR)/Makeconf
 
-SUBDIRS = pcapper teachswitch webcamapplet whol
+SUBDIRS = teachswitch webcamapplet whol
+
+ifneq ($(host_cpu),arm)
+SUBDIRS += pcapper
+endif
 
 all:	all-subdirs
 
 include $(TESTBED_SRCDIR)/GNUmakerules
 
+ifeq ($(host_cpu),arm)
+client:
+client-install:
+else
 client:
 	$(MAKE) -C pcapper client
 
 client-install: client
 	$(MAKE) -C pcapper client-install
+endif
 
 post-install:
 	@$(MAKE) -C whol post-install