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

Merge branch 'static_lib' into develop

Browse Source
This commit is contained in:
Timofey Turenko
2014-07-02 20:54:00 +03:00
parent c3c18fb044 eb3a8eaab3
commit e5ce7027ed
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
makefile.inc
View File

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

2
server/core/Makefile
View File

@ -75,7 +75,7 @@ POBJS=maxpasswd.o secrets.o utils.o
LIBS=-L../inih/extra -linih -lssl -lstdc++ \ LIBS=-L../inih/extra -linih -lssl -lstdc++ \
-L$(EMBEDDED_LIB) \ -L$(EMBEDDED_LIB) \
-lz -lm -lcrypt -lcrypto -ldl -laio -lrt -pthread -llog_manager \ -lz -lm -lcrypt -lcrypto -ldl -laio -lrt -pthread -llog_manager \
-lmysqld -l:libmysqld.a
all: maxscale maxkeys maxpasswd all: maxscale maxkeys maxpasswd

2
server/modules/monitor/Makefile
View File

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

2
server/modules/routing/readwritesplit/Makefile
View File

@ -38,7 +38,7 @@ LDFLAGS=-shared -L$(LOGPATH) -L$(QCLASSPATH) -L$(EMBEDDED_LIB) \
SRCS=readwritesplit.c SRCS=readwritesplit.c
OBJ=$(SRCS:.c=.o) 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 MODULES=libreadwritesplit.so
all: $(MODULES) all: $(MODULES)