Commit bfd8c9e5 authored by Robert Ricci's avatar Robert Ricci
Browse files

Make tevc buildable on ops

parent 5cf2b644
...@@ -26,16 +26,19 @@ CFLAGS += -O -g -static -Wall ...@@ -26,16 +26,19 @@ CFLAGS += -O -g -static -Wall
CFLAGS += -I. -I${OBJDIR} -I$(SRCDIR)/../lib -I$(TESTBED_SRCDIR)/lib/libtb CFLAGS += -I. -I${OBJDIR} -I$(SRCDIR)/../lib -I$(TESTBED_SRCDIR)/lib/libtb
CFLAGS += `elvin-config --cflags vin4c` CFLAGS += `elvin-config --cflags vin4c`
LDFLAGS += -L../lib -L${OBJDIR}/lib/libtb LDFLAGS += -L../lib
LIBS += -levent -ltb LIBS += -levent
LIBS += `elvin-config --libs vin4c` LIBS += `elvin-config --libs vin4c`
tevc: tevc.o tevc: tevc.o
$(CC) $(LDFLAGS) -static -o $@ tevc.o $(LIBS) # Link against some of the object files from libtb, instead of the
# whole library, since the latter cannot be built on ops
$(CC) $(LDFLAGS) -static -o $@ tevc.o ../../lib/libtb/log.o \
../../lib/libtb/tbdefs.o $(LIBS)
tevd: tevd.o tevd: tevd.o
$(CC) $(LDFLAGS) -o $@ tevd.o \ $(CC) $(LDFLAGS) -o $@ tevd.o \
-L/usr/local/lib/mysql -lmysqlclient $(LIBS) -L/usr/local/lib/mysql -lmysqlclient -ltb $(LIBS)
$(PROGRAMS): ../lib/libevent.a ../lib/event.h $(PROGRAMS): ../lib/libevent.a ../lib/event.h
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include "config.h" #include "config.h"
#include "log.h"
#include "tbdefs.h" #include "tbdefs.h"
#include "event.h" #include "event.h"
...@@ -279,8 +278,6 @@ main(int argc, char **argv) ...@@ -279,8 +278,6 @@ main(int argc, char **argv)
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
info("Now: %ld:%d\n", now.tv_sec, now.tv_usec);
info("When: %ld:%d\n", when.tv_sec, when.tv_usec);
} }
if (event_schedule(handle, notification, &when) == 0) { if (event_schedule(handle, notification, &when) == 0) {
......
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