Changeset: fc07e8f9cdcc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fc07e8f9cdcc
Modified Files:
sql/storage/Makefile.ag
sql/storage/m4/Makefile.ag
sql/storage/m4/bpm.c
sql/storage/m4/bpm.h
Branch: Aug2011
Log Message:
Remove obsolete MonetDB4 stuff.
diffs (120 lines):
diff --git a/sql/storage/Makefile.ag b/sql/storage/Makefile.ag
--- a/sql/storage/Makefile.ag
+++ b/sql/storage/Makefile.ag
@@ -22,7 +22,7 @@
EXTRA_DIST = sql_storage.h store_connections.h store_dependency.h \
store_sequence.h
-SUBDIRS = bat restrict m4 bpm
+SUBDIRS = bat restrict bpm
INCLUDES = ../include ../common \
../../common/options \
diff --git a/sql/storage/m4/Makefile.ag b/sql/storage/m4/Makefile.ag
deleted file mode 100644
--- a/sql/storage/m4/Makefile.ag
+++ /dev/null
@@ -1,32 +0,0 @@
-# The contents of this file are subject to the MonetDB Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-# License for the specific language governing rights and limitations
-# under the License.
-#
-# The Original Code is the MonetDB Database System.
-#
-# The Initial Developer of the Original Code is CWI.
-# Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
-# Copyright August 2008-2011 MonetDB B.V.
-# All Rights Reserved.
-
-## Process this file with automake to produce Makefile.in
-
-INCLUDES = .. ../../include ../../common \
- ../../../common/options \
- ../../../common/stream \
- ../../../gdk
-
-lib_m4store = {
- NOINST
- DIR = libdir
- SOURCES = \
- bpm.c
-}
-
-EXTRA_DIST = bpm.h
diff --git a/sql/storage/m4/bpm.c b/sql/storage/m4/bpm.c
deleted file mode 100644
--- a/sql/storage/m4/bpm.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * The contents of this file are subject to the MonetDB Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is the MonetDB Database System.
- *
- * The Initial Developer of the Original Code is CWI.
- * Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
- * Copyright August 2008-2011 MonetDB B.V.
- * All Rights Reserved.
- */
-
-#include "monetdb_config.h"
-#include "bat/bat_logger.h"
-#include "bat/bat_table.h"
-#include "bat/bat_storage.h"
-#include "bpm.h"
-
-/* stubs simply call bat version */
-int
-bpm_table_init( table_functions *tf ) {
- return bat_table_init(tf);
-}
-int
-bpm_storage_init( store_functions *sf ) {
- return bat_storage_init(sf);
-}
diff --git a/sql/storage/m4/bpm.h b/sql/storage/m4/bpm.h
deleted file mode 100644
--- a/sql/storage/m4/bpm.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * The contents of this file are subject to the MonetDB Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is the MonetDB Database System.
- *
- * The Initial Developer of the Original Code is CWI.
- * Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
- * Copyright August 2008-2011 MonetDB B.V.
- * All Rights Reserved.
- */
-
-#ifndef M4_BPM_H
-#define M4_BPM_H
-
-/* initialize bpm call back functions interfaces */
-extern int bpm_table_init( table_functions *tf );
-extern int bpm_storage_init( store_functions *sf );
-
-#endif /* M4_BPM_H */
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
