Commit e460550c authored by Leigh Stoller's avatar Leigh Stoller

Forgot to move the lib directory from toplevel into clientside, since

clientside requres it to be there. As noted in previous revision, the
full emulab build always includes the clientside subdir, but a
clientside build will not necessarily include the rest of Emulab.
parent 965687f5
......@@ -30,10 +30,12 @@ include Makeconf
# Then things that depend on stuff we just did:
#
ifeq ($(STANDALONE_CLEARINGHOUSE),0)
SUBDIRS = lib db assign www @optional_subdirs@ clientside ipod security sensors \
pxe tbsetup account tmcd utils backend tip capture ipod vis \
sensors os xmlrpc install/newnode_sshkeys mote tools/whol \
tools/svn wiki bugdb collab protogeni node_usage install
SUBDIRS = \
clientside/lib \
db assign www @optional_subdirs@ clientside ipod security sensors \
pxe tbsetup account tmcd utils backend tip capture ipod vis \
sensors os xmlrpc install/newnode_sshkeys mote tools/whol \
tools/svn wiki bugdb collab protogeni node_usage install
ifeq ($(ISMAINSITE),1)
SUBDIRS += tools/rmanage
endif
......@@ -130,7 +132,6 @@ ops-install:
@$(MAKE) -C db control-install
@$(MAKE) -C tbsetup control-install
@$(MAKE) -C utils control-install
@$(MAKE) -C lib control-install
ifeq ($(EVENTSYS),1)
@$(MAKE) -C event control-install
endif
......@@ -192,7 +193,6 @@ client-mkdirs:
-mkdir -p $(DESTDIR)$(CLIENT_MANDIR)
client:
@$(MAKE) -C lib client
@$(MAKE) -C clientside client
@$(MAKE) -C os client
ifneq ($(SYSTEM),CYGWIN_NT-5.1)
......@@ -201,7 +201,6 @@ ifneq ($(SYSTEM),CYGWIN_NT-5.1)
endif
client-install: client client-mkdirs
@$(MAKE) -C lib client-install
@$(MAKE) -C clientside client-install
@$(MAKE) -C os client-install
ifneq ($(SYSTEM),CYGWIN_NT-5.1)
......
......@@ -96,3 +96,5 @@ MERGE_BUILD = @MERGE_BUILD@
MERGE_BUILD_SANDBOX = @MERGE_BUILD_SANDBOX@
EXP_VIS_SUPPORT = @EXP_VIS_SUPPORT@
TESTBED_LIBSRCDIR = ${TESTBED_SRCDIR}/clientside/lib
TESTBED_LIBOBJDIR = ${OBJDIR}/clientside/lib
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2008 University of Utah and the Flux Group.
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -20,7 +20,7 @@ client: capture capquery caplog caplog.bin
include $(TESTBED_SRCDIR)/GNUmakerules
DBFLAGS += -I/usr/local/include -I$(TESTBED_SRCDIR)/lib/libtb
DBFLAGS += -I/usr/local/include -I$(TESTBED_LIBSRCDIR)/libtb
#
# Define LOG_DROPS to record warnings in syslog whenever chars were dropped
......@@ -60,7 +60,7 @@ capture-tty: capture.c capdecls.h
capserver: capserver.c capdecls.h
$(CC) $(CFLAGS) $(DBFLAGS) -o capserver $< \
${OBJDIR}/lib/libtb/libtb.a \
${TESTBED_LIBOBJDIR}/libtb/libtb.a \
-L/usr/local/lib/mysql -lmysqlclient
#
......
......@@ -11,16 +11,7 @@ SYSTEM := $(shell uname -s)
include $(OBJDIR)/Makeconf
SUBDIRS =
ifeq ($(WITH_EMULAB),0)
#
# lib is a common directory, and is added to the clientside tarball.
# So not do not build it when building full emulab tree; already done.
#
SUBDIRS += lib
endif
# These must be after lib.
SUBDIRS += event tools os sensors tmcc
SUBDIRS = lib event tools os sensors tmcc
ifeq ($(WITH_EMULAB),1)
all: all-subdirs
......
......@@ -53,3 +53,5 @@ LOG_TESTBED = @LOG_TESTBED@
EVENTSYS = @EVENTSYS@
ELVIN_COMPAT = @ELVIN_COMPAT@
WITH_EMULAB = @WITH_EMULAB@
TESTBED_LIBSRCDIR = ${TESTBED_SRCDIR}/lib
TESTBED_LIBOBJDIR = ${OBJDIR}/lib
......@@ -4829,6 +4829,10 @@ done
# END Python detection.
outfiles="Makeconf GNUmakefile \
lib/GNUmakefile \
lib/libtb/GNUmakefile \
lib/tmcd/GNUmakefile \
lib/event/GNUmakefile \
event/GNUmakefile \
event/program-agent/GNUmakefile \
event/link-agent/GNUmakefile \
......@@ -4873,21 +4877,6 @@ outfiles="Makeconf 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
# from the outer (upper?) build. Otherwise, we have to add them
# to the files list.
#
if test $WITH_EMULAB -eq 0; then
outfiles="$outfiles lib/GNUmakefile \
lib/libtb/GNUmakefile \
lib/tmcd/GNUmakefile \
lib/event/GNUmakefile"
else
ac_config_commands="$ac_config_commands lib"
fi
#
# Do this for easy distclean.
#
......@@ -5333,7 +5322,6 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for.
config_files="$ac_config_files"
config_headers="$ac_config_headers"
config_commands="$ac_config_commands"
_ACEOF
......@@ -5360,9 +5348,6 @@ $config_files
Configuration headers:
$config_headers
Configuration commands:
$config_commands
Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
......@@ -5486,7 +5471,6 @@ for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"lib") CONFIG_COMMANDS="$CONFIG_COMMANDS lib" ;;
"$outfiles") CONFIG_FILES="$CONFIG_FILES $outfiles" ;;
*) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
......@@ -5503,7 +5487,6 @@ done
if $ac_need_defaults; then
test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
fi
# Have a temporary directory for convenience. Make it in the build tree
......@@ -5799,7 +5782,7 @@ $as_echo "$as_me: error: could not setup config headers machinery" >&2;}
fi # test -n "$CONFIG_HEADERS"
eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS "
shift
for ac_tag
do
......@@ -6100,16 +6083,9 @@ $as_echo "$as_me: error: could not create -" >&2;}
fi
;;
:C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
case $ac_file$ac_mode in
"lib":C) rm -f lib; ln -s ../lib . ;;
esac
done # for ac_tag
......
......@@ -155,6 +155,10 @@ AC_SUBST(PYTHON_INCLUDE)
# END Python detection.
outfiles="Makeconf GNUmakefile \
lib/GNUmakefile \
lib/libtb/GNUmakefile \
lib/tmcd/GNUmakefile \
lib/event/GNUmakefile \
event/GNUmakefile \
event/program-agent/GNUmakefile \
event/link-agent/GNUmakefile \
......@@ -199,20 +203,6 @@ outfiles="Makeconf 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
# from the outer (upper?) build. Otherwise, we have to add them
# to the files list.
#
if test $WITH_EMULAB -eq 0; then
outfiles="$outfiles lib/GNUmakefile \
lib/libtb/GNUmakefile \
lib/tmcd/GNUmakefile \
lib/event/GNUmakefile"
else
AC_CONFIG_COMMANDS([lib], [rm -f lib; ln -s ../lib .])
fi
#
# Do this for easy distclean.
#
......
......@@ -16,12 +16,12 @@ include $(TESTBED_SRCDIR)/GNUmakerules
#CFLAGS += -DDEBUG
CFLAGS += -O -g -Wall
CFLAGS += -I. -I${OBJDIR} -I$(TESTBED_SRCDIR)/lib/libtb
CFLAGS += -I$(TESTBED_SRCDIR)/lib/event
CFLAGS += -I. -I$(TESTBED_LIBSRCDIR)/libtb
CFLAGS += -I$(TESTBED_LIBSRCDIR)/event
CFLAGS += -I/usr/local/include
LDFLAGS += $(LDSTATIC)
LDFLAGS += -L${OBJDIR}/lib/libtb -L${OBJDIR}/lib/event
LDFLAGS += -L${TESTBED_LIBOBJDIR}/libtb -L${TESTBED_LIBOBJDIR}/event
LIBS += -levent -ltb -lcrypto
LIBS += -L/usr/local/lib -lpubsub -lm
......@@ -30,7 +30,7 @@ OBJS = main.o callback.o
delay-agent: $(OBJS)
$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
$(OBJS): main.h $(OBJDIR)/lib/event/libevent.a
$(OBJS): main.h $(TESTBED_LIBOBJDIR)/event/libevent.a
install:
boss-install:
......
......@@ -19,10 +19,10 @@ include $(TESTBED_SRCDIR)/GNUmakerules
CFLAGS += -DDEBUG
CFLAGS += -O -g -Wall
CFLAGS += -I. -I${OBJDIR}
CFLAGS += -I$(TESTBED_SRCDIR)/lib/event -I$(TESTBED_SRCDIR)/lib/libtb
CFLAGS += -I$(TESTBED_LIBSRCDIR)/event -I$(TESTBED_LIBSRCDIR)/libtb
CFLAGS += -I/usr/local/include
LDFLAGS += -L${OBJDIR}/lib/event -L${OBJDIR}/lib/libtb
LDFLAGS += -L${TESTBED_LIBOBJDIR}/event -L${TESTBED_LIBOBJDIR}/libtb
LIBS += -levent -ltb -lcrypto
LIBS += -L/usr/local/lib -lpubsub -lm
LDFLAGS += $(LDSTATIC)
......@@ -50,7 +50,8 @@ endif
link-agent-debug: link-agent.o
$(CC) $(LDFLAGS) -o $@ link-agent.o $(LIBS)
$(PROGRAMS): ${OBJDIR}/lib/event/libevent.a ${OBJDIR}/lib/event/event.h
$(PROGRAMS): ${TESTBED_LIBOBJDIR}/event/libevent.a \
${TESTBED_LIBSRCDIR}/event/event.h
boss-install:
......
......@@ -8,8 +8,8 @@ TESTBED_SRCDIR = @top_srcdir@
OBJDIR = @top_builddir@
SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
LIBTBDIR = $(OBJDIR)/lib/libtb
LIBEVENTDIR = ${OBJDIR}/lib/event
LIBTBDIR = $(TESTBED_LIBOBJDIR)/libtb
LIBEVENTDIR = ${TESTBED_LIBOBJDIR}/event
DAEMON = linktest
LTEVENT = ltevent
SCRIPT = linktest.pl
......@@ -36,10 +36,10 @@ include $(TESTBED_SRCDIR)/GNUmakerules
CFLAGS += -DDEBUG -DCLIENT_BINDIR='"$(CLIENT_BINDIR)"'
CFLAGS += -O -g -Wall
CFLAGS += -I. -I${OBJDIR}
CFLAGS += -I$(TESTBED_SRCDIR)/lib/event -I$(TESTBED_SRCDIR)/lib/libtb
CFLAGS += -I$(TESTBED_LIBSRCDIR)/event -I$(TESTBED_LIBSRCDIR)/libtb
CFLAGS += -I/usr/local/include
LDFLAGS += -L${OBJDIR}/lib/event -L${OBJDIR}/lib/libtb
LDFLAGS += -L${LIBEVENTDIR} -L${LIBTBDIR}
LIBS += -levent -lcrypto -lssl
LIBS += -L/usr/local/lib -lpubsub -lm
LDFLAGS += $(LDSTATIC)
......@@ -87,9 +87,11 @@ $(LTEVENT)-debug: $(LTEVENT_OBJS) $(LIBTB_OBJS)
version.c: linktest.c
echo >$@ "char build_info[] = \"Built `date +%d-%b-%Y` by `id -nu`@`hostname | sed 's/\..*//'`:`pwd`\";"
$(DAEMON_OBJS): ${OBJDIR}/lib/event/libevent.a ${OBJDIR}/lib/event/event.h
$(DAEMON_OBJS): ${TESTBED_LIBOBJDIR}/event/libevent.a \
${TESTBED_LIBSRCDIR}/event/event.h
$(LTEVENT_OBJS): ${OBJDIR}/lib/event/libevent.a ${OBJDIR}/lib/event/event.h
$(LTEVENT_OBJS): ${TESTBED_LIBOBJDIR}/event/libevent.a \
${TESTBED_LIBSRCDIR}/event/event.h
# We install just enough to fire off the test from boss and wait.
boss-install: weblinktest $(SCRIPT_RUN) $(SCRIPT_PROXY) $(LTEVENT) \
......
......@@ -20,12 +20,12 @@ include $(TESTBED_SRCDIR)/GNUmakerules
CFLAGS += -DDEBUG
CFLAGS += -O -g -Wall
CFLAGS += -I. -I${OBJDIR}
CFLAGS += -I$(TESTBED_SRCDIR)/lib/event -I$(TESTBED_SRCDIR)/lib/libtb
CFLAGS += -I$(TESTBED_LIBSRCDIR)/event -I$(TESTBED_LIBSRCDIR)/libtb
CFLAGS += -I/usr/local/include
CFLAGS += -DHAVE_PUBSUB
CFLAGS += -DCLIENT_BINDIR='"$(CLIENT_BINDIR)"'
LDFLAGS += -g -L${OBJDIR}/lib/event -L${OBJDIR}/lib/libtb
LDFLAGS += -g -L${TESTBED_LIBOBJDIR}/event -L${TESTBED_LIBOBJDIR}/libtb
LIBS += -levent -ltb -lcrypto
LIBS += -L/usr/local/lib -lpubsub
LDFLAGS += $(LDSTATIC)
......@@ -53,7 +53,8 @@ version.c: program-agent.c
program-agent-debug: program-agent.o version.o
$(CC) $(LDFLAGS) -o $@ program-agent.o version.o $(LIBS)
$(PROGRAMS): ${OBJDIR}/lib/event/libevent.a ${OBJDIR}/lib/event/event.h
$(PROGRAMS): ${TESTBED_LIBOBJDIR}/event/libevent.a \
${TESTBED_LIBSRCDIR}/event/event.h
boss-install: $(INSTALL_DIR)/opsdir/sbin/program-agent
-mkdir -p $(INSTALL_DIR)/opsdir/man/man8
......
......@@ -17,8 +17,8 @@ all: $(PROGRAMS)
include $(TESTBED_SRCDIR)/GNUmakerules
LIBTBDIR = $(OBJDIR)/lib/libtb
LIBEVENTDIR = $(OBJDIR)/lib/event
LIBTBDIR = $(TESTBED_LIBOBJDIR)/libtb
LIBEVENTDIR = $(TESTBED_LIBOBJDIR)/event
CPPC = g++
# Rules to make sure that some libraries we need from other directories get
......@@ -32,22 +32,24 @@ $(LIBEVENTDIR)/%.a:
CFLAGS += -DDEBUG
CFLAGS += -O2 -g -Wall
CFLAGS += -I. -I${OBJDIR}
CFLAGS += -I$(TESTBED_SRCDIR)/lib/event -I$(TESTBED_SRCDIR)/lib/libtb
CFLAGS += -I$(TESTBED_LIBSRCDIR)/event -I$(TESTBED_LIBSRCDIR)/libtb
CFLAGS += -I/usr/local/include
PFLAGS = -pthread
PFLAGS += -DDEBUG
PFLAGS += -O2 -g -Wall
PFLAGS += -I. -I${OBJDIR}
PFLAGS += -I$(TESTBED_SRCDIR)/lib/event -I$(TESTBED_SRCDIR)/lib/libtb
PFLAGS += -I$(TESTBED_LIBSRCDIR)/event -I$(TESTBED_LIBSRCDIR)/libtb
PFLAGS += -L/usr/local/lib -lpubsub_r -ltb -lm
PLDFLAGS += -L$(OBJDIR)/lib -L$(OBJDIR)/lib/libtb -L$(OBJDIR)/lib/event
PLDFLAGS += -L$(TESTBED_LIBOBJDIR)
PLDFLAGS += -L$(TESTBED_LIBOBJDIR)/libtb -L$(TESTBED_LIBOBJDIR)/event
PLIBS = -levent_r -ltb -lcrypto
PLIBS += -L/usr/local/lib -lpubsub_r -ltb -lm
PLDFLAGS += $(LDSTATIC)
LDFLAGS += -L$(OBJDIR)/lib -L$(OBJDIR)/lib/libtb -L$(OBJDIR)/lib/event
LDFLAGS += -L$(TESTBED_LIBOBJDIR)
LDFLAGS += -L$(TESTBED_LIBOBJDIR)/libtb -L$(TESTBED_LIBOBJDIR)/event
LIBS = -levent -ltb -lcrypto
LIBS += -L/usr/local/lib -lpubsub -ltb -lm
LDFLAGS += $(LDSTATIC)
......@@ -87,13 +89,15 @@ evproxyplab.o: evproxyplab.cc
$(CPPC) $(CFLAGS) -c $<
evproxyplab-debug: evproxyplab.o \
${OBJDIR}/lib/event/libevent.a ${OBJDIR}/lib/event/event.h
${TESTBED_LIBOBJDIR}/event/libevent.a \
${TESTBED_LIBOBJDIR}/event/event.h
$(CPPC) $(LDFLAGS) -o $@ evproxyplab.o $(LIBS)
eventping-debug: eventping.o
$(CC) $(LDFLAGS) -o $@ eventping.o -pthread $(LIBS)
$(PROGRAMS): ${OBJDIR}/lib/event/libevent.a ${OBJDIR}/lib/event/event.h
$(PROGRAMS): ${TESTBED_LIBOBJDIR}/event/libevent.a \
${TESTBED_LIBSRCDIR}/event/event.h
control-install:
......
......@@ -17,8 +17,8 @@ all: $(PROGRAMS)
include $(TESTBED_SRCDIR)/GNUmakerules
LIBTBDIR = $(OBJDIR)/lib/libtb
LIBEVENTDIR = $(OBJDIR)/lib/event
LIBTBDIR = $(TESTBED_LIBOBJDIR)/libtb
LIBEVENTDIR = $(TESTBED_LIBOBJDIR)/event
# Rules to make sure that some libraries we need from other directories get
# built first
......@@ -31,10 +31,11 @@ $(LIBEVENTDIR)/%.a:
CFLAGS += -DDEBUG
CFLAGS += -O -g -Wall
CFLAGS += -I. -I${OBJDIR}
CFLAGS += -I$(TESTBED_SRCDIR)/lib/event -I$(TESTBED_SRCDIR)/lib/libtb
CFLAGS += -I$(TESTBED_LIBSRCDIR)/event -I$(TESTBED_LIBSRCDIR)/libtb
CFLAGS += -I/usr/local/include
LDFLAGS += -L$(OBJDIR)/lib -L$(OBJDIR)/lib/libtb -L$(OBJDIR)/lib/event
LDFLAGS += -L$(TESTBED_LIBOBJDIR)
LDFLAGS += -L$(TESTBED_LIBOBJDIR)/libtb -L$(TESTBED_LIBOBJDIR)/event
LIBS += -levent -lcrypto
LIBS += -lm -L/usr/local/lib -lpubsub
LDFLAGS += $(LDSTATIC)
......
......@@ -38,11 +38,11 @@ include $(TESTBED_SRCDIR)/GNUmakerules
CFLAGS += -DDEBUG
CFLAGS += -O -g #-Wall
CFLAGS += -I. -I$(TGSRCDIR) -I${OBJDIR}
CFLAGS += -I$(TESTBED_SRCDIR)/lib/event -I$(TESTBED_SRCDIR)/lib/libtb
CFLAGS += -I$(TESTBED_LIBSRCDIR)/event -I$(TESTBED_LIBSRCDIR)/libtb
CFLAGS += -I/usr/local/include
CFLAGS += -DUSEEVENTS
LDFLAGS += -L${OBJDIR}/lib/event -L${OBJDIR}/lib/libtb
LDFLAGS += -L${TESTBED_LIBOBJDIR}/event -L${TESTBED_LIBOBJDIR}/libtb
LIBS += -levent -ltb -lcrypto
# Expand the elvin-config list now so it can be filtered below.
LIBS += -L/usr/local/lib -lpubsub -lm
......@@ -107,7 +107,8 @@ tg.o: tg.y lex.yy.c
trafgen-debug: $(OBJS)
$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
$(PROGRAMS): ${OBJDIR}/lib/event/libevent.a ../../lib/event/event.h
$(PROGRAMS): ${TESTBED_LIBOBJDIR}/event/libevent.a \
${TESTBED_LIBSRCDIR}/event/event.h
install:
boss-install:
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
......@@ -19,7 +18,7 @@ include $(TESTBED_SRCDIR)/GNUmakerules
CFLAGS += -O -g -Wall -DUDP \
-I${OBJDIR} -I/usr/local/include \
-I${TESTBED_SRCDIR}/lib/libtb \
-I${TESTBED_LIBSRCDIR}/libtb \
-L/usr/local/lib
LDFLAGS += $(LDSTATIC)
......
......@@ -10,8 +10,8 @@ SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
include $(OBJDIR)/Makeconf
CFLAGS = -Wall -O2 -g $(LDSTATIC) -I${OBJDIR} -I${TESTBED_SRCDIR}/lib/libtb
LIBS = ${OBJDIR}/lib/libtb/libtb.a
CFLAGS = -Wall -O2 -g $(LDSTATIC) -I${OBJDIR} -I${TESTBED_LIBSRCDIR}/libtb
LIBS = ${TESTBED_LIBOBJDIR}/libtb/libtb.a
all: genhostsfile genfromdb genfromtopo
......
......@@ -10,9 +10,8 @@ SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
include $(OBJDIR)/Makeconf
CFLAGS = -Wall -O2 -g \
-I${OBJDIR} -I${TESTBED_SRCDIR}/lib/libtb
LIBS = ${OBJDIR}/lib/libtb/libtb.a
CFLAGS = -Wall -O2 -g -I${OBJDIR} -I${TESTBED_LIBSRCDIR}/libtb
LIBS = ${TESTBED_LIBOBJDIR}/libtb/libtb.a
LDFLAGS =
LDFLAGS += $(LDSTATIC)
......
......@@ -9,7 +9,7 @@ OBJDIR = @top_builddir@
SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
SYSTEM := $(shell uname -s)
SLOTHD_DIR = unknownclient
TBLIB = $(OBJDIR)/lib/libtb/libtb.a
TBLIB = $(TESTBED_LIBOBJDIR)/libtb/libtb.a
SBIN_SCRIPTS = sdisrunning sddeploy
SDPROGS = sdcollectd$(EXE) slothd$(EXE)
......@@ -19,10 +19,10 @@ include $(OBJDIR)/Makeconf
CC?=gcc
## For debug compilation
##CFLAGS+= -g
CFLAGS+= -Wall -I${OBJDIR} -I/usr/local/include -I$(TESTBED_SRCDIR)/lib/libtb \
CFLAGS+= -Wall -I${OBJDIR} -I/usr/local/include -I$(TESTBED_LIBSRCDIR)/libtb \
-DCLIENT_BINDIR='"$(CLIENT_BINDIR)"' \
-DLOG_TESTBED=$(LOG_TESTBED)
LDFLAGS+= $(LDSTATIC) -L${OBJDIR}/lib/libtb -L/usr/local/lib/mysql
LDFLAGS+= $(LDSTATIC) -L${TESTBED_LIBOBJDIR}/libtb -L/usr/local/lib/mysql
SDLIBS+= -ltb -lmysqlclient
LIBS= $(MLIBS)
CP= cp -pf
......
......@@ -16,17 +16,18 @@ fullclient: tmcc
client: tmcc-nossl findif dostype
# For VPATH.
MOSTLY_SRCDIRS = ${TESTBED_SRCDIR}/lib/libtb \
${TESTBED_SRCDIR}/lib/tmcd
MOSTLY_SRCDIRS = ${TESTBED_LIBSRCDIR}/libtb \
${TESTBED_LIBSRCDIR}/tmcd
include $(TESTBED_SRCDIR)/GNUmakerules
CFLAGS += -O -g -Wall -DUDP \
-I${OBJDIR} -I/usr/local/include \
-I${TESTBED_SRCDIR}/lib/libtb \
-I${TESTBED_SRCDIR}/lib/tmcd \
-I${TESTBED_LIBSRCDIR}/libtb \
-I${TESTBED_LIBSRCDIR}/tmcd \
-L/usr/local/lib
TMLIBS = ${OBJDIR}/lib/tmcd/libtmcc.a ${OBJDIR}/lib/libtb/libtb.a
TMLIBS = ${TESTBED_LIBOBJDIR}/tmcd/libtmcc.a
TMLIBS += ${TESTBED_LIBOBJDIR}/libtb/libtb.a
LDFLAGS += $(LDSTATIC)
#
......@@ -151,10 +152,10 @@ elabinelabfiles:
# Here so that the event system libraries, and libraries they depend upon,
# can get made.
#
${OBJDIR}/lib/tmcd/%:
cd ${OBJDIR}/lib/tmcd && gmake $<
${OBJDIR}/lib/libtb/%:
cd ${OBJDIR}/lib/tbdb && gmake $<
${TESTBED_LIBOBJDIR}/tmcd/%:
cd ${TESTBED_LIBOBJDIR}/tmcd && gmake $<
${TESTBED_LIBOBJDIR}/libtb/%:
cd ${TESTBED_LIBOBJDIR}/tbdb && gmake $<
clean: subdir-clean
rm -f *.o core tmcd tmcc tmcc-nossl findif dostype *-debug
......
......@@ -37,12 +37,13 @@ endif
ELVINFLAGS = -I/usr/local/include
ELVINLIBS = -L/usr/local/lib -lpubsub -lm
EVENTFLAGS = -DEVENTSYS -I$(TESTBED_SRCDIR)/lib/event $(ELVINFLAGS)
EVENTOBJS = $(OBJDIR)/lib/event/event.o $(OBJDIR)/lib/event/util.o
EVENTFLAGS = -DEVENTSYS -I$(TESTBED_LIBSRCDIR)/event $(ELVINFLAGS)
EVENTOBJS = $(TESTBED_LIBOBJDIR)/event/event.o \
$(TESTBED_LIBOBJDIR)/event/util.o
EVENTLIBS = $(ELVINLIBS) -lcrypto
TBCFLAGS = $(EVENTFLAGS) -I$(TESTBED_SRCDIR)/lib/libtb
TBLIBS = $(EVENTOBJS) $(OBJDIR)/lib/libtb/libtb.a $(EVENTLIBS)
TBCFLAGS = $(EVENTFLAGS) -I$(TESTBED_LIBSRCDIR)/libtb
TBLIBS = $(EVENTOBJS) $(TESTBED_LIBOBJDIR)/libtb/libtb.a $(EVENTLIBS)
PCAPLIBS=-lpcap
......
......@@ -5616,7 +5616,7 @@ if test "$enable_events" = "no"; then
eventfiles="";
EVENTSYS=0;
else
eventfiles="event/GNUmakefile lib/event/GNUmakefile \
eventfiles="event/GNUmakefile clientside/lib/event/GNUmakefile \
event/etc/elvind-boss.conf event/etc/elvind-ops.conf \
event/etc/elvind-inetd.conf event/etc/GNUmakefile\
event/sched/GNUmakefile \
......@@ -7159,7 +7159,6 @@ outfiles="$outfiles Makeconf GNUmakefile \
db/idletimes db/idlemail db/xmlconvert \
db/libdb.py db/elabinelab_bossinit \
ipod/GNUmakefile \
lib/GNUmakefile lib/libtb/GNUmakefile lib/tmcd/GNUmakefile \
os/GNUmakefile os/split-image.sh os/imagezip/GNUmakefile \
os/imagezip/ffs/GNUmakefile os/imagezip/extfs/GNUmakefile os/imagezip/ext4fs/GNUmakefile \
os/imagezip/hashmap/GNUmakefile \
......@@ -7345,6 +7344,8 @@ outfiles="$outfiles Makeconf GNUmakefile \
# lists here and in clientside.
#
outfiles="$outfiles clientside/GNUmakefile \
clientside/lib/GNUmakefile clientside/lib/libtb/GNUmakefile \
clientside/lib/tmcd/GNUmakefile \
clientside/GNUmakefile clientside/event/GNUmakefile \
clientside/event/program-agent/GNUmakefile \
clientside/tools/GNUmakefile clientside/tools/pcapper/GNUmakefile \
......
......@@ -703,7 +703,7 @@ if test "$enable_events" = "no"; then
eventfiles="";
EVENTSYS=0;
else
eventfiles="event/GNUmakefile lib/event/GNUmakefile \
eventfiles="event/GNUmakefile clientside/lib/event/GNUmakefile \
event/etc/elvind-boss.conf event/etc/elvind-ops.conf \
event/etc/elvind-inetd.conf event/etc/GNUmakefile\
event/sched/GNUmakefile \
......@@ -891,7 +891,6 @@ outfiles="$outfiles Makeconf GNUmakefile \
db/idletimes db/idlemail db/xmlconvert \
db/libdb.py db/elabinelab_bossinit \
ipod/GNUmakefile \
lib/GNUmakefile lib/libtb/GNUmakefile lib/tmcd/GNUmakefile \
os/GNUmakefile os/split-image.sh os/imagezip/GNUmakefile \
os/imagezip/ffs/GNUmakefile os/imagezip/extfs/GNUmakefile os/imagezip/ext4fs/GNUmakefile \
os/imagezip/hashmap/GNUmakefile \
......@@ -1077,6 +1076,8 @@ outfiles="$outfiles Makeconf GNUmakefile \
# lists here and in clientside.
#
outfiles="$outfiles clientside/GNUmakefile \
clientside/lib/GNUmakefile clientside/lib/libtb/GNUmakefile \
clientside/lib/tmcd/GNUmakefile \
clientside/GNUmakefile clientside/event/GNUmakefile \
clientside/event/program-agent/GNUmakefile \
clientside/tools/GNUmakefile clientside/tools/pcapper/GNUmakefile \
......
......@@ -21,10 +21,11 @@ include $(TESTBED_SRCDIR)/GNUmakerules
CFLAGS += -DDEBUG
CFLAGS += -O -g -Wall
CFLAGS += -I. -I${OBJDIR}
CFLAGS += -I$(TESTBED_SRCDIR)/lib/event -I$(TESTBED_SRCDIR)/lib/libtb
CFLAGS += -I$(TESTBED_LIBSRCDIR)/event -I$(TESTBED_LIBSRCDIR)/libtb
CFLAGS += -I/usr/local/include
LDFLAGS += $(LDSTATIC) -L${OBJDIR}/lib/event -L${OBJDIR}/lib/libtb
LDFLAGS += $(LDSTATIC)
LDFLAGS += -L${TESTBED_LIBOBJDIR}/event -L${TESTBED_LIBOBJDIR}/libtb
LIBS += -levent -ltb -lcrypto
LIBS += -L/usr/local/lib -lpubsub -lm
ifeq ($(SYSTEM),Linux)
......@@ -40,7 +41,8 @@ tbsend: tbsend.o
dumpevsubs: dumpevsubs.o
$(CC) $(LDFLAGS) -o $@ dumpevsubs.o $(LIBS)
$(PROGRAMS): ${OBJDIR}/lib/event/libevent.a ../../lib/event/event.h
$(PROGRAMS): ${TESTBED_LIBOBJDIR}/event/libevent.a \
${TESTBED_LIBSRCDIR}/event/event.h
install: $(addprefix $(INSTALL_SBINDIR)/, eventdebug.pl)
......
......@@ -20,18 +20,18 @@ CFLAGS += -DSBINDIR='"$(INSTALL_SBINDIR)"'
#CFLAGS += -DDEBUG
CFLAGS += -O -Wall
CFLAGS += -I. -I${OBJDIR}
CFLAGS += -I$(TESTBED_SRCDIR)/lib/event -I$(TESTBED_SRCDIR)/lib/libtb
CFLAGS += -I$(TESTBED_LIBSRCDIR)/event -I$(TESTBED_LIBSRCDIR)/libtb
CFLAGS += -I/usr/local/include
LDFLAGS += -pthread
LDFLAGS += -L${OBJDIR}/lib/event -L${OBJDIR}/lib/libtb
LDFLAGS += -L${TESTBED_LIBOBJDIR}/event -L${TESTBED_LIBOBJDIR}/libtb
LDFLAGS += $(LDSTATIC)
DBLIBS = -L/usr/local/lib/mysql -lmysqlclient -lz
LIBS += -levent_r -ltb -lz
XMLRPCINC = `xmlrpc-c-config c++2 client --cflags`
CXXFLAGS += -pthread -O $(XMLRPCINC) -I$(OBJDIR)
CXXFLAGS += -I$(TESTBED_SRCDIR)/lib/event -I$(TESTBED_SRCDIR)/lib/libtb
CXXFLAGS += -I$(TESTBED_LIBSRCDIR)/event -I$(TESTBED_LIBSRCDIR)/libtb
XMLRPCLIBS = `xmlrpc-c-config c++2 client --libs`
#
......@@ -62,13 +62,13 @@ OBJS = \
timeline-agent.o \
version.o
event-sched_rrpc: $(OBJS) event-sched.h ${OBJDIR}/lib/event/libevent.a
event-sched_rrpc: $(OBJS) event-sched.h ${TESTBED_LIBOBJDIR}/event/libevent.a
$(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(XMLRPCLIBS) $(LIBS)
DEPS = \
console-agent.h error-record.h event-sched.h group-agent.h listNode.h \
local-agent.h node-agent.h rpc.h simulator-agent.h timeline-agent.h \
../../lib/event/event.h
${TESTBED_LIBSRCDIR}/event/event.h
emulab_proxy.o: emulab_proxy.cc $(DEPS)
queue.o: queue.c $(DEPS)
......
......@@ -35,9 +35,9 @@ buildnse:
ln -sf $(SRCDIR)/tbnexthop.h .
ln -sf $(SRCDIR)/tbnexthop.cc .
ln -sf $(SRCDIR)/ip_fw.h .
ln -sf $(SRCDIR)/../../lib/libtb/log.h .
ln -sf $(SRCDIR)/../../lib/libtb/tbdefs.h .
ln -sf $(SRCDIR)/../../lib/event/event.h .
ln -sf $(TESTBED_LIBSRCDIR)/libtb/log.h .
ln -sf $(TESTBED_LIBSRCDIR)/libtb/tbdefs.h .
ln -sf $(TESTBED_LIBSRCDIR)/event/event.h .
$(SRCDIR)/nse-install $(SRCDIR)/nse.patch
makepatch:
......
......@@ -20,8 +20,8 @@ all: $(PROGRAMS)
include $(TESTBED_SRCDIR)/GNUmakerules
LIBTBDIR = $(OBJDIR)/lib/libtb
LIBEVENTDIR = $(OBJDIR)/lib/event
LIBTBDIR = $(TESTBED_LIBOBJDIR)/libtb
LIBEVENTDIR = $(TESTBED_LIBOBJDIR)/event
CPPC = g++
# Rules to make sure that some libraries we need from other directories get
......@@ -35,22 +35,24 @@ $(LIBEVENTDIR)/%.a:
CFLAGS += -DDEBUG
CFLAGS += -O2 -g -Wall
CFLAGS += -I. -I${OBJDIR}
CFLAGS += -I$(TESTBED_SRCDIR)/lib/event -I$(TESTBED_SRCDIR)/lib/libtb
CFLAGS += -I$(TESTBED_LIBSRCDIR)/event -I$(TESTBED_LIBSRCDIR)/libtb
CFLAGS += -I/usr/local/include