Commit 347ba62c authored by Leigh Stoller's avatar Leigh Stoller

Checkpoint reorg of client side code.

parent 11a54cea
#
# 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.
# Get rid of a bunch of nasty built-in implicit rules,
......@@ -56,7 +56,10 @@ CFLAGS += $(LOCALCFLAGS)
clean:
distclean: clean
# This is to avoid warnings about duplicate targets.
distclean: default-clean
default-clean:
rm -f GNUmakefile
#
......
#
# 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 = clientside
SYSTEM := $(shell uname -s)
include $(OBJDIR)/Makeconf
SUBDIRS = event
all: all-subdirs
include $(TESTBED_SRCDIR)/GNUmakerules
client: client-subdirs
client-install: client client-install-subdirs
control-install:
@$(MAKE) -C event control-install
post-install:
@$(MAKE) -C event post-install
clean: clean-subdirs
distclean: distclean-subdirs
# 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)
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
# All rights reserved.
# Get rid of a bunch of nasty built-in implicit rules,
# to avoid bogus circular dependencies and make things go faster.
# Use the `-r' command line option to make to get even better performance.
.SUFFIXES:
#
# Various install targets.
#
$(INSTALL_BINDIR)/%: %
@echo "Installing $<"
-mkdir -p $(INSTALL_BINDIR)
$(INSTALL_PROGRAM) $< $@
$(INSTALL_SBINDIR)/%: %
@echo "Installing $<"
-mkdir -p $(INSTALL_SBINDIR)
$(INSTALL_PROGRAM) $< $@
$(INSTALL_LIBDIR)/%: %
@echo "Installing $<"
-mkdir -p $(INSTALL_LIBDIR)
$(INSTALL_PROGRAM) $< $@
$(INSTALL_LIBEXECDIR)/%: %
@echo "Installing $<"
-mkdir -p $(INSTALL_LIBEXECDIR)
$(INSTALL_PROGRAM) $< $@
$(INSTALL_ETCDIR)/%: %
@echo "Installing $<"
-mkdir -p $(INSTALL_ETCDIR)
$(INSTALL_DATA) $< $@
$(addprefix $(INSTALL_SBINDIR)/, $(SETUID_SBIN_SCRIPTS)): $(INSTALL_SBINDIR)/%: %
echo "Installing (setuid) $<"
-mkdir -p $(INSTALL_SBINDIR)
$(SUDO) $(INSTALL) -o root -m 4755 $< $@
$(addprefix $(INSTALL_BINDIR)/, $(SETUID_BIN_SCRIPTS)): $(INSTALL_BINDIR)/%: %
echo "Installing (setuid) $<"
-mkdir -p $(INSTALL_BINDIR)
$(SUDO) $(INSTALL) -o root -m 4755 $< $@
$(addprefix $(INSTALL_LIBEXECDIR)/, $(SETUID_LIBX_SCRIPTS)): $(INSTALL_LIBEXECDIR)/%: %
echo "Installing (setuid) $<"
-mkdir -p $(INSTALL_LIBEXECDIR)
$(SUDO) $(INSTALL) -o root -m 4755 $< $@
CFLAGS += $(LOCALCFLAGS)
clean:
distclean: clean
rm -f GNUmakefile
#
# Where to find source files.
# Using specific patterns instead of the catch-all VPATH variable
# avoids hitting miscellaneous wrong targets in other directories
# when configuring in the source directory.
#
vpath %.in $(SRCDIR) $(MOSTLY_SRCDIRS)
vpath %.c $(SRCDIR) $(MOSTLY_SRCDIRS)
vpath %.cc $(SRCDIR) $(MOSTLY_SRCDIRS)
vpath % $(SRCDIR) $(MOSTLY_SRCDIRS)
#
# Define rules which we blew away with .SUFFIXES
#
%.o: %.c
$(CC) -c -o $@ $(CFLAGS) $<
%.o: %.cc
$(CXX) -c -o $@ $(CXXFLAGS) $<
%.o: %.C
$(CXX) -c -o $@ $(CXXFLAGS) $<
%_xdr.h: %.x
rpcgen -h $< > $@
%_xdr.c: %.x %_xdr.h
rpcgen -c $< > $@
%: %-debug
$(STRIP) -o $@$(EXE) $<$(EXE)
%-version.c:
echo >$@ "char build_info[] = \"Built on `date` by `id -nu`@`hostname | sed 's/\..*//'`:`pwd`\";"
#
# Rules to regen configure written files.
#
%: %.in $(OBJDIR)/config.status
@echo "Regenerating $@"
cd $(OBJDIR) && CONFIG_FILES=$(SUBDIR)/$@ ./config.status
ifeq ($(TESTS),)
.PHONY: check
else
check: $(TESTS)
@export SRCDIR=${SRCDIR}; for tst in $^; do \
if test `basename $$tst .sh` != `basename $$tst`; then \
tst="sh $$tst"; \
fi; \
if $$tst; then \
echo "PASS: $$tst"; \
else \
echo "FAIL: $$tst"; \
exit 1; \
fi \
done
endif
ifeq ($(MERGE_BUILD),1)
.PRECIOUS: ${SRCDIR}/*
#
# I really want to say something like:
# ${TESTBED_SRCDIR}/.merged: $(wildcard ${OBJDIR}/${MERGE_BUILD_SANDBOX}/${SUBDIR}/*)
# but that causes problems if one the prereq. has a rule for it (such
# as when both GNUmakefile and GNUmakefile.in exist in the source tree),
# thus I do the equivalent manually
#
newest=$(shell ls -rtd "${OBJDIR}/${MERGE_BUILD_SANDBOX}/${SUBDIR}/"* "${TESTBED_SRCDIR}/.merged" | tail -n 1)
ifneq ($(newest),${TESTBED_SRCDIR}/.merged)
${TESTBED_SRCDIR}/.merged:
cd ${TESTBED_SRCDIR} && utils/merge-build sync
.PHONY: ${TESTBED_SRCDIR}/.merged
else
${TESTBED_SRCDIR}/.merged:
endif
${SRCDIR}/*: ${TESTBED_SRCDIR}/.merged
endif
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
# All rights reserved.
#
# Most of the configure-substitution magic is done here.
# All the other makefiles in the NodeOS include
# this fragment
#
# Need the PATH because the older autoconf does not support
# AC_PATH_TOOL which is needed for cross-compilation to work.
export PATH = @PATH@
export CC = @CC@
export CXX = @CXX@
export LD = @CC@ ${CFLAGS}
export STRIP = @STRIP@
export RANLIB = @RANLIB@
export AR = @AR@
export ELVIN_CONFIG = @ELVIN_CONFIG@
export JAVAC = @JAVAC@
export JAR = @JAR@
prefix = @prefix@
exec_prefix = @exec_prefix@
TBROOT = @prefix@
TBDEFS = @TBDEFS@
TBDBNAME = @TBDBNAME@
TBADMINGROUP = @TBADMINGROUP@
TBOPSEMAIL = @TBOPSEMAIL@
TBROBOCOPSEMAIL = @TBROBOCOPSEMAIL@
TBLOGSEMAIL = @TBLOGSEMAIL@
TBAUDITEMAIL = @TBAUDITEMAIL@
TBACTIVEARCHIVE = @TBACTIVEARCHIVE@
TBUSERSARCHIVE = @TBUSERSARCHIVE@
TBERRORSEMAIL = @TBERRORSEMAIL@
TBAPPROVALEMAIL = @TBAPPROVALEMAIL@
BOSSNODE = @BOSSNODE@
USERNODE = @USERNODE@
FSNODE = @FSNODE@
WWW = @WWW@
OURDOMAIN = @OURDOMAIN@
FSDIR_PROJ = @FSDIR_PROJ@
FSDIR_GROUPS = @FSDIR_GROUPS@
FSDIR_USERS = @FSDIR_USERS@
CPPFLAGS = @CPPFLAGS@
CFLAGS += @CFLAGS@
CXXFLAGS += @CXXFLAGS@
LDFLAGS = @LDFLAGS@
OPT_CFLAGS = @OPT_CFLAGS@
INSTALL_TOPDIR = @exec_prefix@
INSTALL_DIR = @exec_prefix@
INSTALL_LIBDIR = @libdir@
INSTALL_BINDIR = @bindir@
INSTALL_SBINDIR = @sbindir@
INSTALL_LIBEXECDIR = @libexecdir@
INSTALL_ETCDIR = @sysconfdir@
INSTALL_INCDIR = @includedir@
INSTALL_WWWDIR = @exec_prefix@/www
INSTALL_RCDIR = @INSTALL_RCDIR@
INSTALL_APACHE_CONFIG = @INSTALL_APACHE_CONFIG@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL@ -m 755
EXE = @EXEEXT@
INSTALL_DATA = @INSTALL@ -m 444
SUDO = @SUDO@
CLIENT_ETCDIR = @CLIENT_ETCDIR@
CLIENT_BINDIR = @CLIENT_BINDIR@
CLIENT_VARDIR = @CLIENT_VARDIR@
CLIENT_MANDIR = @CLIENT_MANDIR@
LOG_TESTBED = @LOG_TESTBED@
EVENTSYS = @EVENTSYS@
ELVIN_COMPAT = @ELVIN_COMPAT@
HAVE_MEZZANINE = @HAVE_MEZZANINE@
GTK_CONFIG = @GTK_CONFIG@
BRAINSTEM_DIR = @BRAINSTEM_DIR@
host_cpu = @host_cpu@
HAVE_ULXMLRPCPP = @HAVE_ULXMLRPCPP@
STANDALONE_CLEARINGHOUSE = @STANDALONE_CLEARINGHOUSE@
NODE_USAGE_SUPPORT = @NODE_USAGE_SUPPORT@
MERGE_BUILD = @MERGE_BUILD@
MERGE_BUILD_SANDBOX = @MERGE_BUILD_SANDBOX@
EXP_VIS_SUPPORT = @EXP_VIS_SUPPORT@
This diff is collapsed.
# This file was generated.
# It contains the lists of macros which have been traced.
# It can be safely removed.
@request = (
bless( [
'0',
1,
[
'/usr/local/share/autoconf-2.62'
],
[
'/usr/local/share/autoconf-2.62/autoconf/autoconf.m4f',
'configure.in'
],
{
'_LT_AC_TAGCONFIG' => 1,
'AM_PROG_F77_C_O' => 1,
'AC_INIT' => 1,
'm4_pattern_forbid' => 1,
'_AM_COND_IF' => 1,
'AC_CANONICAL_TARGET' => 1,
'AC_SUBST' => 1,
'AC_CONFIG_LIBOBJ_DIR' => 1,
'AC_FC_SRCEXT' => 1,
'AC_CANONICAL_HOST' => 1,
'AC_PROG_LIBTOOL' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AC_CONFIG_SUBDIRS' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'LT_CONFIG_LTDL_DIR' => 1,
'AC_REQUIRE_AUX_FILE' => 1,
'AC_CONFIG_LINKS' => 1,
'm4_sinclude' => 1,
'LT_SUPPORTED_TAG' => 1,
'AM_MAINTAINER_MODE' => 1,
'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
'_m4_warn' => 1,
'AM_PROG_CXX_C_O' => 1,
'_AM_COND_ENDIF' => 1,
'AM_ENABLE_MULTILIB' => 1,
'AC_CONFIG_FILES' => 1,
'include' => 1,
'LT_INIT' => 1,
'AM_GNU_GETTEXT' => 1,
'AC_LIBSOURCE' => 1,
'AM_PROG_FC_C_O' => 1,
'AC_CANONICAL_BUILD' => 1,
'AC_FC_FREEFORM' => 1,
'AH_OUTPUT' => 1,
'_AM_SUBST_NOTMAKE' => 1,
'AC_CONFIG_AUX_DIR' => 1,
'sinclude' => 1,
'm4_pattern_allow' => 1,
'AM_PROG_CC_C_O' => 1,
'AC_CANONICAL_SYSTEM' => 1,
'AM_CONDITIONAL' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
'm4_include' => 1,
'_AM_COND_ELSE' => 1,
'AC_SUBST_TRACE' => 1
}
], 'Autom4te::Request' )
);
This diff is collapsed.
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# All rights reserved.
#
AC_INIT(Makefile.in)
AC_PROG_CPP
AC_PROG_CXX
AC_PROG_LN_S
AC_PROG_RANLIB
AC_PROG_MKDIR_P
AC_PROG_INSTALL
AC_PATH_PROG(AR, ar)
if test -z "$AR" ; then
AC_MSG_ERROR([no acceptable ar found in \$PATH])
fi
AC_PATH_PROG(RM, rm)
if test -z "$RM" ; then
AC_MSG_ERROR([no acceptable rm found in \$PATH])
fi
AC_PATH_PROG(CP, cp)
if test -z "$CP" ; then
AC_MSG_ERROR([no acceptable cp found in \$PATH])
fi
AC_PATH_PROG(YACC, byacc)
if test -z "$YACC" ; then
AC_MSG_ERROR([no byacc found in \$PATH])
fi
AC_PATH_PROG(TAR, tar)
if test -z "$TAR" ; then
AC_MSG_ERROR([no tar found in \$PATH])
fi
AC_PATH_PROG(LIBTOOL, libtool)
if test -z "$LIBTOOL" ; then
AC_MSG_ERROR([no libtool found in \$PATH])
fi
AC_PATH_PROG(RPM, rpm, rpm)
if test -z "$RPM" ; then
AC_MSG_ERROR([no rpm found in \$PATH])
fi
#
# The only option is if we build in elvin compat support.
#
AC_SUBST(ELVIN_COMPAT)
ELVIN_COMPAT=0
AC_ARG_ENABLE(elvin_compat,
[ --enable-elvin_compat[[=yes/no]] Include Elvin Hash compat [[default=no]]])
if test "$enable_elvin_compat" = "yes"; then
ELVIN_COMPAT=1
fi
AC_OUTPUT(Makefile 2.pubsubd.sh linux-pubsubd.sh)
#
# 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 = clientside/event
SYSTEM := $(shell uname -s)
include $(OBJDIR)/Makeconf
SUBDIRS = program-agent
all: all-subdirs
include $(TESTBED_SRCDIR)/GNUmakerules
client: client-subdirs
client-install: client client-install-subdirs
control-install:
@$(MAKE) -C event control-install
post-install:
@$(MAKE) -C event post-install
clean: clean-subdirs
distclean: distclean-subdirs
# 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)
#
# 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 = event/program-agent
OBJDIR = @top_builddir@
SUBDIR = clientside/event/program-agent
SYSTEM := $(shell uname -s)
PROGRAMS = program-agent
......@@ -20,15 +19,14 @@ include $(TESTBED_SRCDIR)/GNUmakerules
CFLAGS += -DDEBUG
CFLAGS += -O -g -Wall
CFLAGS += -I. -I${OBJDIR} -I$(SRCDIR)/../lib -I$(TESTBED_SRCDIR)/lib/libtb
CFLAGS += -I. -I${OBJDIR}
CFLAGS += -I$(TESTBED_SRCDIR)/lib/event -I$(TESTBED_SRCDIR)/lib/libtb
CFLAGS += -I/usr/local/include
#CFLAGS += `$(ELVIN_CONFIG) --cflags vin4c` -DHAVE_ELVIN
CFLAGS += -DHAVE_PUBSUB
CFLAGS += -DCLIENT_BINDIR='"$(CLIENT_BINDIR)"'
LDFLAGS += -g -L../lib -L${OBJDIR}/lib/libtb
LDFLAGS += -g -L${OBJDIR}/lib/event -L${OBJDIR}/lib/libtb
LIBS += -levent -ltb -lcrypto
#LIBS += `$(ELVIN_CONFIG) --libs vin4c`
LIBS += -L/usr/local/lib -lpubsub
LDFLAGS += $(LDSTATIC)
......@@ -55,7 +53,7 @@ version.c: program-agent.c
program-agent-debug: program-agent.o version.o
$(CC) $(LDFLAGS) -o $@ program-agent.o version.o $(LIBS)
$(PROGRAMS): ../lib/libevent.a ../lib/event.h
$(PROGRAMS): ${OBJDIR}/lib/event/libevent.a ${OBJDIR}/lib/event/event.h
install: $(INSTALL_DIR)/opsdir/sbin/program-agent
-mkdir -p $(INSTALL_DIR)/opsdir/man/man8
......
This diff is collapsed.
......@@ -3,7 +3,7 @@
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# All rights reserved.
#
AC_PREREQ(2.13)
AC_PREREQ(2.62)
AC_INIT(Makeconf.in)
AC_CONFIG_AUX_DIR(${srcdir}/autoconf)
......@@ -696,7 +696,7 @@ if test "$enable_events" = "no"; then
eventfiles="";
EVENTSYS=0;
else
eventfiles="event/GNUmakefile event/lib/GNUmakefile \
eventfiles="event/GNUmakefile lib/event/GNUmakefile \
event/etc/elvind-boss.conf event/etc/elvind-ops.conf \
event/etc/elvind-inetd.conf event/etc/GNUmakefile\
event/sched/GNUmakefile \
......@@ -712,7 +712,7 @@ else
event/nsetrafgen/nseinput.tcl \
event/nsetrafgen/nse-makepatch \
event/delay-agent/GNUmakefile \
event/program-agent/GNUmakefile \
clientside/event/program-agent/GNUmakefile \
event/link-agent/GNUmakefile \
event/stated/waitForState \
event/stated/GNUmakefile event/stated/stated \
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 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 @@ include $(OBJDIR)/Makeconf
SYSTEM := $(shell uname -s)
SUBDIRS = lib tbgen program-agent proxy example linktest link-agent
SUBDIRS = tbgen proxy example linktest link-agent
ifneq ($(SYSTEM),CYGWIN_NT-5.1)
SUBDIRS += trafgen
endif
......@@ -46,7 +46,6 @@ etc-subdir:
@$(MAKE) -C etc all
install:
@$(MAKE) -C lib install
@$(MAKE) -C sched install
ifeq ($(ISMAINSITE),1)
@$(MAKE) -C new_sched install
......@@ -54,21 +53,18 @@ endif
@$(MAKE) -C tbgen install
@$(MAKE) -C stated install
@$(MAKE) -C linktest install
@$(MAKE) -C program-agent install
@$(MAKE) -C proxy install
client: trafgen-fetch client-subdirs
client-install: client client-install-subdirs
control-install:
@$(MAKE) -C lib control-install
@$(MAKE) -C tbgen control-install
@$(MAKE) -C sched control-install
ifeq ($(ISMAINSITE),1)
@$(MAKE) -C new_sched control-install
endif
@$(MAKE) -C linktest control-install
@$(MAKE) -C program-agent control-install
@$(MAKE) -C proxy control-install
post-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.
#
......@@ -17,11 +17,12 @@ include $(TESTBED_SRCDIR)/GNUmakerules
#CFLAGS += -DDEBUG
CFLAGS += -O -g -Wall
CFLAGS += -I. -I${OBJDIR} -I$(SRCDIR)/../lib -I$(TESTBED_SRCDIR)/lib/libtb
CFLAGS += -I. -I${OBJDIR} -I$(TESTBED_SRCDIR)/lib/libtb
CFLAGS += -I$(TESTBED_SRCDIR)/lib/event
CFLAGS += -I/usr/local/include
LDFLAGS += $(LDSTATIC)
LDFLAGS += -L../lib -L${OBJDIR}/lib/libtb
LDFLAGS += -L${OBJDIR}/lib/libtb -L${OBJDIR}/lib/event
LIBS += -levent -ltb -lcrypto
LIBS += -L/usr/local/lib -lpubsub -lm
......@@ -30,7 +31,7 @@ OBJS = main.o callback.o
delay-agent: $(OBJS)
$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
$(OBJS): main.h ../lib/libevent.a
$(OBJS): main.h $(OBJDIR)/lib/event/libevent.a
client: delay-agent
client-install: client
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2002-2007 University of Utah and the Flux Group.
# Copyright (c) 2002-2011 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -20,10 +20,11 @@ include $(TESTBED_SRCDIR)/GNUmakerules
CFLAGS += -DDEBUG
CFLAGS += -O -g -Wall
CFLAGS += -I. -I${OBJDIR} -I$(SRCDIR)/../lib -I$(TESTBED_SRCDIR)/lib/libtb
CFLAGS += -I. -I${OBJDIR}
CFLAGS += -I$(TESTBED_SRCDIR)/lib/event -I$(TESTBED_SRCDIR)/lib/libtb
CFLAGS += -I/usr/local/include
LDFLAGS += $(LDSTATIC) -L../lib -L${OBJDIR}/lib/libtb
LDFLAGS += $(LDSTATIC) -L${OBJDIR}/lib/event -L${OBJDIR}/lib/libtb
LIBS += -levent -ltb -lcrypto
LIBS += -L/usr/local/lib -lpubsub -lm
ifeq ($(SYSTEM),Linux)
......@@ -39,7 +40,7 @@ tbsend: tbsend.o
dumpevsubs: dumpevsubs.o
$(CC) $(LDFLAGS) -o $@ dumpevsubs.o $(LIBS)
$(PROGRAMS): ../lib/libevent.a ../lib/event.h
$(PROGRAMS): ${OBJDIR}/lib/event/libevent.a ../../lib/event/event.h
install: $(addprefix $(INSTALL_SBINDIR)/, eventdebug.pl)
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2004-2007 University of Utah and the Flux Group.
# Copyright (c) 2004-2011 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -20,10 +20,11 @@ include $(TESTBED_SRCDIR)/GNUmakerules
CFLAGS += -DDEBUG
CFLAGS += -O -g -Wall
CFLAGS += -I. -I${OBJDIR} -I$(SRCDIR)/../lib -I$(TESTBED_SRCDIR)/lib/libtb
CFLAGS += -I. -I${OBJDIR}
CFLAGS += -I$(TESTBED_SRCDIR)/lib/event -I$(TESTBED_SRCDIR)/lib/libtb
CFLAGS += -I/usr/local/include
LDFLAGS += -L../lib -L${OBJDIR}/lib/libtb
LDFLAGS += -L${OBJDIR}/lib/event -L${OBJDIR}/lib/libtb
LIBS += -levent -ltb -lcrypto
LIBS += -L/usr/local/lib -lpubsub -lm
LDFLAGS += $(LDSTATIC)
......@@ -51,7 +52,7 @@ endif
link-agent-debug: link-agent.o
$(CC) $(LDFLAGS) -o $@ link-agent.o $(LIBS)
$(PROGRAMS): ../lib/libevent.a ../lib/event.h
$(PROGRAMS): ${OBJDIR}/lib/event/libevent.a ${OBJDIR}/lib/event/event.h
install:
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
# Copyright (c) 2000-2011 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -8,8 +8,8 @@ SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
OBJDIR = ../..
SUBDIR = event/linktest
LIBTBDIR = $(OBJDIR)/lib/libtb
LIBEVENTDIR = ../lib
LIBTBDIR = $(OBJDIR)/lib/libtb
LIBEVENTDIR = ${OBJDIR}/lib/event
NSTOIRDIR = $(TESTBED_SRCDIR)/tbsetup/ns2ir
DAEMON = linktest
LTEVENT = ltevent
......@@ -38,10 +38,11 @@ include $(TESTBED_SRCDIR)/GNUmakerules
CFLAGS += -DDEBUG -DCLIENT_BINDIR='"$(CLIENT_BINDIR)"'
CFLAGS += -O -g -Wall
CFLAGS += -I. -I${OBJDIR} -I$(SRCDIR)/../lib -I$(TESTBED_SRCDIR)/lib/libtb
CFLAGS += -I. -I${OBJDIR}
CFLAGS += -I$(TESTBED_SRCDIR)/lib/event -I$(TESTBED_SRCDIR)/lib/libtb
CFLAGS += -I/usr/local/include
LDFLAGS += -L../lib -L${OBJDIR}/lib/libtb
LDFLAGS += -L${OBJDIR}/lib/event -L${OBJDIR}/lib/libtb
LIBS += -levent -lcrypto -lssl
LIBS += -L/usr/local/lib -lpubsub -lm
LDFLAGS += $(LDSTATIC)
......@@ -89,9 +90,9 @@ $(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): ../lib/libevent.a ../lib/event.h
$(DAEMON_OBJS): ${OBJDIR}/lib/event/libevent.a ${OBJDIR}/lib/event/event.h
$(LTEVENT_OBJS): ../lib/libevent.a ../lib/event.h
$(LTEVENT_OBJS): ${OBJDIR}/lib/event/libevent.a ${OBJDIR}/lib/event/event.h
# We install just enough to fire off the test from boss and wait.
install: weblinktest $(SCRIPT_RUN) $(SCRIPT_PROXY) $(LTEVENT) \
......
#
# 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.
#
......@@ -19,18 +19,19 @@ CFLAGS += -g -pthread -DBINDIR='"$(INSTALL_BINDIR)"'
CFLAGS += -DSBINDIR='"$(INSTALL_SBINDIR)"'
#CFLAGS += -DDEBUG
CFLAGS += -O -Wall
CFLAGS += -I. -I${OBJDIR} -I$(SRCDIR)/../lib -I$(TESTBED_SRCDIR)/lib/libtb
CFLAGS += -I. -I${OBJDIR}
CFLAGS += -I$(TESTBED_SRCDIR)/lib/event -I$(TESTBED_SRCDIR)/lib/libtb
CFLAGS += -I/usr/local/include
LDFLAGS += -pthread
LDFLAGS += -L../lib -L${OBJDIR}/lib/libtb
LDFLAGS += -L${OBJDIR}/lib/event -L${OBJDIR}/lib/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) -I$(TESTBED_SRCDIR)/lib/libtb
CXXFLAGS += -I$(SRCDIR)/../lib
CXXFLAGS += -pthread -O $(XMLRPCINC) -I$(OBJDIR)
CXXFLAGS += -I$(TESTBED_SRCDIR)/lib/event -I$(TESTBED_SRCDIR)/lib/libtb
XMLRPCLIBS = `xmlrpc-c-config c++2 client --libs`
#
......@@ -61,13 +62,13 @@ OBJS = \
timeline-agent.o \
version.o
event-sched_rrpc: $(OBJS) event-sched.h ../lib/libevent.a
event-sched_rrpc: $(OBJS) event-sched.h ${OBJDIR}/lib/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.h
../../lib/event/event.h
emulab_proxy.o: emulab_proxy.cc $(DEPS)
queue.o: queue.c $(DEPS)
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2002 University of Utah and the Flux Group.
# Copyright (c) 2002, 2011 University of Utah and the Flux Group.
# All rights reserved.
#
# Makefile for building event scheduler
......@@ -8,9 +8,9 @@
# $Id: Makefile,v 1.5 2006-12-01 22:59:37 mike Exp $
CC = gcc