Changeset: 5f11950764b5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5f11950764b5
Modified Files:
geom/monetdb5/Makefile.ag
monetdb5/extras/mal_optimizer_template/Makefile.ag
monetdb5/extras/sphinx/Makefile.ag
monetdb5/modules/kernel/Makefile.ag
monetdb5/modules/mal/Makefile.ag
sql/backends/monet5/LSST/Makefile.ag
sql/backends/monet5/Makefile.ag
sql/backends/monet5/gsl/Makefile.ag
sql/backends/monet5/vaults/Makefile.ag
sql/backends/monet5/vaults/fits/Makefile.ag
sql/backends/monet5/vaults/netcdf/Makefile.ag
Branch: Dec2016
Log Message:
Removed unnecessary EXTRA_DIST blurbs.
If the file is mentioned in SOURCES, it doesn't need to be in EXTRA_DIST.
diffs (150 lines):
diff --git a/geom/monetdb5/Makefile.ag b/geom/monetdb5/Makefile.ag
--- a/geom/monetdb5/Makefile.ag
+++ b/geom/monetdb5/Makefile.ag
@@ -34,5 +34,3 @@ headers_autoload = {
DIR = libdir/monetdb5/autoload
SOURCES = 30_geom.mal
}
-
-EXTRA_DIST = 30_geom.mal geom.mal
diff --git a/monetdb5/extras/mal_optimizer_template/Makefile.ag
b/monetdb5/extras/mal_optimizer_template/Makefile.ag
--- a/monetdb5/extras/mal_optimizer_template/Makefile.ag
+++ b/monetdb5/extras/mal_optimizer_template/Makefile.ag
@@ -36,6 +36,4 @@ headers_opt_sql_append_autoload = {
SOURCES = 91_opt_sql_append.mal
}
-EXTRA_DIST = 91_opt_sql_append.mal
-
EXTRA_DIST_DIR = Tests
diff --git a/monetdb5/extras/sphinx/Makefile.ag
b/monetdb5/extras/sphinx/Makefile.ag
--- a/monetdb5/extras/sphinx/Makefile.ag
+++ b/monetdb5/extras/sphinx/Makefile.ag
@@ -29,5 +29,3 @@ headers_autoload = {
DIR = libdir/monetdb5/autoload
SOURCES = 30_sphinx.mal
}
-
-EXTRA_DIST = sphinx.mal 30_sphinx.mal
diff --git a/monetdb5/modules/kernel/Makefile.ag
b/monetdb5/modules/kernel/Makefile.ag
--- a/monetdb5/modules/kernel/Makefile.ag
+++ b/monetdb5/modules/kernel/Makefile.ag
@@ -46,6 +46,4 @@ headers_hge = {
SOURCES = 00_aggr_hge.mal
}
-EXTRA_DIST = alarm.mal logger.mal microbenchmark.mal aggr.mal 00_aggr_hge.mal
group.mal algebra.mal
-
EXTRA_DIST_DIR = Tests
diff --git a/monetdb5/modules/mal/Makefile.ag b/monetdb5/modules/mal/Makefile.ag
--- a/monetdb5/modules/mal/Makefile.ag
+++ b/monetdb5/modules/mal/Makefile.ag
@@ -80,15 +80,4 @@ headers_hge = {
00_mal_mapi_hge.mal 00_mkey_hge.mal 00_batExtensions_hge.mal
}
-EXTRA_DIST = batExtensions.mal iterator.mal \
- groupby.mal mal_init.mal manual.mal mkey.mal manifold.mal pcre.mal \
- profiler.mal remote.mal sabaoth.mal orderidx.mal \
- transaction.mal txtsim.mal tablet.mal tablet.h sample.mal json_util.mal
\
- mal_mapi.mal mat.mal tokenizer.mal \
- batmtime.mal querylog.mal sysmon.mal \
- 01_calc.mal 01_batcalc.mal \
- 00_calc_hge.mal 00_batcalc_hge.mal \
- 00_iterator_hge.mal 00_language_hge.mal \
- 00_mal_mapi_hge.mal 00_mkey_hge.mal 00_batExtensions_hge.mal
-
EXTRA_DIST_DIR = Tests
diff --git a/sql/backends/monet5/LSST/Makefile.ag
b/sql/backends/monet5/LSST/Makefile.ag
--- a/sql/backends/monet5/LSST/Makefile.ag
+++ b/sql/backends/monet5/LSST/Makefile.ag
@@ -21,7 +21,7 @@ INCLUDES = .. \
lib__lsst = {
MODULE
DIR = libdir/monetdb5
- SOURCES = lsst.c
+ SOURCES = lsst.c lsst.h
LIBS = ../../../../monetdb5/tools/libmonetdb5 \
../../../../gdk/libbat
}
@@ -44,5 +44,4 @@ headers_lsstautoload = {
SOURCES = 80_lsst.mal
}
-EXTRA_DIST = lsst.h
EXTRA_DIST_DIR = Tests
diff --git a/sql/backends/monet5/Makefile.ag b/sql/backends/monet5/Makefile.ag
--- a/sql/backends/monet5/Makefile.ag
+++ b/sql/backends/monet5/Makefile.ag
@@ -84,10 +84,4 @@ headers_autoload_hge = {
SOURCES = 41_sql_hge.mal
}
-EXTRA_DIST = 40_sql.mal \
- 41_sql_hge.mal sql_hge.mal sql_aggr_hge.mal sql_decimal_hge.mal \
- sql_aggr_bte.mal sql_aggr_flt.mal sql_aggr_int.mal sql_aggr_lng.mal \
- sql_aggr_sht.mal sql_decimal.mal sql_inspect.mal \
- sql_rank.mal sql.mal
-
EXTRA_DIST_DIR = Tests
diff --git a/sql/backends/monet5/gsl/Makefile.ag
b/sql/backends/monet5/gsl/Makefile.ag
--- a/sql/backends/monet5/gsl/Makefile.ag
+++ b/sql/backends/monet5/gsl/Makefile.ag
@@ -36,4 +36,3 @@ headers_gsl = {
}
EXTRA_DIST_DIR = Tests
-EXTRA_DIST = 73_gsl.mal gsl.mal
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
@@ -24,7 +24,7 @@ INCLUDES = ../../../include \
lib__vault = {
MODULE
DIR = libdir/monetdb5
- SOURCES = vault.c
+ SOURCES = vault.c vault.h
LIBS = ../../../../monetdb5/tools/libmonetdb5 \
../../../../gdk/libbat $(curl_LIBS)
}
@@ -48,4 +48,3 @@ headers_autoload = {
}
EXTRA_DIST_DIR = Tests
-EXTRA_DIST = 70_vault.mal vault.mal vault.sql vault.h
diff --git a/sql/backends/monet5/vaults/fits/Makefile.ag
b/sql/backends/monet5/vaults/fits/Makefile.ag
--- a/sql/backends/monet5/vaults/fits/Makefile.ag
+++ b/sql/backends/monet5/vaults/fits/Makefile.ag
@@ -25,7 +25,7 @@ INCLUDES = .. \
lib__fits = {
MODULE
DIR = libdir/monetdb5
- SOURCES = fits.c
+ SOURCES = fits.c fits.h
LIBS = ../../../../../monetdb5/tools/libmonetdb5 \
$(cfitsio_LIBS)
}
@@ -47,5 +47,3 @@ headers_fitsautoload = {
DIR = libdir/monetdb5/autoload
SOURCES = 72_fits.mal
}
-
-EXTRA_DIST = 72_fits.mal fits.mal 72_fits.sql fits.h
diff --git a/sql/backends/monet5/vaults/netcdf/Makefile.ag
b/sql/backends/monet5/vaults/netcdf/Makefile.ag
--- a/sql/backends/monet5/vaults/netcdf/Makefile.ag
+++ b/sql/backends/monet5/vaults/netcdf/Makefile.ag
@@ -25,7 +25,7 @@ INCLUDES = .. \
lib__netcdf = {
MODULE
DIR = libdir/monetdb5
- SOURCES = netcdf.c
+ SOURCES = netcdf.c netcdf_vault.h
LIBS = ../../../../../monetdb5/tools/libmonetdb5 \
$(netcdf_LIBS)
}
@@ -47,5 +47,3 @@ headers_netcdfautoload = {
DIR = libdir/monetdb5/autoload
SOURCES = 74_netcdf.mal
}
-
-EXTRA_DIST = 74_netcdf.mal netcdf.mal 74_netcdf.sql netcdf_vault.h
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
