Checkpoint.

GNUmakefile.in

@@ -281,41 +281,49 @@ mfs: mfsoscheck
 	@$(MAKE) -C os mfs
 	@$(MAKE) -C sensors mfs
 	@$(MAKE) -C tmcd mfs
+	@$(MAKE) -C clientside mfs
 
 mfs-nostatic: mfsoscheck
 	@NOSTATIC=1 $(MAKE) -C os mfs
 	@NOSTATIC=1 $(MAKE) -C sensors mfs
 	@NOSTATIC=1 $(MAKE) -C tmcd mfs
+	@NOSTATIC=1 $(MAKE) -C clientside mfs
 
 mfs-install: destdircheck mfs client-mkdirs
 	@$(MAKE) -C os mfs-install
 	@$(MAKE) -C sensors mfs-install
 	@$(MAKE) -C tmcd mfs-install
+	@$(MAKE) -C clientside mfs-install
 
 mfs-nostatic-install: destdircheck mfs-nostatic client-mkdirs
 	@$(MAKE) -C os mfs-install
 	@$(MAKE) -C sensors mfs-install
 	@$(MAKE) -C tmcd mfs-install
+	@$(MAKE) -C clientside mfs-install
 
 frisbee-mfs: mfsoscheck
 	@$(MAKE) -C cdrom/groklilo client
 	@$(MAKE) -C os frisbee-mfs
 	@$(MAKE) -C tmcd frisbee-mfs
+	@$(MAKE) -C clientside frisbee-mfs
 
 frisbee-mfs-nostatic: mfsoscheck
 	@NOSTATIC=1 $(MAKE) -C cdrom/groklilo client
 	@NOSTATIC=1 $(MAKE) -C os frisbee-mfs
 	@NOSTATIC=1 $(MAKE) -C tmcd frisbee-mfs
+	@NOSTATIC=1 $(MAKE) -C clientside frisbee-mfs
 
 frisbee-mfs-install: destdircheck frisbee-mfs
 	@CLIENT_BINDIR=/etc/testbed $(MAKE) -e -C cdrom/groklilo client-install
 	@$(MAKE) -C os frisbee-mfs-install
 	@$(MAKE) -C tmcd frisbee-mfs-install
+	@$(MAKE) -C clientside frisbee-mfs-install
 
 frisbee-mfs-nostatic-install: destdircheck frisbee-mfs-nostatic
 	@CLIENT_BINDIR=/etc/testbed $(MAKE) -e -C cdrom/groklilo client-install
 	@$(MAKE) -C os frisbee-mfs-install
 	@$(MAKE) -C tmcd frisbee-mfs-install
+	@$(MAKE) -C clientside frisbee-mfs-install
 
 cdboot: mfsoscheck client
 	@echo "CD/Dongle files built"
@@ -331,6 +339,7 @@ flashboot-install: destdircheck flashboot
 	@$(MAKE) -C tmcd/freebsd6 cdboot-install
 	@$(MAKE) -C os frisbee-mfs-install
 	@$(MAKE) -C flash client-install
+	@$(MAKE) -C clientside frisbee-mfs-install
 
 #
 # A check to see if this is a 'real' install. Kinda hacky, but as far as I can

clientside/GNUmakefile.in

@@ -37,6 +37,10 @@ subboss-install: client subboss-install-subdirs
 post-install:	post-install-subdirs
 clean:		clean-subdirs
 distclean:	distclean-subdirs
+mfs:		mfs-subdirs
+mfs-install:	mfs-install-subdirs
+frisbee-mfs:	frisbee-mfs-subdirs
+frisbee-mfs-install:	frisbee-mfs-install-subdirs
 
 # How to recursively descend into subdirectories to make general
 # targets such as `all'.

clientside/event/GNUmakefile.in

@@ -24,6 +24,10 @@ subboss-install:
 post-install:	post-install-subdirs
 clean:		clean-subdirs
 distclean:	distclean-subdirs
+mfs:
+mfs-install:
+frisbee-mfs:
+frisbee-mfs-install:
 
 # How to recursively descend into subdirectories to make general
 # targets such as `all'.

clientside/os/GNUmakefile.in

@@ -52,6 +52,10 @@ remote-install:
 
 clean:		clean-subdirs
 distclean:	subdir-distclean
+mfs:
+mfs-install:
+frisbee-mfs:
+frisbee-mfs-install:
 
 subdir-distclean:
 	@$(MAKE) -C imagezip distclean

clientside/sensors/GNUmakefile.in

+#
+# EMULAB-COPYRIGHT
+# Copyright (c) 2000-2011 University of Utah and the Flux Group.
+# All rights reserved.
+#
+SRCDIR		= @srcdir@
+TESTBED_SRCDIR	= @top_srcdir@
+OBJDIR		= @top_builddir@
+SUBDIR		= $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
+
+include $(OBJDIR)/Makeconf
+
+SUBDIRS		= slothd
+
+all:	all-subdirs
+
+include $(TESTBED_SRCDIR)/GNUmakerules
+
+client:		client-subdirs
+client-install: client client-install-subdirs
+control-install: control-install-subdirs
+subboss:
+subboss-install:
+post-install:	post-install-subdirs
+clean:		clean-subdirs
+distclean:	distclean-subdirs
+mfs:
+mfs-install:
+frisbee-mfs:
+frisbee-mfs-install:
+
+# How to recursively descend into subdirectories to make general
+# targets such as `all'.
+%.MAKE:
+	@$(MAKE) -C $(dir $@) $(basename $(notdir $@))
+%-subdirs: $(addsuffix /%.MAKE,$(SUBDIRS)) ;
+
+.PHONY:	$(SUBDIRS)

clientside/tools/GNUmakefile.in

@@ -24,6 +24,10 @@ subboss-install:
 post-install:	post-install-subdirs
 clean:		clean-subdirs
 distclean:	distclean-subdirs
+mfs:
+mfs-install:
+frisbee-mfs:
+frisbee-mfs-install:
 
 # How to recursively descend into subdirectories to make general
 # targets such as `all'.

sensors/GNUmakefile.in

 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2002-2009 University of Utah and the Flux Group.
+# Copyright (c) 2002-2011 University of Utah and the Flux Group.
 # All rights reserved.
 #
 SRCDIR		= @srcdir@
@@ -12,7 +12,7 @@ ISMAINSITE	= @TBMAINSITE@
 
 include $(OBJDIR)/Makeconf
 
-SUBDIRS	= slothd powermon
+SUBDIRS	= powermon
 ifeq ($(ISMAINSITE),1)
 SUBDIRS += nfstrace
 endif
@@ -87,8 +87,7 @@ $(SUBDIRS): %: %.all
 fs-install:
 	@$(MAKE) -C nfstrace fs-install
 
-mfs: slothd.client
-
-mfs-install: mfs slothd.client-install
+mfs:
+mfs-install:
 
 .PHONY: mfs mfs-install