Commit f28ed0a9 authored by Mike Hibler's avatar Mike Hibler

Make the --disable-events configure option work again.

Not sure this is really useful, but Kevin Tew's test framework
uses it.
parent 22d239fa
#
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
# Copyright (c) 2000-2014 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -28,7 +28,10 @@ SYSTEM := $(shell uname -s)
include $(OBJDIR)/Makeconf
SUBDIRS = lib event tools os sensors tmcc protogeni
SUBDIRS = lib tools os sensors tmcc protogeni
ifneq ($(EVENTSYS),0)
SUBDIRS += event
endif
ifeq ($(WITH_EMULAB),1)
all: all-subdirs
......
#
# Copyright (c) 2000-2013 University of Utah and the Flux Group.
# Copyright (c) 2000-2014 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -27,7 +27,10 @@ SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
include $(OBJDIR)/Makeconf
SUBDIRS = libtb event tmcd
SUBDIRS = libtb tmcd
ifneq ($(EVENTSYS),0)
SUBDIRS += event
endif
all: all-subdirs
......
#
# Copyright (c) 2000-2012 University of Utah and the Flux Group.
# Copyright (c) 2000-2014 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -56,12 +56,18 @@ PTHREADCFLAGS = -D_THREAD_SAFE
PTHREADLIBS = -lpthread
endif
ifneq ($(EVENTSYS),0)
ELVINFLAGS = -I/usr/local/include
ELVINLIBS = -L/usr/local/lib -lpubsub -lm
EVENTFLAGS = -DEVENTSYS -I$(TESTBED_LIBSRCDIR)/event $(ELVINFLAGS)
EVENTOBJS = $(TESTBED_LIBOBJDIR)/event/event.o \
$(TESTBED_LIBOBJDIR)/event/util.o
EVENTLIBS = $(ELVINLIBS) -lcrypto
else
EVENTFLAGS =
EVENTOBJS =
EVENTLIBS =
endif
TBCFLAGS = $(EVENTFLAGS) -I$(TESTBED_LIBSRCDIR)/libtb
TBLIBS = $(EVENTOBJS) $(TESTBED_LIBOBJDIR)/libtb/libtb.a $(EVENTLIBS)
......
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