Changeset: 89dbff627628 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=89dbff627628
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:
fix compilation by fixing includes after moves
diffs (57 lines):
diff -r a191607bed1f -r 89dbff627628
sql/src/backends/monet5/merovingian/client/Makefile.ag
--- a/sql/src/backends/monet5/merovingian/client/Makefile.ag Mon Sep 20
14:55:25 2010 +0200
+++ b/sql/src/backends/monet5/merovingian/client/Makefile.ag Mon Sep 20
14:55:29 2010 +0200
@@ -17,9 +17,12 @@
man_MANS = monetdb.1
-# MONETDB: GDKmalloc, stream
+# MONETDB5: Sabaoth
+# MONETDB: GDKmalloc, stream, sysdefs.h
INCLUDES = \
- $(MONETDB_INCS)
+ $(MONETDB5_INCS) \
+ $(MONETDB_INCS) \
+ -I../utils
EXTRA_DIST = $(man_MANS)
@@ -28,6 +31,7 @@
SOURCES = monetdb.c monetdb.1.in
LIBS = \
../utils/libmeroutil \
+ $(MONETDB5_LIBS) -lmonetdb5 \
$(MONETDB_LIBS) -lbat -lstream \
$(SOCKET_LIBS) \
$(MALLOC_LIBS)
diff -r a191607bed1f -r 89dbff627628
sql/src/backends/monet5/merovingian/daemon/Makefile.ag
--- a/sql/src/backends/monet5/merovingian/daemon/Makefile.ag Mon Sep 20
14:55:25 2010 +0200
+++ b/sql/src/backends/monet5/merovingian/daemon/Makefile.ag Mon Sep 20
14:55:29 2010 +0200
@@ -21,7 +21,8 @@
# MONETDB: GDKmalloc, stream
INCLUDES = \
$(MONETDB5_INCS) \
- $(MONETDB_INCS)
+ $(MONETDB_INCS) \
+ -I../utils
MEROVINGIAN_SUBS = \
merovingian_client.c \
diff -r a191607bed1f -r 89dbff627628
sql/src/backends/monet5/merovingian/utils/Makefile.ag
--- a/sql/src/backends/monet5/merovingian/utils/Makefile.ag Mon Sep 20
14:55:25 2010 +0200
+++ b/sql/src/backends/monet5/merovingian/utils/Makefile.ag Mon Sep 20
14:55:29 2010 +0200
@@ -15,7 +15,13 @@
# Copyright August 2008-2010 MonetDB B.V.
# All Rights Reserved.
-EXTRA_DIST =
+# MONETDB5: Sabaoth
+# MONETDB: GDKmalloc, stream, sysdefs.h
+INCLUDES = \
+ $(MONETDB5_INCS) \
+ $(MONETDB_INCS)
+
+EXTRA_DIST = \
control.h \
database.h \
glob.h \
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
