Changeset: 9034ded73e26 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9034ded73e26
Modified Files:
clients/mapiclient/Makefile.ag
monetdb5/extras/mal_optimizer_template/Makefile.ag
Branch: Mar2018
Log Message:
Some more library cleanup.
diffs (46 lines):
diff --git a/clients/mapiclient/Makefile.ag b/clients/mapiclient/Makefile.ag
--- a/clients/mapiclient/Makefile.ag
+++ b/clients/mapiclient/Makefile.ag
@@ -35,7 +35,7 @@ bin_stethoscope = {
LIBS = libmcutil ../../common/utils/libmutils \
../mapilib/libmapi \
../../common/stream/libstream \
- $(SOCKET_LIBS) $(zlib_LIBS) $(BZ_LIBS) $(snappy_LIBS)
$(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS)
$(PTHREAD_LIBS)
+ $(SOCKET_LIBS) $(zlib_LIBS) $(BZ_LIBS) $(snappy_LIBS)
$(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS)
}
bin_tachograph = {
@@ -43,7 +43,7 @@ bin_tachograph = {
LIBS = libmcutil ../../common/utils/libmutils \
../mapilib/libmapi \
../../common/stream/libstream \
- $(SOCKET_LIBS) $(zlib_LIBS) $(BZ_LIBS) $(snappy_LIBS)
$(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS)
$(PTHREAD_LIBS)
+ $(SOCKET_LIBS) $(zlib_LIBS) $(BZ_LIBS) $(snappy_LIBS)
$(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS)
}
bin_tomograph = {
@@ -51,7 +51,7 @@ bin_tomograph = {
LIBS = libmcutil ../../common/utils/libmutils \
../mapilib/libmapi \
../../common/stream/libstream \
- $(SOCKET_LIBS) $(zlib_LIBS) $(BZ_LIBS) $(snappy_LIBS)
$(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS)
$(PTHREAD_LIBS)
+ $(SOCKET_LIBS) $(zlib_LIBS) $(BZ_LIBS) $(snappy_LIBS)
$(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS)
}
# disabled: it's not really a tool for users, more to debug mapi
diff --git a/monetdb5/extras/mal_optimizer_template/Makefile.ag
b/monetdb5/extras/mal_optimizer_template/Makefile.ag
--- a/monetdb5/extras/mal_optimizer_template/Makefile.ag
+++ b/monetdb5/extras/mal_optimizer_template/Makefile.ag
@@ -18,10 +18,8 @@ lib_opt_sql_append = {
DIR = libdir/monetdb5
SEP = _
SOURCES = opt_sql_append.c opt_sql_append.h
- LIBS = NATIVE_WIN32?../../tools/libmonetdb5 \
- NATIVE_WIN32?../../../gdk/libbat \
- NATIVE_WIN32?../../../common/stream/libstream \
- $(MALLOC_LIBS)
+ LIBS = WIN32?../../tools/libmonetdb5 \
+ WIN32?../../../gdk/libbat
}
headers_mal = {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
