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

Added run-time path to dynamically loadable libraries; '-Wl,rpath,$(DEST)/lib' to Makefile. When compiling, use

Browse Source 
make DEST=<path to library directory>
This commit is contained in:
vraatikka
2013-07-26 19:23:47 +03:00
parent 404160908d
commit b235781d2e
5 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/Makefile
View File

@ -49,8 +49,10 @@ CFLAGS=-c -I/usr/include -I../include -I../inih \
include ../../makefile.inc include ../../makefile.inc
LDFLAGS=-rdynamic -L$(LOGPATH) \ LDFLAGS=-rdynamic -L$(LOGPATH) \
-Wl,-rpath,$(LOGPATH) -Wl,-rpath,$(UTILSPATH) \ -Wl,-rpath,$(DEST)/lib
-Wl,-rpath,$(MARIADB_SRC_PATH)/libmysqld
# -Wl,-rpath,$(LOGPATH) -Wl,-rpath,$(UTILSPATH) \
# -Wl,-rpath,$(MARIADB_SRC_PATH)/libmysqld
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 \
@ -102,5 +104,6 @@ depend:
install: maxscale maxkeys maxpasswd install: maxscale maxkeys maxpasswd
@mkdir -p $(DEST)/bin @mkdir -p $(DEST)/bin
install -D maxscale maxkeys maxpasswd $(DEST)/bin install -D maxscale maxkeys maxpasswd $(DEST)/bin
install -D $(MARIADB_SRC_PATH)/libmysqld/libmysqld.so.18 $(DEST)/lib
include depend.mk include depend.mk

7
modules/monitor/Makefile
View File

@ -25,8 +25,13 @@ UTILSPATH := $(ROOT_PATH)/utils
CC=cc CC=cc
CFLAGS=-c -fPIC -I. -I/usr/include -I../include -I../../include -I$(LOGPATH) \ CFLAGS=-c -fPIC -I. -I/usr/include -I../include -I../../include -I$(LOGPATH) \
-I$(UTILSPATH) -I$(MARIADB_SRC_PATH)/include/ -Wall -g -I$(UTILSPATH) -I$(MARIADB_SRC_PATH)/include/ -Wall -g
LDFLAGS=-shared -L$(LOGPATH) -Wl,-rpath,$(LOGPATH) -Wl,-rpath,$(UTILSPATH) \
LDFLAGS=-shared -L$(LOGPATH) -Wl,-rpath,$(DEST)/lib \
-Wl,-rpath,$(LOGPATH) -Wl,-rpath,$(UTILSPATH) \
-Wl,-rpath,$(MARIADB_SRC_PATH)/libmysqld -Wl,-rpath,$(MARIADB_SRC_PATH)/libmysqld
MYSQLSRCS=mysql_mon.c MYSQLSRCS=mysql_mon.c
MYSQLOBJ=$(MYSQLSRCS:.c=.o) MYSQLOBJ=$(MYSQLSRCS:.c=.o)
GALERASRCS=mysql_mon.c GALERASRCS=mysql_mon.c

4
modules/protocol/Makefile
View File

@ -34,7 +34,9 @@ CFLAGS=-c -fPIC -I/usr/include -I../include -I../../include -I$(LOGPATH) \
include ../../../makefile.inc include ../../../makefile.inc
LDFLAGS=-shared -L$(LOGPATH) -Wl,-rpath,$(LOGPATH) -Wl,-rpath,$(UTILSPATH) LDFLAGS=-shared -L$(LOGPATH) -Wl,-rpath,$(DEST)/lib \
-Wl,-rpath,$(LOGPATH) -Wl,-rpath,$(UTILSPATH)
MYSQLCLIENTSRCS=mysql_client.c mysql_common.c MYSQLCLIENTSRCS=mysql_client.c mysql_common.c
MYSQLCLIENTOBJ=$(MYSQLCLIENTSRCS:.c=.o) MYSQLCLIENTOBJ=$(MYSQLCLIENTSRCS:.c=.o)
MYSQLBACKENDSRCS=mysql_backend.c mysql_common.c MYSQLBACKENDSRCS=mysql_backend.c mysql_common.c

4
modules/routing/Makefile
View File

@ -33,7 +33,9 @@ CFLAGS=-c -fPIC -I/usr/include -I../include -I../../include -I$(LOGPATH) \
include ../../../makefile.inc include ../../../makefile.inc
LDFLAGS=-shared -L$(LOGPATH) -Wl,-rpath,$(LOGPATH) -Wl,-rpath,$(UTILSPATH) LDFLAGS=-shared -L$(LOGPATH) -Wl,-rpath,$(DEST)/lib \
-Wl,-rpath,$(LOGPATH) -Wl,-rpath,$(UTILSPATH)
TESTSRCS=testroute.c TESTSRCS=testroute.c
TESTOBJ=$(TESTSRCS:.c=.o) TESTOBJ=$(TESTSRCS:.c=.o)
READCONSRCS=readconnroute.c READCONSRCS=readconnroute.c

2
modules/routing/readwritesplit/Makefile
View File

@ -32,8 +32,10 @@ CFLAGS=-c -fPIC -I/usr/include -I../../include -I../../../include \
include ../../../../makefile.inc include ../../../../makefile.inc
LDFLAGS=-shared -L$(LOGPATH) -L$(QCLASSPATH) -L$(MARIADB_SRC_PATH)/libmysqld \ LDFLAGS=-shared -L$(LOGPATH) -L$(QCLASSPATH) -L$(MARIADB_SRC_PATH)/libmysqld \
-Wl,-rpath,$(DEST)/lib \
-Wl,-rpath,$(LOGPATH) -Wl,-rpath,$(UTILSPATH) -Wl,-rpath,$(QCLASSPATH) \ -Wl,-rpath,$(LOGPATH) -Wl,-rpath,$(UTILSPATH) -Wl,-rpath,$(QCLASSPATH) \
-Wl,-rpath,$(MARIADB_SRC_PATH)/libmysqld -Wl,-rpath,$(MARIADB_SRC_PATH)/libmysqld
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 -lmysqld