Commit 0f2b71b9 authored by Mike Hibler's avatar Mike Hibler

Inner elab setup wants to do an "make control-install" without just a

plain "make".  There seemed to be a number of missing dependencies that
prevented this from working (how did this ever work?)
parent 1139e093
......@@ -107,11 +107,10 @@ _tbevent.so: event.o event_wrap_py.o util.o
LIB_STUFF = event.pm event.so tbevent.py _tbevent.so
install: $(addprefix $(INSTALL_LIBDIR)/, $(LIB_STUFF)) \
install: $(LIBS) $(addprefix $(INSTALL_LIBDIR)/, $(LIB_STUFF)) \
$(addprefix $(INSTALL_DIR)/opsdir/lib/, $(LIB_STUFF))
control-install: libevent_r.a \
$(addprefix $(INSTALL_LIBDIR)/, $(LIB_STUFF))
control-install: $(LIBS) $(addprefix $(INSTALL_LIBDIR)/, $(LIB_STUFF))
#
# Right now we don't bother with the dynamic libs since all of the existing
......
......@@ -77,10 +77,10 @@ $(LOCAL_BINDIR):
binaries: $(LOCAL_BINDIR) $(LOCAL_BINDIR)/$(DAEMON) $(LOCAL_BINDIR)/$(LTEVENT)
$(LOCAL_BINDIR)/$(DAEMON)-debug: $(DAEMON_OBJS) $(LIBTB_OBJS)
$(LOCAL_BINDIR)/$(DAEMON)-debug: $(LOCAL_BINDIR) $(DAEMON_OBJS) $(LIBTB_OBJS)
$(CC) $(LDFLAGS) $(DAEMON_OBJS) $(LIBTB_OBJS) $(LIBS) -o $@
$(LOCAL_BINDIR)/$(LTEVENT)-debug: $(LTEVENT_OBJS) $(LIBTB_OBJS)
$(LOCAL_BINDIR)/$(LTEVENT)-debug: $(LOCAL_BINDIR) $(LTEVENT_OBJS) $(LIBTB_OBJS)
$(CC) $(LDFLAGS) $(LTEVENT_OBJS) $(LIBTB_OBJS) $(LIBS) -o $@
$(DAEMON_OBJS): linktest.h ../lib/libevent.a ../lib/event.h
......@@ -88,7 +88,7 @@ $(DAEMON_OBJS): linktest.h ../lib/libevent.a ../lib/event.h
$(LTEVENT_OBJS): ../lib/libevent.a ../lib/event.h
# We install just enough to fire off the test from boss and wait.
install:
install: weblinktest $(SCRIPT_CONTROL) $(SCRIPT_RUN) $(SCRIPT_PROXY) $(LOCAL_BINDIR)/$(LTEVENT)
$(INSTALL_PROGRAM) weblinktest $(INSTALL_LIBEXECDIR)
$(INSTALL_PROGRAM) $(SCRIPT_CONTROL) $(INSTALL_SBINDIR)
$(INSTALL_DATA) $(SRCDIR)/linktest.html $(INSTALL_WWWDIR)/doc
......
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