Changeset: 774170e179d2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=774170e179d2
Modified Files:
sql/src/backends/monet5/vaults/Makefile.ag
Branch: default
Log Message:
mseed: conditionalise installation
Don't build and install an empty mseed module if we don't have mseed
available. Instead, just don't install (and autoload) it.
diffs (68 lines):
diff -r 45f97eea8fba -r 774170e179d2 sql/src/backends/monet5/vaults/Makefile.ag
--- a/sql/src/backends/monet5/vaults/Makefile.ag Thu Nov 25 12:59:45
2010 +0100
+++ b/sql/src/backends/monet5/vaults/Makefile.ag Thu Nov 25 13:06:09
2010 +0100
@@ -20,26 +20,57 @@
lib__vault = {
DIR = libdir/MonetDB5/
- SOURCES = vault.mx mseed.mx
+ SOURCES = vault.mx
LIBS = $(MONETDB5_LIBS) -lmonetdb5 \
- $(MONETDB_LIBS) -lbat $(MSEED_LIBS)
+ $(MONETDB_LIBS) -lbat
}
headers_h = {
HEADERS = h
DIR = includedir/MonetDB5/sql
- SOURCES = vault.mx mseed.mx
+ SOURCES = vault.mx
}
headers_mal = {
HEADERS = mal
DIR = libdir/MonetDB5
- SOURCES = vault.mx mseed.mx vault.sql
+ SOURCES = vault.mx vault.sql
}
+
headers_autoload = {
- HEADERS = mal
- DIR = libdir/MonetDB5/autoload
- SOURCES = 70_vault.mal 71_mseed.mal
+ HEADERS = mal
+ DIR = libdir/MonetDB5/autoload
+ SOURCES = 70_vault.mal
}
+
+lib__mseed = {
+ COND = HAVE_MSEED
+ DIR = libdir/MonetDB5/
+ SOURCES = mseed.mx
+ LIBS = $(MONETDB5_LIBS) -lmonetdb5 \
+ $(MONETDB_LIBS) -lbat $(MSEED_LIBS)
+}
+
+headers_mseedautoload = {
+ COND = HAVE_MSEED
+ HEADERS = mal
+ DIR = libdir/MonetDB5/autoload
+ SOURCES = 71_mseed.mal
+}
+
+headers_mseedh = {
+ COND = HAVE_MSEED
+ HEADERS = h
+ DIR = includedir/MonetDB5/sql
+ SOURCES = mseed.mx
+}
+
+headers_mseedmal = {
+ COND = HAVE_MSEED
+ HEADERS = mal
+ DIR = libdir/MonetDB5
+ SOURCES = mseed.mx
+}
+
EXTRA_DIST_DIR = Tests
EXTRA_DIST = 70_vault.mal 71_mseed.mal vault.sql
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
