Separated libmysqld from list of libs which is used in every link command line.

This commit is contained in:
vraatikka
2013-06-18 21:28:06 +03:00
parent c5889b606a
commit a7229a6c24
6 changed files with 496 additions and 19 deletions

View File

@ -9,6 +9,7 @@ QUERY_CLASSIFIER_PATH := $(shell pwd)
makeall: clean all
clean:
make -C ../utils clean
- $(DEL) query_classifier.o
- $(DEL) libquery_classifier.so
- $(DEL) libquery_classifier.so.1.0.1
@ -38,6 +39,6 @@ liblink:
-Wl,-soname,libquery_classifier.so \
-Wl,-rpath,$(MARIADB_SRC_PATH)/libmysqld \
-o libquery_classifier.so.1.0.1 ./query_classifier.o \
$(LDLIBS) $(CPP_LDLIBS)
$(LDLIBS) $(LDMYSQL) $(CPP_LDLIBS)
$(DEL) ./libquery_classifier.so
$(LINK) ./libquery_classifier.so.1.0.1 ./libquery_classifier.so

View File

@ -27,7 +27,7 @@ testcomp:
-Wl,-rpath,$(QUERY_CLASSIFIER_PATH)/ \
-o testmain -DSS_DEBUG \
-I$(MARIADB_SRC_PATH)/include testmain.c \
-lquery_classifier $(LDLIBS) \
-lquery_classifier $(LDLIBS) $(LDMYSQL) \
$(QUERY_CLASSIFIER_PATH)/skygw_utils.o
testall: