Changeset: a6726926a512 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a6726926a512
Modified Files:
clients/mapiclient/Makefile.ag
clients/mapilib/Makefile.ag
tools/mserver/Makefile.ag
Branch: default
Log Message:
add moptions library only where used
diffs (67 lines):
diff --git a/clients/mapiclient/Makefile.ag b/clients/mapiclient/Makefile.ag
--- a/clients/mapiclient/Makefile.ag
+++ b/clients/mapiclient/Makefile.ag
@@ -18,6 +18,7 @@ bin_mclient = {
../mapilib/libmapi \
../../common/stream/libstream \
../../common/utils/libmutils \
+ WIN32?../../common/options/libmoptions \
$(READLINE_LIBS) \
$(SOCKET_LIBS) $(zlib_LIBS) $(bzip2_LIBS) $(snappy_LIBS)
$(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS)
}
@@ -28,6 +29,7 @@ bin_msqldump = {
../mapilib/libmapi \
../../common/stream/libstream \
../../common/utils/libmutils \
+ WIN32?../../common/options/libmoptions \
$(SOCKET_LIBS) $(zlib_LIBS) $(bzip2_LIBS) $(snappy_LIBS)
$(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS)
}
@@ -37,6 +39,7 @@ bin_stethoscope = {
../mapilib/libmapi \
../../common/stream/libstream \
../../common/utils/libmutils \
+ WIN32?../../common/options/libmoptions \
$(SOCKET_LIBS) $(zlib_LIBS) $(bzip2_LIBS) $(snappy_LIBS)
$(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS)
}
@@ -46,6 +49,7 @@ bin_tachograph = {
../mapilib/libmapi \
../../common/stream/libstream \
../../common/utils/libmutils \
+ WIN32?../../common/options/libmoptions \
$(SOCKET_LIBS) $(zlib_LIBS) $(bzip2_LIBS) $(snappy_LIBS)
$(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS)
}
@@ -55,6 +59,7 @@ bin_tomograph = {
../../common/utils/libmutils \
../mapilib/libmapi \
../../common/stream/libstream \
+ WIN32?../../common/options/libmoptions \
$(SOCKET_LIBS) $(zlib_LIBS) $(bzip2_LIBS) $(snappy_LIBS)
$(lz4_LIBS) $(liblzma_LIBS) $(curl_LIBS) $(LTLIBICONV) $(openssl_LIBS)
}
diff --git a/clients/mapilib/Makefile.ag b/clients/mapilib/Makefile.ag
--- a/clients/mapilib/Makefile.ag
+++ b/clients/mapilib/Makefile.ag
@@ -12,8 +12,7 @@ INCLUDES = ../../common/stream ../../com
lib_mapi = {
VERSION = $(MAPI_VERSION)
SOURCES = mapi.c mapi.rc
- LIBS = ../../common/options/libmoptions \
- ../../common/utils/libmcrypt \
+ LIBS = ../../common/utils/libmcrypt \
WIN32?../../common/stream/libstream \
WIN32?../../common/utils/libmutils \
WIN32?$(SOCKET_LIBS) \
diff --git a/tools/mserver/Makefile.ag b/tools/mserver/Makefile.ag
--- a/tools/mserver/Makefile.ag
+++ b/tools/mserver/Makefile.ag
@@ -48,6 +48,7 @@ bin_mserver5 = {
SOURCES = mserver5.c monet_version.h monet_version.c.in
LIBS = ../../monetdb5/tools/libmonetdb5 \
../../gdk/libbat \
+ ../../common/options/libmoptions \
../../common/stream/libstream \
../../clients/mapilib/libmapi \
$(UUID_LIBS) \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
