Changeset: d4523804b237 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d4523804b237
Modified Files:
MonetDB/src/common/Makefile.ag
MonetDB/src/common/monetdb-mutils.pc.in
MonetDB/src/common/monetdb-stream.pc.in
MonetDB/src/gdk/Makefile.ag
MonetDB/src/gdk/monetdb-gdk.pc.in
MonetDB5/src/mal/Makefile.ag
MonetDB5/src/mal/monetdb-mal.pc.in
MonetDB5/src/tools/Makefile.ag
MonetDB5/src/tools/monetdb-embeddedclient.pc.in
buildtools/conf/MonetDB.m4
clients/src/mapilib/Makefile.ag
clients/src/mapilib/monetdb-mapi.pc.in
clients/src/odbc/driver/Makefile.ag
clients/src/odbc/driver/monetdb-odbc.pc.in
sql/Makefile.ag
sql/MonetDB-SQL.pc.in
sql/src/backends/monet5/Makefile.ag
sql/src/backends/monet5/monetdb-embeddedsql.pc.in
Branch: Oct2010
Log Message:
Install pkg-config files for our libraries, bug #2661.
Not all of these may be of any use. It is a first shot. The files are
named after their includes, in all lowercase.
diffs (truncated from 311 to 300 lines):
diff -r bba920400b68 -r d4523804b237 MonetDB/src/common/Makefile.ag
--- a/MonetDB/src/common/Makefile.ag Wed Sep 22 12:51:56 2010 +0200
+++ b/MonetDB/src/common/Makefile.ag Wed Sep 22 15:05:45 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 bba920400b68 -r d4523804b237 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:05:45 2010 +0200
@@ -0,0 +1,11 @@
+pref...@prefix@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: monetdb-mutils
+Description: MonetDB misc utils library
+Version: @PACKAGE_VERSION@
+
+Libs: -L${libdir} -lmutils
+Cflags: -I${includedir}/MonetDB/common
diff -r bba920400b68 -r d4523804b237 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:05:45 2010 +0200
@@ -0,0 +1,11 @@
+pref...@prefix@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: monetdb-stream
+Description: MonetDB streams libary
+Version: @PACKAGE_VERSION@
+
+Libs: -L${libdir} -lstream
+Cflags: -I${includedir}/MonetDB/common
diff -r bba920400b68 -r d4523804b237 MonetDB/src/gdk/Makefile.ag
--- a/MonetDB/src/gdk/Makefile.ag Wed Sep 22 12:51:56 2010 +0200
+++ b/MonetDB/src/gdk/Makefile.ag Wed Sep 22 15:05:45 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 bba920400b68 -r d4523804b237 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:05:45 2010 +0200
@@ -0,0 +1,12 @@
+pref...@prefix@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+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 bba920400b68 -r d4523804b237 MonetDB5/src/mal/Makefile.ag
--- a/MonetDB5/src/mal/Makefile.ag Wed Sep 22 12:51:56 2010 +0200
+++ b/MonetDB5/src/mal/Makefile.ag Wed Sep 22 15:05:45 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 bba920400b68 -r d4523804b237 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:05:45 2010 +0200
@@ -0,0 +1,12 @@
+pref...@prefix@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+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 bba920400b68 -r d4523804b237 MonetDB5/src/tools/Makefile.ag
--- a/MonetDB5/src/tools/Makefile.ag Wed Sep 22 12:51:56 2010 +0200
+++ b/MonetDB5/src/tools/Makefile.ag Wed Sep 22 15:05:45 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 bba920400b68 -r d4523804b237
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:05:45
2010 +0200
@@ -0,0 +1,12 @@
+pref...@prefix@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+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 bba920400b68 -r d4523804b237 buildtools/conf/MonetDB.m4
--- a/buildtools/conf/MonetDB.m4 Wed Sep 22 12:51:56 2010 +0200
+++ b/buildtools/conf/MonetDB.m4 Wed Sep 22 15:05:45 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 bba920400b68 -r d4523804b237 clients/src/mapilib/Makefile.ag
--- a/clients/src/mapilib/Makefile.ag Wed Sep 22 12:51:56 2010 +0200
+++ b/clients/src/mapilib/Makefile.ag Wed Sep 22 15:05:45 2010 +0200
@@ -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 bba920400b68 -r d4523804b237 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:05:45 2010 +0200
@@ -0,0 +1,11 @@
+pref...@prefix@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: monetdb-mapi
+Description: MonetDB MAPI C-client libary
+Version: @PACKAGE_VERSION@
+
+Libs: -L${libdir} -lMapi
+Cflags: -I${includedir}/MonetDB/mapilib
diff -r bba920400b68 -r d4523804b237 clients/src/odbc/driver/Makefile.ag
--- a/clients/src/odbc/driver/Makefile.ag Wed Sep 22 12:51:56 2010 +0200
+++ b/clients/src/odbc/driver/Makefile.ag Wed Sep 22 15:05:45 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 bba920400b68 -r d4523804b237 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:05:45
2010 +0200
@@ -0,0 +1,10 @@
+pref...@prefix@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: monetdb-odbc
+Description: MonetDB ODBC driver
+Version: @PACKAGE_VERSION@
+
+Libs: -L${libdir} -lMonetODBC
diff -r bba920400b68 -r d4523804b237 sql/Makefile.ag
--- a/sql/Makefile.ag Wed Sep 22 12:51:56 2010 +0200
+++ b/sql/Makefile.ag Wed Sep 22 15:05:45 2010 +0200
@@ -23,12 +23,6 @@
rpm.mk.in RunMserver.bat.in
EXTRA_DIST_DIR = NT debian
-headers_pc = {
- HEADERS = pc
- SOURCES = MonetDB-SQL.pc.in
- DIR = libdir/pkgconfig
-}
-
headers_txt = {
HEADERS = txt
SOURCES = dump-restore.txt
diff -r bba920400b68 -r d4523804b237 sql/MonetDB-SQL.pc.in
--- a/sql/MonetDB-SQL.pc.in Wed Sep 22 12:51:56 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +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@
-pref...@prefix@
-exec_pref...@exec_prefix@
-
-bind...@bindir@
-libd...@libdir@
-included...@includedir@
-
-modpath=${libdir}/MonetDB:${libdir}/MonetDB/lib:${libdir}/MonetDB/bin
-
-Name: ${pkg}
-Description: A SQL/ODBC/JDBC interface to MonetDB.
-Version: @VERSION@
-Requires: MonetDB >= 5.22.0
-# ^^^^^
-# Maintained via vertoo. Please don't modify by hand!
-# Contact [email protected] for details and/or
assistance.
-Cflags: -I${includedir}/sql
-Libs: -L${libdir} -lMonetODBC
diff -r bba920400b68 -r d4523804b237 sql/src/backends/monet5/Makefile.ag
--- a/sql/src/backends/monet5/Makefile.ag Wed Sep 22 12:51:56 2010 +0200
+++ b/sql/src/backends/monet5/Makefile.ag Wed Sep 22 15:05:45 2010 +0200
@@ -59,6 +59,13 @@
SOURCES = embeddedclient.h
}
+headers_pc = {
+ COND = NOT_WIN32
+ HEADERS = pc
+ DIR = libdir/pkgconfig
+ SOURCES = monetdb-embeddedsql.pc.in
+}
+
headers_mal = {
HEADERS = mal
DIR = libdir/MonetDB5
diff -r bba920400b68 -r d4523804b237
sql/src/backends/monet5/monetdb-embeddedsql.pc.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/backends/monet5/monetdb-embeddedsql.pc.in Wed Sep 22 15:05:45
2010 +0200
@@ -0,0 +1,12 @@
+pref...@prefix@
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
