Commit ab8f2f69 authored by Leigh Stoller's avatar Leigh Stoller

Move canaryd.

parent 30663872
......@@ -236,7 +236,6 @@ endif
@$(MAKE) -C tmcd subboss-install
@$(MAKE) -C rc.d subboss-install
@$(MAKE) -C dhcpd subboss-install
@$(MAKE) -C tbsetup client-install
# Hack: this should probably be done by a subboss-install
# script, but there isn't a huge need for that yet
@rm -f $(INSTALL_RCDIR)/isc-dhcpd
......
......@@ -4830,6 +4830,7 @@ outfiles="Makeconf GNUmakefile \
tools/pcapper/GNUmakefile \
sensors/GNUmakefile \
sensors/slothd/GNUmakefile \
sensors/canaryd/GNUmakefile \
os/GNUmakefile os/syncd/GNUmakefile \
os/dijkstra/GNUmakefile os/genhostsfile/GNUmakefile"
......
......@@ -158,6 +158,7 @@ outfiles="Makeconf GNUmakefile \
tools/pcapper/GNUmakefile \
sensors/GNUmakefile \
sensors/slothd/GNUmakefile \
sensors/canaryd/GNUmakefile \
os/GNUmakefile os/syncd/GNUmakefile \
os/dijkstra/GNUmakefile os/genhostsfile/GNUmakefile"
......
......@@ -7,11 +7,14 @@ SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
OBJDIR = @top_builddir@
SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
SYSTEM := $(shell uname -s)
include $(OBJDIR)/Makeconf
SUBDIRS = slothd
ifeq ($(FBSDVERSION),FreeBSD4)
SUBDIRS += canaryd
endif
all: all-subdirs
include $(TESTBED_SRCDIR)/GNUmakerules
......@@ -24,8 +27,8 @@ subboss-install:
post-install: post-install-subdirs
clean: clean-subdirs
distclean: distclean-subdirs
mfs:
mfs-install:
mfs: client
mfs-install: client-install
frisbee-mfs:
frisbee-mfs-install:
......
#
# 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 = sensors/canaryd
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
OBJDIR = @top_builddir@
SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
TBLIB = $(OBJDIR)/lib/libtb/libtb.a
SBIN_SCRIPTS =
......@@ -18,11 +17,11 @@ include $(OBJDIR)/Makeconf
CC?=gcc
CFLAGS+= -Wall -g -I${OBJDIR} -I/usr/local/include \
-I$(TESTBED_SRCDIR)/lib/libtb \
-I$(TESTBED_SRCDIR)/event/lib \
-I$(TESTBED_SRCDIR)/lib/event \
-DCLIENT_BINDIR='"$(CLIENT_BINDIR)"' \
-DLOG_TESTBED=$(LOG_TESTBED) \
-I/usr/local/include
LDFLAGS+= -L${OBJDIR}/lib/libtb -L/usr/local/lib/mysql -L${OBJDIR}/event/lib
LDFLAGS+= -L${OBJDIR}/lib/libtb -L/usr/local/lib/mysql -L${OBJDIR}/lib/event
LDFLAGS+= $(LDSTATIC)
LIBS+= -ltb -levent -lcrypto -L/usr/local/lib -lpubsub -lm
CP= cp -pf
......@@ -54,6 +53,8 @@ client-install: client
$(INSTALL_PROGRAM) -s canaryd$(EXE) $(DESTDIR)$(CLIENT_BINDIR)$(EXE)
control-install:
mfs:
mfs-install:
clean:
rm -f *.o $(CDPROGS) *~ core *.core version.c
......
......@@ -7028,7 +7028,6 @@ outfiles="$outfiles Makeconf GNUmakefile \
pxe/GNUmakefile pxe/bootinfo.restart \
security/GNUmakefile security/lastlog_daemon \
sensors/GNUmakefile \
sensors/canaryd/GNUmakefile sensors/canaryd/feedbacklogs \
sensors/and/GNUmakefile sensors/and/and-emulab.conf \
sensors/powermon/GNUmakefile sensors/powermon/powermon \
sensors/nfstrace/GNUmakefile sensors/nfstrace/nfstrace.init \
......@@ -7229,6 +7228,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/feedbacklogs \
clientside/os/GNUmakefile clientside/os/syncd/GNUmakefile \
clientside/os/dijkstra/GNUmakefile clientside/os/genhostsfile/GNUmakefile"
......
......@@ -893,7 +893,6 @@ outfiles="$outfiles Makeconf GNUmakefile \
pxe/GNUmakefile pxe/bootinfo.restart \
security/GNUmakefile security/lastlog_daemon \
sensors/GNUmakefile \
sensors/canaryd/GNUmakefile sensors/canaryd/feedbacklogs \
sensors/and/GNUmakefile sensors/and/and-emulab.conf \
sensors/powermon/GNUmakefile sensors/powermon/powermon \
sensors/nfstrace/GNUmakefile sensors/nfstrace/nfstrace.init \
......@@ -1094,6 +1093,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/feedbacklogs \
clientside/os/GNUmakefile clientside/os/syncd/GNUmakefile \
clientside/os/dijkstra/GNUmakefile clientside/os/genhostsfile/GNUmakefile"
......
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