Checkpoint

GNUmakefile.in

@@ -207,9 +207,9 @@ endif
 
 client-install: client client-mkdirs
 	@$(MAKE) -C lib client-install
+	@$(MAKE) -C clientside client-install
 ifeq ($(EVENTSYS),1)
 	@$(MAKE) -C event client-install
-	@$(MAKE) -C clientside client-install
 endif
 	@$(MAKE) -C os client-install
 ifneq ($(SYSTEM),CYGWIN_NT-5.1)
@@ -224,6 +224,7 @@ subboss: client
 	@$(MAKE) -C utils subboss
 
 subboss-install: subboss
+	@$(MAKE) -C clientside client-install
 ifeq ($(EVENTSYS),1)
 	@$(MAKE) -C event client-install
 endif

clientside/GNUmakefile.in

@@ -20,7 +20,7 @@ ifeq ($(WITH_EMULAB),0)
 SUBDIRS	       += lib
 endif
 # These must be after lib.
-SUBDIRS	       += event tools
+SUBDIRS	       += event tools os
 
 ifeq ($(WITH_EMULAB),1)
 all:	all-subdirs
@@ -32,6 +32,8 @@ include $(TESTBED_SRCDIR)/GNUmakerules
 client:		client-subdirs
 client-install: client client-install-subdirs
 control-install: control-install-subdirs
+subboss:	subboss-subdirs
+subboss-install: client subboss-install-subdirs
 post-install:	post-install-subdirs
 clean:		clean-subdirs
 distclean:	distclean-subdirs

clientside/configure

@@ -4827,7 +4827,9 @@ outfiles="Makeconf GNUmakefile \
 	  event/GNUmakefile \
 	  event/program-agent/GNUmakefile \
 	  tools/GNUmakefile \
-	  tools/pcapper/GNUmakefile"
+	  tools/pcapper/GNUmakefile \
+	  os/GNUmakefile os/syncd/GNUmakefile \
+	  os/dijkstra/GNUmakefile os/genhostsfile/GNUmakefile"
 
 #
 # When building as part of a full emulab build, a few things come

clientside/configure.in

@@ -155,7 +155,9 @@ outfiles="Makeconf GNUmakefile \
 	  event/GNUmakefile \
 	  event/program-agent/GNUmakefile \
 	  tools/GNUmakefile \
-	  tools/pcapper/GNUmakefile"
+	  tools/pcapper/GNUmakefile \
+	  os/GNUmakefile os/syncd/GNUmakefile \
+	  os/dijkstra/GNUmakefile os/genhostsfile/GNUmakefile"
 
 #
 # When building as part of a full emulab build, a few things come

clientside/event/GNUmakefile.in

@@ -19,6 +19,8 @@ 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

