hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed canonical test's makefile.

Browse Source 
Added option for compiling MaxScale with RabbitMQ filter
This commit is contained in:
VilhoRaatikka
2014-09-04 16:43:52 +03:00
parent 8262054f8d
commit 36bf676a83
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build_gateway.inc
View File

@ -52,3 +52,8 @@ endif
# #
ERRMSG := $(HOME)/usr/share/mysql ERRMSG := $(HOME)/usr/share/mysql
#
# Build optional RabbitMQ filter
# Requires librabbitmq-devel
#
BUILD_RABBITMQ :=

6
query_classifier/test/canonical_tests/Makefile
View File

@ -26,7 +26,7 @@ LDFLAGS=-L$(QUERY_CLASSIFIER_PATH) \
-Wl,-rpath,$(LOG_MANAGER_PATH) \ -Wl,-rpath,$(LOG_MANAGER_PATH) \
-Wl,-rpath,$(QUERY_CLASSIFIER_PATH) -Wl,-rpath,$(QUERY_CLASSIFIER_PATH)
LIBS=-lstdc++ -lpthread -lquery_classifier -lz -ldl -lssl -laio -lcrypt -lcrypto -lrt \ LIBS=-lstdc++ -lpthread -lquery_classifier -lz -ldl -lssl -laio -lcrypt -lcrypto -lrt -lm \
-llog_manager $(UTILS_PATH)/skygw_utils.o $(CORE_PATH)/buffer.o $(CORE_PATH)/atomic.o $(CORE_PATH)/spinlock.o $(CORE_PATH)/hint.o -llog_manager $(UTILS_PATH)/skygw_utils.o $(CORE_PATH)/buffer.o $(CORE_PATH)/atomic.o $(CORE_PATH)/spinlock.o $(CORE_PATH)/hint.o
CFLAGS=-g $(MYSQL_HEADERS) \ CFLAGS=-g $(MYSQL_HEADERS) \
@ -35,8 +35,6 @@ CFLAGS=-g $(MYSQL_HEADERS) \
-I$(ROOT_PATH)/server/include \ -I$(ROOT_PATH)/server/include \
-I$(UTILS_PATH) -I$(UTILS_PATH)
EMBFLAGS=$(shell mysql_config --cflags --libmysqld-libs)
testall: testall:
$(MAKE) cleantests $(MAKE) cleantests
@ -52,7 +50,7 @@ cleantests:
buildtests: $(OBJS) buildtests: $(OBJS)
cp $(ERRMSG)/errmsg.sys . cp $(ERRMSG)/errmsg.sys .
$(CC) $(CFLAGS) $(LDFLAGS) $(EMBFLAGS) $(LIBS) canonizer.c -o $(TESTAPP) $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) canonizer.c -o $(TESTAPP) $(LDLIBS) $(LDMYSQL)
runtests: runtests:
@echo "" > $(TESTLOG) @echo "" > $(TESTLOG)