From 5bef5d8f53126742e395b882ec7a26b5603f1b84 Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Thu, 25 Sep 2014 21:25:46 +0300 Subject: [PATCH] Removed binlogrouter from the build process. --- server/modules/routing/CMakeLists.txt | 2 +- server/modules/routing/Makefile | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/server/modules/routing/CMakeLists.txt b/server/modules/routing/CMakeLists.txt index 595a216c8..9d2f25f76 100644 --- a/server/modules/routing/CMakeLists.txt +++ b/server/modules/routing/CMakeLists.txt @@ -15,4 +15,4 @@ target_link_libraries(cli log_manager utils) install(TARGETS cli DESTINATION modules) add_subdirectory(readwritesplit) -add_subdirectory(binlog) \ No newline at end of file + diff --git a/server/modules/routing/Makefile b/server/modules/routing/Makefile index 8f0f69d20..d27430112 100644 --- a/server/modules/routing/Makefile +++ b/server/modules/routing/Makefile @@ -47,8 +47,7 @@ CLIOBJ=$(CLISRCS:.c=.o) SRCS=$(TESTSRCS) $(READCONSRCS) $(DEBUGCLISRCS) cli.c OBJ=$(SRCS:.c=.o) LIBS=$(UTILSPATH)/skygw_utils.o -lssl -llog_manager -MODULES= libdebugcli.so libreadconnroute.so libtestroute.so libcli.so \ - libbinlogrouter.so +MODULES= libdebugcli.so libreadconnroute.so libtestroute.so libcli.so all: $(MODULES) @@ -69,31 +68,25 @@ libcli.so: $(CLIOBJ) libreadwritesplit.so: (cd readwritesplit; touch depend.mk ; make; cp $@ ..) -libbinlogrouter.so: - (cd binlog; touch depend.mk ; make; cp $@ ..) .c.o: $(CC) $(CFLAGS) $< -o $@ clean: $(DEL) $(OBJ) $(MODULES) (cd readwritesplit; touch depend.mk; make clean) - (cd binlog; touch depend.mk; make clean) tags: ctags $(SRCS) $(HDRS) (cd readwritesplit; make tags) - (cd binlog; make tags) depend: @$(DEL) depend.mk cc -M $(CFLAGS) $(SRCS) > depend.mk (cd readwritesplit; touch depend.mk ; make depend) - (cd binlog; touch depend.mk ; make depend) install: $(MODULES) install -D $(MODULES) $(DEST)/modules (cd readwritesplit; make DEST=$(DEST) install) - (cd binlog; make DEST=$(DEST) install) cleantests: $(MAKE) -C test cleantests