Update of /cvsroot/monetdb/MonetDB5/src/tools
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31634/src/tools
Modified Files:
Tag: GDK-2
Makefile.ag embeddedclient.mx stethoscope.mx
Removed Files:
Tag: GDK-2
monetdb5-config.bat.in monetdb5-config.in
Log Message:
propagated changes of Friday Sep 28 2007 - Wednesday Oct 03 2007
from the development trunk to the GDK-2 branch
Index: embeddedclient.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/tools/embeddedclient.mx,v
retrieving revision 1.12
retrieving revision 1.12.4.1
diff -u -d -r1.12 -r1.12.4.1
--- embeddedclient.mx 27 Apr 2007 09:45:40 -0000 1.12
+++ embeddedclient.mx 3 Oct 2007 14:54:19 -0000 1.12.4.1
@@ -64,14 +64,14 @@
#define embeddedclient_export extern
#endif
-#include <Mapi.h>
+#include <mapilib/Mapi.h>
embeddedclient_export Mapi embedded_mal(opt *set, int len);
#endif /* _EMBEDDEDCLIENT_H_ */
@c
#include "embeddedclient.h"
-#include "Mapi.h"
+#include "mapilib/Mapi.h"
#include "mal_authorize.h"
static void
Index: stethoscope.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/tools/stethoscope.mx,v
retrieving revision 1.25.2.2
retrieving revision 1.25.2.3
diff -u -d -r1.25.2.2 -r1.25.2.3
--- stethoscope.mx 6 Sep 2007 13:52:48 -0000 1.25.2.2
+++ stethoscope.mx 3 Oct 2007 14:54:26 -0000 1.25.2.3
@@ -69,7 +69,7 @@
#include "mal_config.h"
#include "monet_options.h"
#include <gdk.h>
-#include <Mapi.h>
+#include <mapilib/Mapi.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
--- monetdb5-config.in DELETED ---
--- monetdb5-config.bat.in DELETED ---
Index: Makefile.ag
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/tools/Makefile.ag,v
retrieving revision 1.43.2.6
retrieving revision 1.43.2.7
diff -u -d -r1.43.2.6 -r1.43.2.7
--- Makefile.ag 18 Sep 2007 12:44:00 -0000 1.43.2.6
+++ Makefile.ag 3 Oct 2007 14:54:16 -0000 1.43.2.7
@@ -54,13 +54,8 @@
COND = NOT_WIN32
EXT = ""
DIR = bindir
- SOURCES = monetdb5-config.in mcheckpoint mrecover
+ SOURCES = mcheckpoint mrecover
}
-scripts_bat = {
- COND = NATIVE_WIN32
- DIR = bindir
- SOURCES = monetdb5-config.bat.in
-}
EXTRA_DIST_DIR = Tests
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
