Merge branch 'develop' of https://github.com/skysql/MaxScale into develop

debian/install

@@ -1,3 +1,3 @@
 maxscale.conf etc/ld.so.conf.d/
 etc/init.d/maxscale etc/init.d/
-binaries/* usr/local/sbin/
+binaries/* /usr/local/skysql/maxscale/

makefile.inc

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

maxscale.conf

@@ -1,2 +1,2 @@
-/usr/local/sbin/MaxScale/modules
-/usr/local/sbin/lib
+/usr/local/skysql/maxscale/modules
+/usr/local/skysql/maxscale/lib

maxscale.spec

@@ -2,7 +2,7 @@
 %define name            maxscale
 %define release         1
 %define version         0.7
-%define install_path    /usr/local/sbin/
+%define install_path    /usr/local/skysql/maxscale/
 
 BuildRoot:              %{buildroot}
 Summary:                maxscale

server/core/Makefile

@@ -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
 

server/modules/monitor/Makefile

@@ -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
 
 

server/modules/protocol/Makefile

@@ -48,10 +48,12 @@ HTTPDSRCS=httpd.c
 HTTPDOBJ=$(HTTPDSRCS:.c=.o)
 MAXSCALEDSRCS=maxscaled.c
 MAXSCALEDOBJ=$(MAXSCALEDSRCS:.c=.o)
-SRCS=$(MYSQLCLIENTSRCS) $(MYSQLBACKENDSRCS) $(TELNETDSRCS) $(HTTPDSRCS)
+SRCS=$(MYSQLCLIENTSRCS) $(MYSQLBACKENDSRCS) $(TELNETDSRCS) $(HTTPDSRCS) \
+	$(MAXSCALEDSRCS)
 OBJ=$(SRCS:.c=.o)
 LIBS=$(UTILSPATH)/skygw_utils.o 
-MODULES=libMySQLClient.so libMySQLBackend.so libtelnetd.so libHTTPD.so libmaxscaled.so
+MODULES=libMySQLClient.so libMySQLBackend.so libtelnetd.so libHTTPD.so \
+	libmaxscaled.so
 
 all:	$(MODULES)
 

server/modules/routing/readwritesplit/Makefile

@@ -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)