Changeset: 7e30864ccbdc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7e30864ccbdc
Modified Files:
testing/Makefile.ag
tools/merovingian/daemon/Makefile.ag
tools/mserver/Makefile.ag
Branch: default
Log Message:
Merge with Jul2015 branch.
diffs (40 lines):
diff --git a/tools/merovingian/daemon/Makefile.ag
b/tools/merovingian/daemon/Makefile.ag
--- a/tools/merovingian/daemon/Makefile.ag
+++ b/tools/merovingian/daemon/Makefile.ag
@@ -22,12 +22,10 @@ INCLUDES = .. \
../../../monetdb5/mal \
$(MSGCONTROL_FLAGS)
-EXTRA_DIST = $(man_MANS) .merovingian_properties
+EXTRA_DIST = monetdbd.1.in .merovingian_properties.in
bin_monetdbd = {
- # hack: include monetdbd.1.in and .merovingian_properties.in here to
- # get them expanded
- SOURCES = monetdbd.1.in .merovingian_properties.in \
+ SOURCES = \
merovingian.c merovingian.h \
argvcmds.c argvcmds.h \
client.c client.h \
diff --git a/tools/mserver/Makefile.ag b/tools/mserver/Makefile.ag
--- a/tools/mserver/Makefile.ag
+++ b/tools/mserver/Makefile.ag
@@ -8,7 +8,7 @@ MTSAFE
man_MANS = mserver5.1
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = mserver5.1.in
INCLUDES = ../../monetdb5/mal \
../../gdk \
@@ -38,8 +38,7 @@ headers_png = {
bin_mserver5 = {
# hack: include mserver5.1.in here to get it expanded
- SOURCES = mserver5.c monet_version.h monet_version.c.in \
- mserver5.1.in
+ SOURCES = mserver5.c monet_version.h monet_version.c.in
LIBS = ../../monetdb5/tools/libmonetdb5 \
../../gdk/libbat ../../common/stream/libstream \
$(curl_LIBS) $(pcre_LIBS) $(openssl_LIBS) $(PSAPILIB) \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
