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

Continued adding support for libmysqld in modules/monitor/Makefile. Added new libraries to links target.

Browse Source
This commit is contained in:
vraatikka
2013-07-09 15:10:43 +03:00
parent 443e709227
commit b6bca933cc
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/Makefile
View File

@ -103,5 +103,8 @@ links:
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
- ln -s $(ROOT_PATH)/epoll_v1.0/modules/protocol/libHTTPD.so libHTTPD.so
- ln -s $(ROOT_PATH)/epoll_v1.0/modules/routing/libtestroute.so libtestroute.so
- ln -s $(ROOT_PATH)/epoll_v1.0/modules/routing/libmysqlmon.so libmysqlmon.so
include depend.mk include depend.mk

5
modules/monitor/Makefile
View File

@ -25,13 +25,14 @@ 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/usr/include/mysql -Wall -g -I$(UTILSPATH) -I/usr/include/mysql -Wall -g
LDFLAGS=-shared -L$(LOGPATH) -Wl,-rpath,$(LOGPATH) -Wl,-rpath,$(UTILSPATH) LDFLAGS=-shared -L$(LOGPATH) -Wl,-rpath,$(LOGPATH) -Wl,-rpath,$(UTILSPATH) \
-Wl,-rpath,$(MARIADB_SRC_PATH)/libmysqld
MYSQLSRCS=mysql_mon.c MYSQLSRCS=mysql_mon.c
MYSQLOBJ=$(MYSQLSRCS:.c=.o) MYSQLOBJ=$(MYSQLSRCS:.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/packages/mariadb-5.5.25/libmysql -lmysqlclient -L$(MARIADB_SRC_PATH)/libmysqld -lmysqld
MODULES=libmysqlmon.so MODULES=libmysqlmon.so