From 0dfdc27ea5e0c5e8cd8d74df3f80f43715e1ec4a Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Thu, 3 Jul 2014 11:38:59 +0300 Subject: [PATCH] revert -l:libmysqld.a to -lmysqld --- server/core/Makefile | 2 +- server/modules/monitor/Makefile | 2 +- server/modules/routing/readwritesplit/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/core/Makefile b/server/core/Makefile index 000b30801..6f08a4729 100644 --- a/server/core/Makefile +++ b/server/core/Makefile @@ -75,7 +75,7 @@ POBJS=maxpasswd.o secrets.o utils.o LIBS=-L../inih/extra -linih -lssl -lstdc++ \ -L$(EMBEDDED_LIB) \ -lz -lm -lcrypt -lcrypto -ldl -laio -lrt -pthread -llog_manager \ - -l:libmysqld.a + -lmysqld all: maxscale maxkeys maxpasswd diff --git a/server/modules/monitor/Makefile b/server/modules/monitor/Makefile index 035897d3e..7fdbc5843 100644 --- a/server/modules/monitor/Makefile +++ b/server/modules/monitor/Makefile @@ -39,7 +39,7 @@ GALERAOBJ=$(GALERASRCS:.c=.o) SRCS=$(MYSQLSRCS) OBJ=$(SRCS:.c=.o) LIBS=$(UTILSPATH)/skygw_utils.o -llog_manager \ - -L$(EMBEDDED_LIB) -l:libmysqld.a + -L$(EMBEDDED_LIB) -lmysqld MODULES=libmysqlmon.so libgaleramon.so diff --git a/server/modules/routing/readwritesplit/Makefile b/server/modules/routing/readwritesplit/Makefile index 07f956ed6..c60f2ffd1 100644 --- a/server/modules/routing/readwritesplit/Makefile +++ b/server/modules/routing/readwritesplit/Makefile @@ -38,7 +38,7 @@ LDFLAGS=-shared -L$(LOGPATH) -L$(QCLASSPATH) -L$(EMBEDDED_LIB) \ SRCS=readwritesplit.c OBJ=$(SRCS:.c=.o) -LIBS=-lssl -pthread -llog_manager -lquery_classifier -l:libmysqld.a +LIBS=-lssl -pthread -llog_manager -lquery_classifier -lmysqld MODULES=libreadwritesplit.so all: $(MODULES)