MonetDB: default - merovingian: include correct library when lin...

[Fabian Groffen]

Changeset: f1e8468c3ce2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f1e8468c3ce2
Modified Files:
        sql/src/backends/monet5/merovingian/client/Makefile.ag
        sql/src/backends/monet5/merovingian/daemon/Makefile.ag
        sql/src/backends/monet5/merovingian/utils/Makefile.ag
Branch: default
Log Message:

merovingian: include correct library when linking is done

LIBS with NOINST makes no sense


diffs (33 lines):

diff -r b7553af5ea80 -r f1e8468c3ce2 
sql/src/backends/monet5/merovingian/client/Makefile.ag
--- a/sql/src/backends/monet5/merovingian/client/Makefile.ag    Mon Jan 10 
15:20:28 2011 +0100
+++ b/sql/src/backends/monet5/merovingian/client/Makefile.ag    Mon Jan 10 
15:52:07 2011 +0100
@@ -38,6 +38,7 @@
        SOURCES = monetdb.c monetdb.1.in
        LIBS = \
                ../utils/libmeroutil \
+               $(UUID_LIBS) \
                ../../../../../../MonetDB5/src/tools/libmonetdb5 \
                ../../../../../../MonetDB/src/gdk/libbat \
                ../../../../../../MonetDB/src/common/libstream \
diff -r b7553af5ea80 -r f1e8468c3ce2 
sql/src/backends/monet5/merovingian/daemon/Makefile.ag
--- a/sql/src/backends/monet5/merovingian/daemon/Makefile.ag    Mon Jan 10 
15:20:28 2011 +0100
+++ b/sql/src/backends/monet5/merovingian/daemon/Makefile.ag    Mon Jan 10 
15:52:07 2011 +0100
@@ -59,6 +59,7 @@
                proxy.c
        LIBS = \
                ../utils/libmeroutil \
+               $(UUID_LIBS) \
                ../../../../../../MonetDB5/src/tools/libmonetdb5 \
                ../../../../../../MonetDB/src/gdk/libbat \
                ../../../../../../MonetDB/src/common/libstream \
diff -r b7553af5ea80 -r f1e8468c3ce2 
sql/src/backends/monet5/merovingian/utils/Makefile.ag
--- a/sql/src/backends/monet5/merovingian/utils/Makefile.ag     Mon Jan 10 
15:20:28 2011 +0100
+++ b/sql/src/backends/monet5/merovingian/utils/Makefile.ag     Mon Jan 10 
15:52:07 2011 +0100
@@ -37,7 +37,6 @@
 
 lib_meroutil = {
        NOINST
-       LIBS = $(UUID_LIBS)
        SOURCES = \
                control.c \
                database.c \
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list