clientside/os/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))
+SYSTEM	       := $(shell uname -s)
+LBINDIR		= $(DESTDIR)/usr/local/bin
+SYSTEM	       := $(shell uname -s)
+
+include $(OBJDIR)/Makeconf
+
+SUBDIRS	= syncd dijkstra genhostsfile
+
+all:	all-subdirs
+
+include $(TESTBED_SRCDIR)/GNUmakerules
+
+install:
+	-mkdir -p $(INSTALL_DIR)/opsdir/man/man1
+	$(INSTALL) -m 644 $(SRCDIR)/install-tarfile.1 \
+		$(INSTALL_DIR)/opsdir/man/man1/install-tarfile.1
+
+control-install: 
+
+client:
+	$(MAKE) -C syncd client
+	$(MAKE) -C dijkstra client
+	$(MAKE) -C genhostsfile client
+
+client-install: client
+	-mkdir -p $(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
+	$(MAKE) -C syncd client-install
+	$(MAKE) -C dijkstra client-install
+	$(MAKE) -C genhostsfile client-install
+
+subboss: client
+
+subboss-install: subboss client-install
+
+remote-install: 
+	-mkdir -p $(LBINDIR)
+	$(INSTALL_PROGRAM) $(SRCDIR)/install-tarfile $(LBINDIR)/install-tarfile
+	$(INSTALL_PROGRAM) $(SRCDIR)/install-rpm $(LBINDIR)/install-rpm
+
+clean:		clean-subdirs
+distclean:	subdir-distclean
+
+subdir-distclean:
+	@$(MAKE) -C imagezip distclean
+
+# 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/os/dijkstra/GNUmakefile.in

 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2007 University of Utah and the Flux Group.
+# Copyright (c) 2000-2011 University of Utah and the Flux Group.
 # All rights reserved.
 #
-
 SRCDIR		= @srcdir@
 TESTBED_SRCDIR	= @top_srcdir@
-OBJDIR		= ../..
-SUBDIR		= os/dijkstra
+OBJDIR		= @top_builddir@
+SUBDIR		= $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
 
 include $(OBJDIR)/Makeconf
 

clientside/os/genhostsfile/GNUmakefile.in

 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2005, 2007 University of Utah and the Flux Group.
+# Copyright (c) 2000-2011 University of Utah and the Flux Group.
 # All rights reserved.
 #
-
 SRCDIR		= @srcdir@
 TESTBED_SRCDIR	= @top_srcdir@
-OBJDIR		= ../..
-SUBDIR		= os/genhostsfile
+OBJDIR		= @top_builddir@
+SUBDIR		= $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
 
 include $(OBJDIR)/Makeconf
 

clientside/os/syncd/GNUmakefile.in

 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2005, 2007 University of Utah and the Flux Group.
+# Copyright (c) 2000-2011 University of Utah and the Flux Group.
 # All rights reserved.
 #
-
 SRCDIR		= @srcdir@
 TESTBED_SRCDIR	= @top_srcdir@
-OBJDIR		= ../..
-SUBDIR		= os/syncd
+OBJDIR		= @top_builddir@
+SUBDIR		= $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
 
 include $(OBJDIR)/Makeconf
 

clientside/tools/GNUmakefile.in

@@ -19,6 +19,8 @@ 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

configure

@@ -7024,8 +7024,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
 	os/imagezip/ffs/GNUmakefile os/imagezip/extfs/GNUmakefile os/imagezip/ext4fs/GNUmakefile \
 	os/imagezip/hashmap/GNUmakefile \
 	os/frisbee.redux/GNUmakefile os/growdisk/GNUmakefile \
-        os/syncd/GNUmakefile os/dijkstra/GNUmakefile \
-	os/genhostsfile/GNUmakefile os/zapdisk/GNUmakefile \
+        os/zapdisk/GNUmakefile \
 	pxe/GNUmakefile pxe/bootinfo.restart \
 	security/GNUmakefile security/lastlog_daemon \
         sensors/GNUmakefile sensors/slothd/GNUmakefile \
@@ -7228,7 +7227,9 @@ outfiles="$outfiles Makeconf GNUmakefile \
 outfiles="$outfiles clientside/GNUmakefile \
  clientside/GNUmakefile clientside/event/GNUmakefile \
  clientside/event/program-agent/GNUmakefile \
- clientside/tools/GNUmakefile clientside/tools/pcapper/GNUmakefile"
+ clientside/tools/GNUmakefile clientside/tools/pcapper/GNUmakefile \
+ clientside/os/GNUmakefile clientside/os/syncd/GNUmakefile \
+ clientside/os/dijkstra/GNUmakefile clientside/os/genhostsfile/GNUmakefile"
 
 #
 # Do this for easy distclean.

configure.in

@@ -889,8 +889,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
 	os/imagezip/ffs/GNUmakefile os/imagezip/extfs/GNUmakefile os/imagezip/ext4fs/GNUmakefile \
 	os/imagezip/hashmap/GNUmakefile \
 	os/frisbee.redux/GNUmakefile os/growdisk/GNUmakefile \
-        os/syncd/GNUmakefile os/dijkstra/GNUmakefile \
-	os/genhostsfile/GNUmakefile os/zapdisk/GNUmakefile \
+        os/zapdisk/GNUmakefile \
 	pxe/GNUmakefile pxe/bootinfo.restart \
 	security/GNUmakefile security/lastlog_daemon \
         sensors/GNUmakefile sensors/slothd/GNUmakefile \
@@ -1093,7 +1092,9 @@ outfiles="$outfiles Makeconf GNUmakefile \
 outfiles="$outfiles clientside/GNUmakefile \
  clientside/GNUmakefile clientside/event/GNUmakefile \
  clientside/event/program-agent/GNUmakefile \
- clientside/tools/GNUmakefile clientside/tools/pcapper/GNUmakefile"
+ clientside/tools/GNUmakefile clientside/tools/pcapper/GNUmakefile \
+ clientside/os/GNUmakefile clientside/os/syncd/GNUmakefile \
+ clientside/os/dijkstra/GNUmakefile clientside/os/genhostsfile/GNUmakefile"
 
 #
 # Do this for easy distclean.

lib/GNUmakefile.in

@@ -17,15 +17,12 @@ all:	all-subdirs
 include $(TESTBED_SRCDIR)/GNUmakerules
 
 client: client-subdirs
-
 install: install-subdirs
-
 control-install: control-install-subdirs
-
 client-install: client-install-subdirs
-
+subboss:
+subboss-install:
 clean:		clean-subdirs
-
 distclean:	distclean-subdirs
 
 # How to recursively descend into subdirectories to make general

os/GNUmakefile.in

 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2007 University of Utah and the Flux Group.
+# Copyright (c) 2000-2011 University of Utah and the Flux Group.
 # All rights reserved.
 #
 
@@ -14,7 +14,7 @@ SYSTEM	       := $(shell uname -s)
 
 include $(OBJDIR)/Makeconf
 
-SUBDIRS	= imagezip frisbee.redux syncd dijkstra genhostsfile
+SUBDIRS	= imagezip frisbee.redux 
 ifeq ($(SYSTEM),FreeBSD)
 SUBDIRS += growdisk 
 endif
@@ -28,9 +28,6 @@ install: $(INSTALL_SBINDIR)/split-image.sh
 	@$(MAKE) -C frisbee.redux install
 	$(INSTALL_PROGRAM) $(SRCDIR)/template_record \
 		$(INSTALL_DIR)/opsdir/bin/template_record
-	-mkdir -p $(INSTALL_DIR)/opsdir/man/man1
-	$(INSTALL) -m 644 $(SRCDIR)/install-tarfile.1 \
-		$(INSTALL_DIR)/opsdir/man/man1/install-tarfile.1
 
 control-install: 
 	@$(MAKE) -C imagezip install
@@ -40,26 +37,15 @@ client:
 ifeq ($(SYSTEM),FreeBSD)
 	$(MAKE) -C growdisk client
 endif
-	$(MAKE) -C syncd client
-	$(MAKE) -C dijkstra client
-	$(MAKE) -C genhostsfile client
 	$(MAKE) -C frisbee.redux client
 
 client-install: client
-	-mkdir -p $(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
 	$(INSTALL_PROGRAM) $(SRCDIR)/template_record $(LBINDIR)/template_record
 ifeq ($(SYSTEM),FreeBSD)
 	$(INSTALL_PROGRAM) $(SRCDIR)/create-image $(LBINDIR)/
 	$(INSTALL_PROGRAM) $(SRCDIR)/create-swapimage $(LBINDIR)/
 	$(MAKE) -C growdisk client-install
 endif
-	$(MAKE) -C syncd client-install
-	$(MAKE) -C dijkstra client-install
-	$(MAKE) -C genhostsfile client-install
 	$(MAKE) -C frisbee.redux client-install
 
 subboss: client
@@ -100,9 +86,6 @@ cdboot-install: mfs-install frisbee-mfs
 	$(MAKE) -e -C growdisk client-install
 
 remote-install: 
-	-mkdir -p $(LBINDIR)
-	$(INSTALL_PROGRAM) $(SRCDIR)/install-tarfile $(LBINDIR)/install-tarfile
-	$(INSTALL_PROGRAM) $(SRCDIR)/install-rpm $(LBINDIR)/install-rpm
 
 clean:		clean-subdirs
 distclean:	subdir-distclean