Merge branch 'static_lib' into develop

This commit is contained in:
Timofey Turenko 2014-07-02 20:54:00 +03:00
commit e5ce7027ed
4 changed files with 4 additions and 4 deletions

View File

@ -40,4 +40,4 @@ endif
ifdef PROF
CFLAGS := $(CFLAGS) -DSS_PROF
endif
endif

View File

@ -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 \
-lmysqld
-l:libmysqld.a
all: maxscale maxkeys maxpasswd

View File

@ -39,7 +39,7 @@ GALERAOBJ=$(GALERASRCS:.c=.o)
SRCS=$(MYSQLSRCS)
OBJ=$(SRCS:.c=.o)
LIBS=$(UTILSPATH)/skygw_utils.o -llog_manager \
-L$(EMBEDDED_LIB) -lmysqld
-L$(EMBEDDED_LIB) -l:libmysqld.a
MODULES=libmysqlmon.so libgaleramon.so

View File

@ -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 -lmysqld
LIBS=-lssl -pthread -llog_manager -lquery_classifier -l:libmysqld.a
MODULES=libreadwritesplit.so
all: $(MODULES)