Changeset: b988544c89bc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b988544c89bc
Modified Files:
MonetDB.spec
sql/backends/monet5/vaults/Makefile.ag
Branch: default
Log Message:
Fix fits packaging.
diffs (187 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -574,6 +574,7 @@ format.
%defattr(-,root,root)
%{_libdir}/monetdb5/fits.mal
%{_libdir}/monetdb5/autoload/*_fits.mal
+%{_libdir}/monetdb5/createdb/*_fits.sql
%{_libdir}/monetdb5/lib_fits.so
%endif
@@ -624,6 +625,9 @@ fi
%dir %{_libdir}/monetdb5/autoload
%if %{?with_fits:1}%{!?with_fits:0}
%exclude %{_libdir}/monetdb5/fits.mal
+%exclude %{_libdir}/monetdb5/autoload/*_fits.mal
+%exclude %{_libdir}/monetdb5/createdb/*_fits.sql
+%exclude %{_libdir}/monetdb5/lib_fits.so
%endif
%if %{?with_geos:1}%{!?with_geos:0}
%exclude %{_libdir}/monetdb5/geom.mal
@@ -635,9 +639,6 @@ fi
# %exclude %{_libdir}/monetdb5/rdf.mal
%exclude %{_libdir}/monetdb5/sql.mal
%{_libdir}/monetdb5/*.mal
-%if %{?with_fits:1}%{!?with_fits:0}
-%exclude %{_libdir}/monetdb5/autoload/*_fits.mal
-%endif
%if %{?with_geos:1}%{!?with_geos:0}
%exclude %{_libdir}/monetdb5/autoload/*_geom.mal
%endif
@@ -648,9 +649,6 @@ fi
# %exclude %{_libdir}/monetdb5/autoload/*_rdf.mal
%exclude %{_libdir}/monetdb5/autoload/*_sql.mal
%{_libdir}/monetdb5/autoload/*.mal
-%if %{?with_fits:1}%{!?with_fits:0}
-%exclude %{_libdir}/monetdb5/lib_fits.so
-%endif
%if %{?with_geos:1}%{!?with_geos:0}
%exclude %{_libdir}/monetdb5/lib_geom.so
%endif
diff --git a/sql/backends/monet5/vaults/Makefile.ag
b/sql/backends/monet5/vaults/Makefile.ag
--- a/sql/backends/monet5/vaults/Makefile.ag
+++ b/sql/backends/monet5/vaults/Makefile.ag
@@ -16,47 +16,28 @@
# All Rights Reserved.
INCLUDES = ../../../include \
- ../../../common \
- ../../../storage \
- ../../../server .. \
- ../../../../monetdb5/modules/atoms \
- ../../../../monetdb5/modules/kernel \
- ../../../../monetdb5/mal \
- ../../../../monetdb5/modules/mal \
- ../../../../monetdb5/optimizer \
- ../../../../monetdb5/scheduler \
- ../../../../clients/mapilib \
- ../../../../common/options \
- ../../../../common/stream \
- ../../../../common/utils \
- ../../../../gdk \
- $(READLINE_INCS) $(MSEED_CFLAGS) $(cfitsio_CFLAGS)
$(curl_CFLAGS)
+ ../../../common \
+ ../../../storage \
+ ../../../server .. \
+ ../../../../monetdb5/modules/atoms \
+ ../../../../monetdb5/modules/kernel \
+ ../../../../monetdb5/mal \
+ ../../../../monetdb5/modules/mal \
+ ../../../../monetdb5/optimizer \
+ ../../../../monetdb5/scheduler \
+ ../../../../clients/mapilib \
+ ../../../../common/options \
+ ../../../../common/stream \
+ ../../../../common/utils \
+ ../../../../gdk \
+ $(READLINE_INCS) $(MSEED_CFLAGS) $(cfitsio_CFLAGS) $(curl_CFLAGS)
lib__vault = {
MODULE
DIR = libdir/monetdb5
SOURCES = vault.c
LIBS = ../../../../monetdb5/tools/libmonetdb5 \
- ../../../../gdk/libbat $(curl_LIBS)
-}
-
-lib__mseed = {
- MODULE
- COND = HAVE_MSEED
- DIR = libdir/monetdb5
- SOURCES = mseed.c
- LIBS = ../../../../monetdb5/tools/libmonetdb5 \
- ../../../../gdk/libbat \
- $(MSEED_LIBS)
-}
-
-lib__fits = {
- MODULE
- COND = HAVE_CFITSIO
- DIR = libdir/monetdb5
- SOURCES = fits.c
- LIBS = ../../../../monetdb5/tools/libmonetdb5 \
- $(cfitsio_LIBS)
+ ../../../../gdk/libbat $(curl_LIBS)
}
headers_mal = {
@@ -71,6 +52,22 @@ headers_sql = {
SOURCES = vault.sql
}
+headers_autoload = {
+ HEADERS = mal
+ DIR = libdir/monetdb5/autoload
+ SOURCES = 70_vault.mal
+}
+
+lib__mseed = {
+ MODULE
+ COND = HAVE_MSEED
+ DIR = libdir/monetdb5
+ SOURCES = mseed.c
+ LIBS = ../../../../monetdb5/tools/libmonetdb5 \
+ ../../../../gdk/libbat \
+ $(MSEED_LIBS)
+}
+
headers_mseedmal = {
COND = HAVE_MSEED
HEADERS = mal
@@ -85,6 +82,22 @@ headers_mseedsql = {
SOURCES = mseed.sql
}
+headers_mseedautoload = {
+ COND = HAVE_MSEED
+ HEADERS = mal
+ DIR = libdir/monetdb5/autoload
+ SOURCES = 71_mseed.mal
+}
+
+lib__fits = {
+ MODULE
+ COND = HAVE_CFITSIO
+ DIR = libdir/monetdb5
+ SOURCES = fits.c
+ LIBS = ../../../../monetdb5/tools/libmonetdb5 \
+ $(cfitsio_LIBS)
+}
+
headers_fitsmal = {
COND = HAVE_CFITSIO
HEADERS = mal
@@ -99,28 +112,15 @@ headers_fitssql = {
SOURCES = 72_fits.sql
}
-headers_autoload = {
+headers_fitsautoload = {
+ COND = HAVE_CFITSIO
HEADERS = mal
DIR = libdir/monetdb5/autoload
- SOURCES = 70_vault.mal
-}
-
-headers_mseedautoload = {
- COND = HAVE_MSEED
- HEADERS = mal
- DIR = libdir/monetdb5/autoload
- SOURCES = 71_mseed.mal
-}
-
-headers_fitsautoload = {
- COND = HAVE_CFITSIO
- HEADERS = mal
- DIR = libdir/monetdb5/autoload
- SOURCES = 72_fits.mal
+ SOURCES = 72_fits.mal
}
EXTRA_DIST_DIR = Tests
EXTRA_DIST = 70_vault.mal 71_mseed.mal 72_fits.mal \
- fits.mal fits.sql fits.h \
+ fits.mal 72_fits.sql fits.h \
mseed.mal mseed.sql mseed.h \
vault.mal vault.sql vault.h
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
