Changeset: f3aae18da856 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f3aae18da856
Modified Files:
MonetDB.spec
geom/monetdb4/Makefile.ag
monetdb4/modules/calibrator/Makefile.ag
monetdb4/modules/contrib/Makefile.ag
monetdb4/modules/mapi/Makefile.ag
monetdb4/modules/mnetcdf/Makefile.ag
monetdb4/modules/plain/Makefile.ag
pathfinder/modules/geoxml/Makefile.ag
pathfinder/modules/pftijah/Makefile.ag
pathfinder/modules/probxml/Makefile.ag
pathfinder/runtime/Makefile.ag
pathfinder/runtime5/Makefile.ag
Branch: Mar2011
Log Message:
Undo part of changeset 2b63ce318788.
Some of the monetdb4 modules are linked against and therefore cannot
be created with the -module flag for libtool.
diffs (275 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -323,7 +323,7 @@
%files geom-MonetDB4
%defattr(-,root,root)
%{_libdir}/monetdb4/geom.mil
-%{_libdir}/monetdb4/lib/lib_geom.so
+%{_libdir}/monetdb4/lib/lib_geom.so*
%package geom-MonetDB5
Summary: MonetDB5 SQL GIS support module
@@ -395,19 +395,19 @@
%dir %{_libdir}/monetdb4
%dir %{_libdir}/monetdb4/lib
%if %{?_with_netcdf:1}%{!?_with_netcdf:0}
-%exclude %{_libdir}/monetdb4/lib/lib_mnetcdf.so
+%exclude %{_libdir}/monetdb4/lib/lib_mnetcdf.so*
%exclude %{_libdir}/monetdb4/mnetcdf.mil
%endif
%{_libdir}/libmonet.so.*
%{_libdir}/libbat4.so.*
%{_libdir}/libstream4.so.*
%{_libdir}/libmapi4.so.*
-%exclude %{_libdir}/monetdb4/lib/lib_geom.so
-%exclude %{_libdir}/monetdb4/lib/lib_pathfinder.so
+%exclude %{_libdir}/monetdb4/lib/lib_geom.so*
+%exclude %{_libdir}/monetdb4/lib/lib_pathfinder.so*
%exclude %{_libdir}/monetdb4/lib/lib_pf*
-%exclude %{_libdir}/monetdb4/lib/lib_probxml.so
+%exclude %{_libdir}/monetdb4/lib/lib_probxml.so*
%exclude %{_libdir}/monetdb4/lib/lib_xrpc*
-%{_libdir}/monetdb4/lib/*.so
+%{_libdir}/monetdb4/lib/*.so*
%exclude %{_libdir}/monetdb4/geom.mil
%exclude %{_libdir}/monetdb4/pathfinder.mil
%exclude %{_libdir}/monetdb4/pf*.mil
@@ -434,7 +434,7 @@
%files -n MonetDB4-server-netcdf
%defattr(-,root,root)
-%{_libdir}/monetdb4/lib/lib_mnetcdf.so
+%{_libdir}/monetdb4/lib/lib_mnetcdf.so*
%{_libdir}/monetdb4/mnetcdf.mil
%endif
@@ -585,9 +585,9 @@
%{_datadir}/monetdb/xrpc/admin/*
%{_datadir}/monetdb/xrpc/demo/*
%{_datadir}/monetdb/xrpc/export/*
-%{_libdir}/monetdb4/lib/lib_pathfinder.so
+%{_libdir}/monetdb4/lib/lib_pathfinder.so*
%{_libdir}/monetdb4/lib/lib_pf*
-%{_libdir}/monetdb4/lib/lib_probxml.so
+%{_libdir}/monetdb4/lib/lib_probxml.so*
%{_libdir}/monetdb4/lib/lib_xrpc*
%{_libdir}/monetdb4/pathfinder.mil
%{_libdir}/monetdb4/pf*.mil
diff --git a/geom/monetdb4/Makefile.ag b/geom/monetdb4/Makefile.ag
--- a/geom/monetdb4/Makefile.ag
+++ b/geom/monetdb4/Makefile.ag
@@ -28,7 +28,6 @@
$(GEOS_INCS)
lib__geom = {
- MODULE
DIR = libdir/monetdb4
SOURCES = geom.mx
LIBS = ../lib/libgeom \
diff --git a/monetdb4/modules/calibrator/Makefile.ag
b/monetdb4/modules/calibrator/Makefile.ag
--- a/monetdb4/modules/calibrator/Makefile.ag
+++ b/monetdb4/modules/calibrator/Makefile.ag
@@ -25,7 +25,6 @@
calib_common.c calib_plot.c calib_smp.c
LIBS = {
- MODULE
DIR = libdir/monetdb4
SEP = _
SOURCES = calib.mx
diff --git a/monetdb4/modules/contrib/Makefile.ag
b/monetdb4/modules/contrib/Makefile.ag
--- a/monetdb4/modules/contrib/Makefile.ag
+++ b/monetdb4/modules/contrib/Makefile.ag
@@ -24,7 +24,6 @@
MTSAFE
LIBS = {
- MODULE
DIR = libdir/monetdb4
SEP = _
SOURCES = \
diff --git a/monetdb4/modules/mapi/Makefile.ag
b/monetdb4/modules/mapi/Makefile.ag
--- a/monetdb4/modules/mapi/Makefile.ag
+++ b/monetdb4/modules/mapi/Makefile.ag
@@ -23,7 +23,6 @@
MTSAFE
lib__mapi = {
- MODULE
DIR = libdir/monetdb4
SOURCES = mapi.mx
LIBS = ../../../common/options/libmoptions \
diff --git a/monetdb4/modules/mnetcdf/Makefile.ag
b/monetdb4/modules/mnetcdf/Makefile.ag
--- a/monetdb4/modules/mnetcdf/Makefile.ag
+++ b/monetdb4/modules/mnetcdf/Makefile.ag
@@ -24,7 +24,6 @@
MTSAFE
LIB_mnetcdf = {
- MODULE
DIR = libdir/monetdb4
SEP = _
COND = HAVE_NETCDF
diff --git a/monetdb4/modules/plain/Makefile.ag
b/monetdb4/modules/plain/Makefile.ag
--- a/monetdb4/modules/plain/Makefile.ag
+++ b/monetdb4/modules/plain/Makefile.ag
@@ -25,7 +25,6 @@
MTSAFE
lib__streams = {
- MODULE
DIR = libdir/monetdb4
SOURCES = streams.mx
#SCRIPTS = mil ""
@@ -37,7 +36,6 @@
}
lib__str = {
- MODULE
DIR = libdir/monetdb4
SOURCES = str.mx
#SCRIPTS = mil ""
@@ -49,7 +47,6 @@
}
lib__xtables = {
- MODULE
DIR = libdir/monetdb4
SOURCES = xtables.mx
#SCRIPTS = mil ""
@@ -61,7 +58,6 @@
}
lib__logger = {
- MODULE
DIR = libdir/monetdb4
SOURCES = logger.mx
#SCRIPTS = mil ""
@@ -74,7 +70,6 @@
LIBS = {
DIR = libdir/monetdb4
- MODULE
SEP = _
SOURCES = \
algebra.mx arith.mx bat.mx builtin.mx sys.mx trans.mx \
@@ -92,7 +87,6 @@
}
lib__aggrX3 = {
- MODULE
DIR = libdir/monetdb4
SOURCES = aggrX3.mx \
aggrX3_be_sum.mx aggrX3_be_prod.mx aggrX3_be_avg.mx
aggrX3_be_minmax.mx aggrX3_be_count.mx \
@@ -106,7 +100,6 @@
EXTRA_DIST = aggrX3_ri.mx
lib__counters = {
- MODULE
DIR = libdir/monetdb4
SOURCES = counters.mx
#SCRIPTS = mil ""
@@ -118,7 +111,6 @@
}
lib__pcl = {
- MODULE
DIR = libdir/monetdb4
SOURCES = pcl.mx
#SCRIPTS = mil ""
@@ -130,7 +122,6 @@
}
lib__pcre = {
- MODULE
DIR = libdir/monetdb4
SOURCES = pcre.mx
#SCRIPTS = mil ""
diff --git a/pathfinder/modules/geoxml/Makefile.ag
b/pathfinder/modules/geoxml/Makefile.ag
--- a/pathfinder/modules/geoxml/Makefile.ag
+++ b/pathfinder/modules/geoxml/Makefile.ag
@@ -41,7 +41,6 @@
PF_LIBS = $(libxml2_LIBS) $(DL_LIBS)
lib__geoxml = {
- MODULE
DIR = libdir/monetdb4
SOURCES = geoxml.mx serialize_geometry.mx
diff --git a/pathfinder/modules/pftijah/Makefile.ag
b/pathfinder/modules/pftijah/Makefile.ag
--- a/pathfinder/modules/pftijah/Makefile.ag
+++ b/pathfinder/modules/pftijah/Makefile.ag
@@ -63,7 +63,6 @@
pftijah_stem_CFLAGS = $(SUN_NOERR_CFLAGS)
lib__pftijah = {
- MODULE
DIR = libdir/monetdb4
SOURCES = \
termdb.mx \
diff --git a/pathfinder/modules/probxml/Makefile.ag
b/pathfinder/modules/probxml/Makefile.ag
--- a/pathfinder/modules/probxml/Makefile.ag
+++ b/pathfinder/modules/probxml/Makefile.ag
@@ -41,7 +41,6 @@
PF_LIBS = $(libxml2_LIBS) $(DL_LIBS)
lib__probxml = {
- MODULE
DIR = libdir/monetdb4
SOURCES = probxml.mx
diff --git a/pathfinder/runtime/Makefile.ag b/pathfinder/runtime/Makefile.ag
--- a/pathfinder/runtime/Makefile.ag
+++ b/pathfinder/runtime/Makefile.ag
@@ -70,7 +70,6 @@
}
lib__pf_support = {
- MODULE
DIR = libdir/monetdb4
SOURCES = \
pf_support.mx \
@@ -91,7 +90,6 @@
}
lib__pf_standoff = {
- MODULE
DIR = libdir/monetdb4
SOURCES = \
pf_standoff.mx
@@ -110,7 +108,6 @@
}
lib__pathfinder = {
- MODULE
DIR = libdir/monetdb4
SOURCES = \
pathfinder.mx
@@ -148,7 +145,6 @@
}
lib__xrpc_client = {
- MODULE
DIR = libdir/monetdb4
SOURCES = xrpc_client.mx
LIBS = \
@@ -164,7 +160,6 @@
}
lib__xrpc_server = {
- MODULE
DIR = libdir/monetdb4
SOURCES = \
shttpd.c shttpd.h \
diff --git a/pathfinder/runtime5/Makefile.ag b/pathfinder/runtime5/Makefile.ag
--- a/pathfinder/runtime5/Makefile.ag
+++ b/pathfinder/runtime5/Makefile.ag
@@ -41,7 +41,6 @@
PF_LIBS = $(libxml2_LIBS) $(DL_LIBS)
lib__xquery = {
- MODULE
DIR = libdir/monetdb5
SOURCES = \
xquery.mx \
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
