From b74423121f1608810a847861387a4e9f42256ff3 Mon Sep 17 00:00:00 2001 From: vraatikka Date: Wed, 26 Jun 2013 23:26:21 +0300 Subject: [PATCH] Removed references to epoll code. --- log_manager/log_manager.cc | 1 - log_manager/makefile | 5 ++--- log_manager/test/makefile | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/log_manager/log_manager.cc b/log_manager/log_manager.cc index 1958f81e3..073ea6c48 100644 --- a/log_manager/log_manager.cc +++ b/log_manager/log_manager.cc @@ -25,7 +25,6 @@ #include #include #include -#include #define MAX_PREFIXLEN 250 #define MAX_SUFFIXLEN 250 diff --git a/log_manager/makefile b/log_manager/makefile index d94e561c6..86cd77a80 100644 --- a/log_manager/makefile +++ b/log_manager/makefile @@ -24,16 +24,15 @@ utils: lib: libcomp liblink libcomp: - $(COPY) ../epoll_v1.0/core/atomic.o ./ $(CPP) -c $(CFLAGS) \ - -I$(MARIADB_SRC_PATH)/include/ -I$(ROOT_PATH)/epoll_v1.0/include \ + -I$(MARIADB_SRC_PATH)/include/ \ -I../utils/ -I./ \ -fPIC ./log_manager.cc -o log_manager.o $(LDLIBS) liblink: $(CPP) -shared \ -Wl,-soname,liblog_manager.so \ - -o liblog_manager.so.1.0.1 log_manager.o atomic.o \ + -o liblog_manager.so.1.0.1 log_manager.o \ $(LDLIBS) $(CPP_LDLIBS) $(DEL) ./liblog_manager.so $(LINK) ./liblog_manager.so.1.0.1 ./liblog_manager.so diff --git a/log_manager/test/makefile b/log_manager/test/makefile index 6a883751d..c781698f0 100644 --- a/log_manager/test/makefile +++ b/log_manager/test/makefile @@ -19,18 +19,16 @@ clean: all: testcomp testall -testcomp: +testcomp: $(CC) $(CFLAGS) \ -L$(LOG_MANAGER_PATH) \ -Wl,-rpath,$(LOG_MANAGER_PATH)/ \ -o testlog -DSS_DEBUG \ -I$(SOLIDDB_SRC_PATH)/include \ -I$(MARIADB_SRC_PATH)/include \ - -I$(ROOT_PATH)/epoll_v1.0/include \ -I$(LOG_MANAGER_PATH) -I$(ROOT_PATH)/utils testlog.c \ -llog_manager $(LDLIBS) \ $(LOG_MANAGER_PATH)/skygw_utils.o \ - $(LOG_MANAGER_PATH)/atomic.o testall: - $(LAUNCH_DEBUGGER) $(TESTAPP) $(BACKGR)