Commit 914928ad authored by Leigh Stoller's avatar Leigh Stoller

Checkpoint.

parent 4c9cc480
......@@ -194,28 +194,20 @@ client-mkdirs:
client:
@$(MAKE) -C lib client
@$(MAKE) -C clientside client
ifeq ($(EVENTSYS),1)
@$(MAKE) -C event client
endif
@$(MAKE) -C os client
ifneq ($(SYSTEM),CYGWIN_NT-5.1)
@$(MAKE) -C capture client
@$(MAKE) -C tip client
endif
@$(MAKE) -C tmcd client
client-install: client client-mkdirs
@$(MAKE) -C lib client-install
@$(MAKE) -C clientside client-install
ifeq ($(EVENTSYS),1)
@$(MAKE) -C event client-install
endif
@$(MAKE) -C os client-install
ifneq ($(SYSTEM),CYGWIN_NT-5.1)
@$(MAKE) -C capture client-install
@$(MAKE) -C tip client-install
endif
@$(MAKE) -C tmcd client-install
subboss: client
@$(MAKE) -C os subboss
......@@ -223,9 +215,6 @@ subboss: client
subboss-install: subboss
@$(MAKE) -C clientside client-install
ifeq ($(EVENTSYS),1)
@$(MAKE) -C event client-install
endif
ifneq ($(SYSTEM),CYGWIN_NT-5.1)
@$(MAKE) -C capture client-install
@$(MAKE) -C tip client-install
......@@ -233,7 +222,7 @@ endif
@$(MAKE) -C utils subboss-install
@$(MAKE) -C os subboss-install
@$(MAKE) -C db subboss-install
@$(MAKE) -C tmcd subboss-install
@$(MAKE) -C clientside/tmcc subboss-install
@$(MAKE) -C rc.d subboss-install
@$(MAKE) -C dhcpd subboss-install
# Hack: this should probably be done by a subboss-install
......@@ -275,46 +264,38 @@ mfsoscheck:
mfs: mfsoscheck
@$(MAKE) -C os mfs
@$(MAKE) -C tmcd mfs
@$(MAKE) -C clientside mfs
mfs-nostatic: mfsoscheck
@NOSTATIC=1 $(MAKE) -C os 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 tmcd mfs-install
@$(MAKE) -C clientside mfs-install
mfs-nostatic-install: destdircheck mfs-nostatic client-mkdirs
@$(MAKE) -C os 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
......@@ -322,13 +303,13 @@ cdboot: mfsoscheck client
cdboot-install: destdircheck cdboot
@$(MAKE) -C cdrom client-install
@$(MAKE) -C tmcd/freebsd6 cdboot-install
@$(MAKE) -C clientside/tmcc/freebsd6 cdboot-install
flashboot: mfsoscheck client
@echo "Flash dongle files built"
flashboot-install: destdircheck flashboot
@$(MAKE) -C tmcd/freebsd6 cdboot-install
@$(MAKE) -C clientside/tmcc/freebsd6 cdboot-install
@$(MAKE) -C os frisbee-mfs-install
@$(MAKE) -C flash client-install
@$(MAKE) -C clientside frisbee-mfs-install
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# All rights reserved.
#
# Most of the configure-substitution magic is done here.
......@@ -83,6 +83,7 @@ ELVIN_COMPAT = @ELVIN_COMPAT@
HAVE_MEZZANINE = @HAVE_MEZZANINE@
GTK_CONFIG = @GTK_CONFIG@
BRAINSTEM_DIR = @BRAINSTEM_DIR@
WITH_EMULAB = @WITH_EMULAB@
host_cpu = @host_cpu@
......
......@@ -707,6 +707,7 @@ TAR
RPM
ELVIN_CONFIG
PATH
WITH_EMULAB
ELVIN_COMPAT
EVENTSYS
CLIENT_ETCDIR
......@@ -715,7 +716,6 @@ CLIENT_VARDIR
CLIENT_MANDIR
LOG_TESTBED
TBLOGFACIL
WITH_EMULAB
PYTHON
GREP
EGREP
......@@ -727,7 +727,6 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
with_TBDEFS
with_emulab
enable_elvin_compat
enable_TPM
'
......@@ -1373,7 +1372,6 @@ Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-TBDEFS=name Specify definitions file (defs-default default)
--with-emulab Internal option; build with Emulab (default no)
Some influential environment variables:
CC C compiler command
......@@ -4129,6 +4127,12 @@ fi
# Need this for Makeconf.
#
# Flag build as clientside only, not withing full Emulab build
#
WITH_EMULAB=0
#
# Elvin compat option, which we still need. Always turn on event system.
#
......@@ -4187,28 +4191,6 @@ $as_echo "$as_me: error: Definitions file $TBDEFS was not found." >&2;}
fi
#
# Internal option; supplied when building as part of full Emulab.
#
WITH_EMULAB=0
# Check whether --with-emulab was given.
if test "${with_emulab+set}" = set; then
withval=$with_emulab;
if test "$withval" = "yes"; then
{ { $as_echo "$as_me:$LINENO: error: Invalid with-emulab directive - Must specify the value" >&5
$as_echo "$as_me: error: Invalid with-emulab directive - Must specify the value" >&2;}
{ (exit 1); exit 1; }; }
fi
WITH_EMULAB=1
EMULAB_SRCDIR=$withval
fi
#
# Allow command line option, since might not have a defs file.
#
......
......@@ -53,6 +53,12 @@ AC_PATH_PROG(ELVIN_CONFIG,elvin-config)
# Need this for Makeconf.
AC_SUBST(PATH)
#
# Flag build as clientside only, not withing full Emulab build
#
WITH_EMULAB=0
AC_SUBST(WITH_EMULAB)
#
# Elvin compat option, which we still need. Always turn on event system.
#
......@@ -101,23 +107,6 @@ AC_ARG_WITH(TBDEFS,
fi
])
#
# Internal option; supplied when building as part of full Emulab.
#
WITH_EMULAB=0
AC_ARG_WITH(emulab,
[ --with-emulab Internal option; build with Emulab (default no)],
[
if test "$withval" = "yes"; then
AC_MSG_ERROR([Invalid with-emulab directive - Must specify the value])
fi
WITH_EMULAB=1
EMULAB_SRCDIR=$withval
])
AC_SUBST(WITH_EMULAB)
#
# Allow command line option, since might not have a defs file.
#
......
......@@ -20,6 +20,8 @@ all: all-subdirs
include $(TESTBED_SRCDIR)/GNUmakerules
boss-install:
$(MAKE) -C genhostsfile boss-install
$(MAKE) -C syncd boss-install
-mkdir -p $(INSTALL_DIR)/opsdir/man/man1
$(INSTALL) -m 644 $(SRCDIR)/install-tarfile.1 \
$(INSTALL_DIR)/opsdir/man/man1/install-tarfile.1
......
......@@ -851,6 +851,7 @@ TBUSERSARCHIVE
TBUSERSARCHIVE_NOSLASH
TBERRORSEMAIL
TBERRORSEMAIL_NOSLASH
WITH_EMULAB
LOG_TESTBED
LEDA
ASSIGN
......@@ -5052,6 +5053,12 @@ GROUPSROOT_DIR="/groups"
SHAREROOT_DIR="/share"
SCRATCHROOT_DIR=""
#
# Flag as full Emulab build (for clientside).
#
WITH_EMULAB=1
#
# Okay, I know this is improper usage of --with. Too bad.
#
......@@ -7200,7 +7207,8 @@ outfiles="$outfiles clientside/GNUmakefile \
clientside/tools/GNUmakefile clientside/tools/pcapper/GNUmakefile \
clientside/sensors/GNUmakefile clientside/sensors/slothd/GNUmakefile \
clientside/sensors/slothd/sdisrunning clientside/sensors/slothd/sddeploy \
clientside/sensors/canaryd/GNUmakefile clientside/sensors/canaryd/feedbacklogs \
clientside/sensors/canaryd/GNUmakefile \
clientside/sensors/canaryd/feedbacklogs \
clientside/os/GNUmakefile clientside/os/syncd/GNUmakefile \
clientside/event/link-agent/GNUmakefile \
clientside/event/proxy/GNUmakefile \
......
......@@ -330,6 +330,12 @@ GROUPSROOT_DIR="/groups"
SHAREROOT_DIR="/share"
SCRATCHROOT_DIR=""
#
# Flag as full Emulab build (for clientside).
#
WITH_EMULAB=1
AC_SUBST(WITH_EMULAB)
#
# Okay, I know this is improper usage of --with. Too bad.
#
......@@ -1065,7 +1071,7 @@ outfiles="$outfiles clientside/GNUmakefile \
clientside/tools/GNUmakefile clientside/tools/pcapper/GNUmakefile \
clientside/sensors/GNUmakefile clientside/sensors/slothd/GNUmakefile \
clientside/sensors/slothd/sdisrunning clientside/sensors/slothd/sddeploy \
clientside/sensors/canaryd/GNUmakefile
clientside/sensors/canaryd/GNUmakefile \
clientside/sensors/canaryd/feedbacklogs \
clientside/os/GNUmakefile clientside/os/syncd/GNUmakefile \
clientside/event/link-agent/GNUmakefile \
......
......@@ -10,7 +10,7 @@ SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
include $(OBJDIR)/Makeconf
SUBDIRS = libtb event
SUBDIRS = libtb event tmcd
all: all-subdirs
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
......@@ -46,6 +47,8 @@ ssl.o: ssl.c ssl.h tmcd.h
tpm.o: tpm.h ssl.h tmcd.h
notpm.o: tpm.h ssl.h tmcd.h
client: all
client-install:
boss-install:
control-install:
subboss-install:
......
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