Changeset: b99f578d0c62 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b99f578d0c62
Modified Files:
MonetDB4/MonetDB.pc.in
sql/MonetDB-SQL.pc.in
sql/src/backends/monet5/Makefile.ag
Branch: default
Log Message:
Merged from Oct2010
diffs (truncated from 409 to 300 lines):
diff -r e5a4ad96a1d9 -r b99f578d0c62 MonetDB/src/common/Makefile.ag
--- a/MonetDB/src/common/Makefile.ag Wed Sep 22 12:42:40 2010 +0200
+++ b/MonetDB/src/common/Makefile.ag Wed Sep 22 15:16:09 2010 +0200
@@ -19,7 +19,8 @@
MTSAFE
-EXTRA_DIST = monet_getopt.h getopt.c getopt1.c memcmp.c stream_socket.h
valgrind.h
+EXTRA_DIST = monet_getopt.h getopt.c getopt1.c memcmp.c \
+ stream_socket.h valgrind.h
lib_mutils = {
NAME = mutils
@@ -40,3 +41,11 @@
monet_utils.mx monet_options.mx monet_getopt.h \
stream.mx dummy_gdk_utils.mx
}
+
+headers_pc = {
+ COND = NOT_WIN32
+ HEADERS = pc
+ DIR = libdir/pkgconfig
+ SOURCES = monetdb-stream.pc.in \
+ monetdb-mutils.pc.in
+}
diff -r e5a4ad96a1d9 -r b99f578d0c62 MonetDB/src/common/monetdb-mutils.pc.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MonetDB/src/common/monetdb-mutils.pc.in Wed Sep 22 15:16:09 2010 +0200
@@ -0,0 +1,11 @@
+pref...@prefix@
+exec_pref...@exec_prefix@
+libd...@libdir@
+included...@includedir@
+
+Name: monetdb-mutils
+Description: MonetDB misc utils library
+Version: @PACKAGE_VERSION@
+
+Libs: -L${libdir} -lmutils
+Cflags: -I${includedir}/MonetDB/common
diff -r e5a4ad96a1d9 -r b99f578d0c62 MonetDB/src/common/monetdb-stream.pc.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MonetDB/src/common/monetdb-stream.pc.in Wed Sep 22 15:16:09 2010 +0200
@@ -0,0 +1,11 @@
+pref...@prefix@
+exec_pref...@exec_prefix@
+libd...@libdir@
+included...@includedir@
+
+Name: monetdb-stream
+Description: MonetDB streams libary
+Version: @PACKAGE_VERSION@
+
+Libs: -L${libdir} -lstream
+Cflags: -I${includedir}/MonetDB/common
diff -r e5a4ad96a1d9 -r b99f578d0c62 MonetDB/src/gdk/Makefile.ag
--- a/MonetDB/src/gdk/Makefile.ag Wed Sep 22 12:42:40 2010 +0200
+++ b/MonetDB/src/gdk/Makefile.ag Wed Sep 22 15:16:09 2010 +0200
@@ -74,3 +74,9 @@
#gdk_posix.mx logger.mx bat.feps bat1.feps bat2.feps
#}
+headers_pc = {
+ COND = NOT_WIN32
+ HEADERS = pc
+ DIR = libdir/pkgconfig
+ SOURCES = monetdb-gdk.pc.in
+}
diff -r e5a4ad96a1d9 -r b99f578d0c62 MonetDB/src/gdk/monetdb-gdk.pc.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MonetDB/src/gdk/monetdb-gdk.pc.in Wed Sep 22 15:16:09 2010 +0200
@@ -0,0 +1,12 @@
+pref...@prefix@
+exec_pref...@exec_prefix@
+libd...@libdir@
+included...@includedir@
+
+Name: monetdb-gdk
+Description: MonetDB GDK BAT-kernel library
+Version: @PACKAGE_VERSION@
+Requires: monetdb-mutils = @PACKAGE_VERSION@ monetdb-stream = @PACKAGE_VERSION@
+
+Libs: -L${libdir} -lbat
+Cflags: -I${includedir}/MonetDB/gdk
diff -r e5a4ad96a1d9 -r b99f578d0c62 MonetDB4/Makefile.ag
--- a/MonetDB4/Makefile.ag Wed Sep 22 12:42:40 2010 +0200
+++ b/MonetDB4/Makefile.ag Wed Sep 22 15:16:09 2010 +0200
@@ -24,11 +24,5 @@
EXTRA_DIST_DIR = NT tests debian
-headers_pc = {
- HEADERS = pc
- SOURCES = MonetDB.pc.in
- DIR = libdir/pkgconfig
-}
-
TESTS = RunMtest
TESTS_ENVIRONMENT = $(SHELL)
diff -r e5a4ad96a1d9 -r b99f578d0c62 MonetDB4/MonetDB.pc.in
--- a/MonetDB4/MonetDB.pc.in Wed Sep 22 12:42:40 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +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-2010 MonetDB B.V.
-# All Rights Reserved.
-
-p...@package@
-sour...@monetdb_source@
-bui...@monetdb_build@
-pref...@prefix@
-exec_pref...@exec_prefix@
-
-bind...@bindir@
-libexecd...@libexecdir@
-datarootd...@datarootdir@
-datad...@datadir@
-sysconfd...@sysconfdir@
-localstated...@localstatedir@
-libd...@libdir@
-infod...@infodir@
-mand...@mandir@
-included...@includedir@
-
-pkgincludedir=${includedir}/${pkg}
-pkglibdir=${libdir}/${pkg}
-
-modpath=${pkglibdir}:${pkglibdir}/lib:${pkglibdir}/bin
-
-Name: ${pkg}
-Description: A database management system developed from a main-memory
perspective.
-Version: @VERSION@
-Cflags: -I${pkgincludedir} -I${pkgincludedir}/common -I${pkgincludedir}/gdk
-I${pkgincludedir}/monet -I${pkgincludedir}/plain -I${pkgincludedir}/contrib
-I${pkgincludedir}/mapi
-Libs: -L${libdir} -L${pkglibdir}
diff -r e5a4ad96a1d9 -r b99f578d0c62 MonetDB5/src/mal/Makefile.ag
--- a/MonetDB5/src/mal/Makefile.ag Wed Sep 22 12:42:40 2010 +0200
+++ b/MonetDB5/src/mal/Makefile.ag Wed Sep 22 15:16:09 2010 +0200
@@ -56,4 +56,11 @@
HEADERS = h
}
+headers_pc = {
+ COND = NOT_WIN32
+ HEADERS = pc
+ DIR = libdir/pkgconfig
+ SOURCES = monetdb-mal.pc.in
+}
+
EXTRA_DIST_DIR = Tests
diff -r e5a4ad96a1d9 -r b99f578d0c62 MonetDB5/src/mal/monetdb-mal.pc.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MonetDB5/src/mal/monetdb-mal.pc.in Wed Sep 22 15:16:09 2010 +0200
@@ -0,0 +1,12 @@
+pref...@prefix@
+exec_pref...@exec_prefix@
+libd...@libdir@
+included...@includedir@
+
+Name: monetdb-mal
+Description: MonetDB5 MAL kernel library
+Version: @PACKAGE_VERSION@
+Requires: monetdb-gdk = @MONETDB_REQUIRED_VERSION@
+
+Libs: -L${libdir} -lmonetdb5 @READLINE_LIBS@
+Cflags: -I${includedir}/MonetDB5/mal
diff -r e5a4ad96a1d9 -r b99f578d0c62 MonetDB5/src/tools/Makefile.ag
--- a/MonetDB5/src/tools/Makefile.ag Wed Sep 22 12:42:40 2010 +0200
+++ b/MonetDB5/src/tools/Makefile.ag Wed Sep 22 15:16:09 2010 +0200
@@ -47,4 +47,11 @@
SOURCES = embeddedclient.h
}
+headers_pc = {
+ COND = NOT_WIN32
+ HEADERS = pc
+ DIR = libdir/pkgconfig
+ SOURCES = monetdb-embeddedclient.pc.in
+}
+
EXTRA_DIST_DIR = Tests
diff -r e5a4ad96a1d9 -r b99f578d0c62
MonetDB5/src/tools/monetdb-embeddedclient.pc.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MonetDB5/src/tools/monetdb-embeddedclient.pc.in Wed Sep 22 15:16:09
2010 +0200
@@ -0,0 +1,12 @@
+pref...@prefix@
+exec_pref...@exec_prefix@
+libd...@libdir@
+included...@includedir@
+
+Name: monetdb-embeddedclient
+Description: MonetDB5 MAL kernel embedded library
+Version: @PACKAGE_VERSION@
+Requires: monetdb-gdk = @MONETDB_REQUIRED_VERSION@ monetdb-mutils =
@MONETDB_REQUIRED_VERSION@ monetdb-stream = @MONETDB_REQUIRED_VERSION@
monetdb-mapi = @CLIENTS_REQUIRED_VERSION@
+
+Libs: -L${libdir} -lembeddedmal
+Cflags: -I${includedir}/MonetDB5/tools
diff -r e5a4ad96a1d9 -r b99f578d0c62 buildtools/ChangeLog.Oct2010
--- a/buildtools/ChangeLog.Oct2010 Wed Sep 22 12:42:40 2010 +0200
+++ b/buildtools/ChangeLog.Oct2010 Wed Sep 22 15:16:09 2010 +0200
@@ -1,3 +1,6 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Wed Sep 22 2010 Fabian Groffen <[email protected]>
+- We now provide pkg-config files (*.pc) for libraries.
+
diff -r e5a4ad96a1d9 -r b99f578d0c62 buildtools/conf/MonetDB.m4
--- a/buildtools/conf/MonetDB.m4 Wed Sep 22 12:42:40 2010 +0200
+++ b/buildtools/conf/MonetDB.m4 Wed Sep 22 15:16:09 2010 +0200
@@ -196,6 +196,7 @@
else
MONETDB_REQUIRED_VERSION="$1"
fi
+AC_SUBST(MONETDB_REQUIRED_VERSION)
AC_ARG_WITH(monetdb,
AS_HELP_STRING([--with-monetdb=DIR], [MonetDB Common is installed in
DIR]),
have_monetdb="$withval")
@@ -269,6 +270,7 @@
else
CLIENTS_REQUIRED_VERSION="$1"
fi
+AC_SUBST(CLIENTS_REQUIRED_VERSION)
AC_ARG_WITH(clients,
AS_HELP_STRING([--with-clients=DIR], [MonetDB Clients is installed in
DIR]),
have_clients="$withval")
diff -r e5a4ad96a1d9 -r b99f578d0c62 clients/src/mapilib/Makefile.ag
--- a/clients/src/mapilib/Makefile.ag Wed Sep 22 12:42:40 2010 +0200
+++ b/clients/src/mapilib/Makefile.ag Wed Sep 22 15:16:09 2010 +0200
@@ -16,7 +16,7 @@
# All Rights Reserved.
MTSAFE
-INCLUDES = $(MONETDB_INCS) $(READLINE_INCS) $(OPENSSL_INCS)
+INCLUDES = $(MONETDB_INCS) $(OPENSSL_INCS)
MAPI_LIBS = $(SOCKET_LIBS) $(OPENSSL_LIBS)
@@ -30,3 +30,10 @@
HEADERS = h
SOURCES = Mapi.mx
}
+
+headers_pc = {
+ COND = NOT_WIN32
+ HEADERS = pc
+ DIR = libdir/pkgconfig
+ SOURCES = monetdb-mapi.pc.in
+}
diff -r e5a4ad96a1d9 -r b99f578d0c62 clients/src/mapilib/monetdb-mapi.pc.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clients/src/mapilib/monetdb-mapi.pc.in Wed Sep 22 15:16:09 2010 +0200
@@ -0,0 +1,11 @@
+pref...@prefix@
+exec_pref...@exec_prefix@
+libd...@libdir@
+included...@includedir@
+
+Name: monetdb-mapi
+Description: MonetDB MAPI C-client libary
+Version: @PACKAGE_VERSION@
+
+Libs: -L${libdir} -lMapi
+Cflags: -I${includedir}/MonetDB/mapilib
diff -r e5a4ad96a1d9 -r b99f578d0c62 clients/src/odbc/driver/Makefile.ag
--- a/clients/src/odbc/driver/Makefile.ag Wed Sep 22 12:42:40 2010 +0200
+++ b/clients/src/odbc/driver/Makefile.ag Wed Sep 22 15:16:09 2010 +0200
@@ -118,3 +118,10 @@
ODBC.syms
LIBS = ../../mapilib/libMapi $(MONETDB_LIBS) -lstream $(ICONV_LIBS)
$(ODBC_LIBS) $(SOCKET_LIBS)
}
+
+headers_pc = {
+ COND = NOT_WIN32
+ HEADERS = pc
+ DIR = libdir/pkgconfig
+ SOURCES = monetdb-odbc.pc.in
+}
diff -r e5a4ad96a1d9 -r b99f578d0c62 clients/src/odbc/driver/monetdb-odbc.pc.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clients/src/odbc/driver/monetdb-odbc.pc.in Wed Sep 22 15:16:09
2010 +0200
@@ -0,0 +1,10 @@
+pref...@prefix@
+exec_pref...@exec_prefix@
+libd...@libdir@
+included...@includedir@
+
+Name: monetdb-odbc
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
