Changeset: a02ba0cda6b6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a02ba0cda6b6
Modified Files:
MonetDB5/src/modules/atoms/Makefile.ag
MonetDB5/src/modules/kernel/Makefile.ag
MonetDB5/src/modules/mal/Makefile.ag
Branch: Oct2010
Log Message:
for optional modules, also install their header files and scripts only
conditionally
diffs (125 lines):
diff -r df5442924469 -r a02ba0cda6b6 MonetDB5/src/modules/atoms/Makefile.ag
--- a/MonetDB5/src/modules/atoms/Makefile.ag Wed Oct 06 16:26:38 2010 +0200
+++ b/MonetDB5/src/modules/atoms/Makefile.ag Wed Oct 06 16:27:44 2010 +0200
@@ -67,19 +67,32 @@
$(LIBXML2_LIBS) $(ICONV_LIBS) ../../mal/libmonetdb5
}
+headers_xml_h = {
+ COND = HAVE_LIBXML2
+ DIR = includedir/MonetDB5/atoms
+ SOURCES = xml.mx
+ HEADERS = h
+}
+
+headers_xml_mal = {
+ COND = HAVE_LIBXML2
+ HEADERS = mal
+ DIR = libdir/MonetDB5
+ SOURCES = xml.mx
+}
+
headers_h = {
DIR = includedir/MonetDB5/atoms
SOURCES = blob.mx url.mx mtime.mx streams.mx inet.mx color.mx \
- xml.mx str.mx identifier.mx
+ str.mx identifier.mx
HEADERS = h
}
-
headers_mal = {
HEADERS = mal
DIR = libdir/MonetDB5
SOURCES = str.mx blob.mx url.mx mtime.mx streams.mx inet.mx color.mx \
- xml.mx identifier.mx
+ identifier.mx
}
EXTRA_DIST_DIR = Tests
diff -r df5442924469 -r a02ba0cda6b6 MonetDB5/src/modules/kernel/Makefile.ag
--- a/MonetDB5/src/modules/kernel/Makefile.ag Wed Oct 06 16:26:38 2010 +0200
+++ b/MonetDB5/src/modules/kernel/Makefile.ag Wed Oct 06 16:27:44 2010 +0200
@@ -121,6 +121,20 @@
$(SPHINXCLIENT_LIBS) ../../mal/libmonetdb5
}
+headers_sphinx_h = {
+ COND = HAVE_SPHINXCLIENT
+ DIR = includedir/MonetDB5/kernel
+ SOURCES = sphinx.mx
+ HEADERS = h
+}
+
+headers_sphinx_mal = {
+ COND = HAVE_SPHINXCLIENT
+ HEADERS = mal
+ DIR = libdir/MonetDB5
+ SOURCES = sphinx.mx
+}
+
headers_h = {
DIR = includedir/MonetDB5/kernel
SOURCES = \
@@ -131,8 +145,7 @@
aggr_be_sum.mx aggr_be_prod.mx aggr_be_avg.mx aggr_be_minmax.mx
aggr_be_count.mx \
aggr_bge_sum.mx aggr_bge_prod.mx aggr_bge_avg.mx
aggr_bge_minmax.mx aggr_bge_count.mx \
counters.mx microbenchmark.mx \
- batstr.mx batmtime.mx batcolor.mx group.mx array.mx logger.mx \
- sphinx.mx
+ batstr.mx batmtime.mx batcolor.mx group.mx array.mx logger.mx
HEADERS = h
}
@@ -143,8 +156,7 @@
mmath.mx lock.mx sema.mx alarm.mx batstr.mx batmtime.mx \
batcolor.mx batifthen.mx batcast.mx batcalc.mx batmmath.mx \
group.mx aggr.mx array.mx \
- counters.mx logger.mx microbenchmark.mx \
- sphinx.mx
+ counters.mx logger.mx microbenchmark.mx
}
EXTRA_DIST_DIR = Tests
diff -r df5442924469 -r a02ba0cda6b6 MonetDB5/src/modules/mal/Makefile.ag
--- a/MonetDB5/src/modules/mal/Makefile.ag Wed Oct 06 16:26:38 2010 +0200
+++ b/MonetDB5/src/modules/mal/Makefile.ag Wed Oct 06 16:27:44 2010 +0200
@@ -176,6 +176,20 @@
$(MALLOC_LIBS) $(PTHREAD_LIBS) $(DL_LIBS)
}
+headers_batxml_h = {
+ COND = HAVE_LIBXML2
+ DIR = includedir/MonetDB5/mal
+ SOURCES = batxml.mx
+ HEADERS = h
+}
+
+headers_batxml_mal = {
+ COND = HAVE_LIBXML2
+ HEADERS = mal
+ DIR = libdir/MonetDB5
+ SOURCES = batxml.mx
+}
+
headers_h = {
DIR = includedir/MonetDB5/mal
SOURCES = batExtensions.mx bpm.mx mal_mapi.mx mal_io.mx clients.mx \
@@ -185,7 +199,7 @@
inspect.mx manual.mx pqueue.mx mkey.mx \
factories.mx groupby.mx mdb.mx \
urlbox.mx mat.mx histogram.mx \
- sabaoth.mx remote.mx batxml.mx recycle.mx \
+ sabaoth.mx remote.mx recycle.mx \
cluster.mx trader.mx replication.mx pma.mx \
tokenizer.mx zorder.mx
#radix.mx
@@ -203,7 +217,7 @@
factories.mx groupby.mx mdb.mx pcre.mx tablet.mx mat.mx
histogram.mx \
urlbox.mx statistics.mx transaction.mx \
mal_mapi.mx sabaoth.mx remote.mx \
- bpm.mx batxml.mx txtsim.mx recycle.mx \
+ bpm.mx txtsim.mx recycle.mx \
cluster.mx trader.mx replication.mx pma.mx \
tokenizer.mx zorder.mx
#radix.mx
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
