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

Replaced hard-coded path with variable MARIADB_SRC_PATH

Browse Source
This commit is contained in:
vraatikka
2013-07-08 11:17:37 +03:00
parent 94c0da7443
commit 259eeee4c1
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/Makefile
View File

@ -47,13 +47,11 @@ CFLAGS=-c -I/usr/include -I../include -I../inih \
-I$(LOGPATH) -I$(UTILSPATH) \ -I$(LOGPATH) -I$(UTILSPATH) \
-Wall -g -Wall -g
include ../../makefile.inc
ifdef DEBUG
CFLAGS := $(CFLAGS) -DSS_DEBUG
endif
LDFLAGS=-rdynamic -L$(LOGPATH) \ LDFLAGS=-rdynamic -L$(LOGPATH) \
-Wl,-rpath,$(LOGPATH) -Wl,-rpath,$(UTILSPATH) -Wl,-rpath,$(LOGPATH) -Wl,-rpath,$(UTILSPATH) \
-Wl,-rpath,$(MARIADB_SRC_PATH)/libmysql
SRCS= atomic.c buffer.c spinlock.c gateway.c gateway_mysql_protocol.c \ SRCS= atomic.c buffer.c spinlock.c gateway.c gateway_mysql_protocol.c \
gw_utils.c utils.c dcb.c load_utils.c session.c service.c server.c \ gw_utils.c utils.c dcb.c load_utils.c session.c service.c server.c \
@ -67,7 +65,8 @@ HDRS= ../include/atomic.h ../include/buffer.h ../include/dcb.h \
OBJ=$(SRCS:.c=.o) OBJ=$(SRCS:.c=.o)
LIBS=-L../inih/extra -linih -lssl -lstdc++ \ LIBS=-L../inih/extra -linih -lssl -lstdc++ \
-L/packages/mariadb-5.5.25/libmysql -lmysqlclient \ -L$(MARIADB_SRC_PATH)/libmysql \
-lmysqlclient \
-lz -lm -lcrypto -ldl -pthread -llog_manager -lz -lm -lcrypto -ldl -pthread -llog_manager
gateway: $(OBJ) gateway: $(OBJ)
@ -95,8 +94,12 @@ links:
./libdebugcli.so ./libdebugcli.so
ln -s $(ROOT_PATH)/epoll_v1.0/modules/routing/libreadconnroute.so \ ln -s $(ROOT_PATH)/epoll_v1.0/modules/routing/libreadconnroute.so \
libreadconnroute.so libreadconnroute.so
ln -s $(ROOT_PATH)/epoll_v1.0/modules/routing/readwritesplit/libreadwritesplit.so \
libreadwritesplit.so
ln -s $(ROOT_PATH)/epoll_v1.0/modules/protocol/libMySQLClient.so \ ln -s $(ROOT_PATH)/epoll_v1.0/modules/protocol/libMySQLClient.so \
libMySQLClient.so libMySQLClient.so
ln -s $(ROOT_PATH)/epoll_v1.0/modules/protocol/libMySQLBackend.so \
libMySQLBackend.so
ln -s $(ROOT_PATH)/epoll_v1.0/modules/protocol/libtelnetd.so \ ln -s $(ROOT_PATH)/epoll_v1.0/modules/protocol/libtelnetd.so \
libtelnetd.so libtelnetd.so