Commit d3cf2b5e authored by Leigh Stoller's avatar Leigh Stoller

Complete changes to move capture into clientside/os directory.

parent 29dceb3c
......@@ -44,14 +44,14 @@ include Makeconf
# @optional_subdirs@ (has event)
# ipod os security sensors
# Then things that only depend on stuff we've done:
# pxe tbsetup tmcd utils backend www tip capture vis
# pxe tbsetup tmcd utils backend www tip vis
# Then things that depend on stuff we just did:
#
ifeq ($(STANDALONE_CLEARINGHOUSE),0)
SUBDIRS = \
clientside/lib \
db assign www @optional_subdirs@ clientside ipod security sensors \
pxe tbsetup account tmcd utils backend tip capture ipod vis \
pxe tbsetup account tmcd utils backend tip ipod vis \
sensors os xmlrpc install/newnode_sshkeys mote tools/whol \
tools/svn wiki bugdb collab node_usage install
ifeq ($(ISMAINSITE),1)
......@@ -209,7 +209,7 @@ tipserv-install:
-mkdir -p $(INSTALL_TOPDIR)/log/tiplogs
-mkdir -p $(INSTALL_TOPDIR)/etc
@$(MAKE) -C tip tipserv-install
@$(MAKE) -C capture tipserv-install
@$(MAKE) -C clientside/os/capture tipserv-install
@$(MAKE) -C tbsetup tipserv-install
client-mkdirs:
......@@ -220,7 +220,6 @@ client:
@$(MAKE) -C clientside client
@$(MAKE) -C os client
ifneq ($(SYSTEM),CYGWIN_NT-5.1)
@$(MAKE) -C capture client
@$(MAKE) -C tip client
endif
......@@ -228,7 +227,6 @@ client-install: client client-mkdirs
@$(MAKE) -C clientside client-install
@$(MAKE) -C os client-install
ifneq ($(SYSTEM),CYGWIN_NT-5.1)
@$(MAKE) -C capture client-install
@$(MAKE) -C tip client-install
endif
......@@ -236,7 +234,6 @@ subboss:
@$(MAKE) -C clientside subboss
@$(MAKE) -C os subboss
ifneq ($(SYSTEM),CYGWIN_NT-5.1)
@$(MAKE) -C capture client
@$(MAKE) -C tip client
endif
@$(MAKE) -C utils subboss
......@@ -245,7 +242,6 @@ subboss-install: subboss
@$(MAKE) -C clientside subboss-install
@$(MAKE) -C os subboss-install
ifneq ($(SYSTEM),CYGWIN_NT-5.1)
@$(MAKE) -C capture client-install
@$(MAKE) -C tip client-install
endif
@$(MAKE) -C utils subboss-install
......
......@@ -4957,6 +4957,7 @@ outfiles="Makeconf GNUmakefile setversion \
tmcc/centos6/GNUmakefile \
os/GNUmakefile os/syncd/GNUmakefile \
os/dijkstra/GNUmakefile os/genhostsfile/GNUmakefile \
os/capture/GNUmakefile \
os/frisbee.redux/GNUmakefile \
os/growdisk/GNUmakefile \
os/zapdisk/GNUmakefile \
......
#
# Copyright (c) 2000-2013 University of Utah and the Flux Group.
# Copyright (c) 2000-2014 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -283,6 +283,7 @@ outfiles="Makeconf GNUmakefile setversion \
os/GNUmakefile os/syncd/GNUmakefile \
os/dijkstra/GNUmakefile os/genhostsfile/GNUmakefile \
os/frisbee.redux/GNUmakefile \
os/capture/GNUmakefile \
os/growdisk/GNUmakefile \
os/zapdisk/GNUmakefile \
os/imagezip/GNUmakefile \
......
......@@ -30,7 +30,7 @@ SYSTEM := $(shell uname -s)
include $(OBJDIR)/Makeconf
SUBDIRS = syncd dijkstra genhostsfile imagezip frisbee.redux
SUBDIRS = syncd dijkstra genhostsfile imagezip frisbee.redux capture
ifeq ($(SYSTEM),FreeBSD)
SUBDIRS += growdisk
endif
......@@ -49,6 +49,7 @@ boss-install:
$(MAKE) -C syncd boss-install
$(MAKE) -C imagezip boss-install
$(MAKE) -C frisbee.redux install
$(MAKE) -C capture install
-mkdir -p $(INSTALL_DIR)/opsdir/man/man1
$(INSTALL) -m 644 $(SRCDIR)/install-tarfile.1 \
$(INSTALL_DIR)/opsdir/man/man1/install-tarfile.1
......@@ -71,6 +72,7 @@ client-install: client
ifneq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT) # Filter out again...
$(MAKE) -C imagezip client-install
$(MAKE) -C frisbee.redux client-install
$(MAKE) -C capture client-install
endif
$(MAKE) -C genhostsfile client-install
ifeq ($(SYSTEM),FreeBSD)
......@@ -92,6 +94,7 @@ subboss: subboss-subdirs
subboss-install: subboss
$(MAKE) -C genhostsfile subboss-install
ifneq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT) # Filter out again...
$(MAKE) -C capture client-install
$(MAKE) -C imagezip client-install
$(MAKE) -C frisbee.redux subboss-install
endif
......
......@@ -20,11 +20,10 @@
#
# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
OBJDIR = ..
SUBDIR = capture
OBJDIR = @top_builddir@
SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
SYSTEM := $(shell uname -s)
......@@ -37,7 +36,7 @@ WITH_TELNET = 0
all: boss-all tipserv-all
boss-all: capserver
tipserv-all: capture capture-tty capquery caplogserver caplog caplog.bin
client: capture capquery caplog caplog.bin
client: capture capture-nossl capquery caplog caplog.bin
include $(TESTBED_SRCDIR)/GNUmakerules
......@@ -97,8 +96,9 @@ install: all $(INSTALL_SBINDIR)/capserver $(INSTALL_SBINDIR)/capture
$(INSTALL_PROGRAM) capture $(INSTALL_DIR)/opsdir/sbin/capture
client-install: client
$(INSTALL_PROGRAM) capture$(EXE) $(DESTDIR)$(CLIENT_BINDIR)/capture$(EXE)
$(INSTALL_PROGRAM) capquery$(EXE) $(DESTDIR)$(CLIENT_BINDIR)/capquery$(EXE)
$(INSTALL_PROGRAM) capture$(EXE) $(DESTDIR)$(INSTALL_SBINDIR)/capture$(EXE)
$(INSTALL_PROGRAM) capquery$(EXE) $(DESTDIR)$(INSTALL_SBINDIR)/capquery$(EXE)
$(INSTALL_PROGRAM) capture-nossl$(EXE) $(DESTDIR)$(INSTALL_SBINDIR)/capture-nossl$(EXE)
real-install: all $(INSTALL_SBINDIR)/capserver $(INSTALL_SBINDIR)/capture
......
/*
* Copyright (c) 2005, 2007 University of Utah and the Flux Group.
* Copyright (c) 2005-2014 University of Utah and the Flux Group.
*
* {{{EMULAB-LICENSE
*
......@@ -40,6 +40,9 @@
#include <sys/time.h>
#include <grp.h>
#include "capdecls.h"
#ifndef BOSSNODE
#define BOSSNODE "boss"
#endif
static int debug = 0;
......
......@@ -83,6 +83,9 @@
#include "config.h"
#endif /* USESOCKETS */
#include "capdecls.h"
#ifndef BOSSNODE
#define BOSSNODE "boss"
#endif
#define geterr(e) strerror(e)
......
......@@ -6688,7 +6688,6 @@ outfiles="$outfiles Makeconf GNUmakefile \
assign/GNUmakefile \
named/GNUmakefile firewall/GNUmakefile fwrules/GNUmakefile \
ssl/GNUmakefile ssl/mksig ssl/usercert.cnf ssl/mkserial \
capture/GNUmakefile \
db/GNUmakefile \
db/EmulabConstants.pm db/EmulabFeatures.pm db/Experiment.pm \
db/Firewall.pm db/Group.pm db/Image.pm db/Interface.pm \
......
......@@ -1162,7 +1162,6 @@ outfiles="$outfiles Makeconf GNUmakefile \
assign/GNUmakefile \
named/GNUmakefile firewall/GNUmakefile fwrules/GNUmakefile \
ssl/GNUmakefile ssl/mksig ssl/usercert.cnf ssl/mkserial \
capture/GNUmakefile \
db/GNUmakefile \
db/EmulabConstants.pm db/EmulabFeatures.pm db/Experiment.pm \
db/Firewall.pm db/Group.pm db/Image.pm db/Interface.pm \
......
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