From dfe2806e37f7e12d0731aab84e84f27b7c4313c6 Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Thu, 4 Sep 2014 15:44:00 +0300 Subject: [PATCH] server/core/makefile: added -lmysqld to LDFLAGS so that the tests compile query_classifier/test/canonical_tests/Makefile: Added hint.o to link flags --- query_classifier/test/canonical_tests/Makefile | 2 +- server/core/test/makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/query_classifier/test/canonical_tests/Makefile b/query_classifier/test/canonical_tests/Makefile index 3d69507ec..4da0ec962 100644 --- a/query_classifier/test/canonical_tests/Makefile +++ b/query_classifier/test/canonical_tests/Makefile @@ -27,7 +27,7 @@ LDFLAGS=-L$(QUERY_CLASSIFIER_PATH) \ -Wl,-rpath,$(QUERY_CLASSIFIER_PATH) LIBS=-lstdc++ -lpthread -lquery_classifier -lz -ldl -lssl -laio -lcrypt -lcrypto -lrt \ - -llog_manager $(UTILS_PATH)/skygw_utils.o $(CORE_PATH)/buffer.o $(CORE_PATH)/atomic.o $(CORE_PATH)/spinlock.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) \ -I$(QUERY_CLASSIFIER_PATH) \ diff --git a/server/core/test/makefile b/server/core/test/makefile index 7f6831082..228300b22 100644 --- a/server/core/test/makefile +++ b/server/core/test/makefile @@ -19,7 +19,7 @@ LDFLAGS=-rdynamic -L$(LOGPATH) \ -Wl,-rpath,$(EMBEDDED_LIB) LIBS= -lz -lm -lcrypt -lcrypto -ldl -laio -lrt -pthread -llog_manager \ - -L../../inih/extra -linih -lssl -lstdc++ + -L../../inih/extra -linih -lssl -lstdc++ -lmysqld TESTS=testhash testspinlock testfilter testadminusers