Changeset: 65152398db1f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65152398db1f
Modified Files:
sql/backends/monet5/Makefile.ag
sql/backends/monet5/datacell/50_datacell.sql
sql/backends/monet5/datacell/Makefile.ag
sql/backends/monet5/datacell/Makefile.in
sql/backends/monet5/datacell/Makefile.msc
sql/backends/monet5/datacell/datacell.sql
Branch: default
Log Message:
build: misc try to get things right
remove generated files (Makefile.in/msc)
also add .mal and sql files to dist
rename 50_datacell.sql to datacell.sql, since it isn't autoloaded or something
TODO: make installing datacell conditional/non-intrusive
diffs (truncated from 1151 to 300 lines):
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
@@ -15,7 +15,7 @@
# Copyright August 2008-2011 MonetDB B.V.
# All Rights Reserved.
-SUBDIRS = NOT_WIN32?vaults UDF NOT_WIN32?LSST NOT_WIN32?datacell
+SUBDIRS = NOT_WIN32?vaults UDF NOT_WIN32?LSST NOT_WIN32?datacell
# force sql.o to not depend on .../rdf/rdf.h since it only optionally created
RDF_INC = -I../../../monetdb5/extras/rdf
diff --git a/sql/backends/monet5/datacell/Makefile.ag
b/sql/backends/monet5/datacell/Makefile.ag
--- a/sql/backends/monet5/datacell/Makefile.ag
+++ b/sql/backends/monet5/datacell/Makefile.ag
@@ -77,7 +77,7 @@
scripts_sql = {
HEADERS = sql
DIR = libdir/monetdb5
- SOURCES = 50_datacell.sql
+ SOURCES = datacell.sql
}
headers_datacellautoload = {
@@ -85,3 +85,5 @@
DIR = libdir/monetdb5/autoload
SOURCES = 50_datacell.mal
}
+
+EXTRA_DIST = 50_datacell.mal datacell.sql
diff --git a/sql/backends/monet5/datacell/Makefile.in
b/sql/backends/monet5/datacell/Makefile.in
deleted file mode 100644
--- a/sql/backends/monet5/datacell/Makefile.in
+++ /dev/null
@@ -1,979 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = sql/backends/monet5/datacell
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/monetdb_config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(actuatordir)" \
- "$(DESTDIR)$(datacelldir)" "$(DESTDIR)$(sensordir)" \
- "$(DESTDIR)$(bindir)"
-LTLIBRARIES = $(actuator_LTLIBRARIES) $(datacell_LTLIBRARIES) \
- $(sensor_LTLIBRARIES)
-lib_actuator_la_DEPENDENCIES = \
- ../../../../monetdb5/tools/libmonetdb5.la \
- ../../../../gdk/libbat.la
-dist_lib_actuator_la_OBJECTS =
-nodist_lib_actuator_la_OBJECTS = lib_actuator_la-actuator.lo
-lib_actuator_la_OBJECTS = $(dist_lib_actuator_la_OBJECTS) \
- $(nodist_lib_actuator_la_OBJECTS)
-lib_actuator_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(lib_actuator_la_CFLAGS) \
- $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-lib_datacell_la_DEPENDENCIES = \
- ../../../../monetdb5/tools/libmonetdb5.la \
- ../../../../gdk/libbat.la
-dist_lib_datacell_la_OBJECTS =
-nodist_lib_datacell_la_OBJECTS = lib_datacell_la-basket.lo \
- lib_datacell_la-dcsocket.lo lib_datacell_la-receptor.lo \
- lib_datacell_la-petrinet.lo lib_datacell_la-dcoperator.lo \
- lib_datacell_la-emitter.lo
-lib_datacell_la_OBJECTS = $(dist_lib_datacell_la_OBJECTS) \
- $(nodist_lib_datacell_la_OBJECTS)
-lib_datacell_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(lib_datacell_la_CFLAGS) \
- $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-lib_sensor_la_DEPENDENCIES = \
- ../../../../monetdb5/tools/libmonetdb5.la \
- ../../../../gdk/libbat.la
-dist_lib_sensor_la_OBJECTS =
-nodist_lib_sensor_la_OBJECTS = lib_sensor_la-sensor.lo
-lib_sensor_la_OBJECTS = $(dist_lib_sensor_la_OBJECTS) \
- $(nodist_lib_sensor_la_OBJECTS)
-lib_sensor_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(lib_sensor_la_CFLAGS) \
- $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SCRIPTS = $(bin_SCRIPTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp =
-am__depfiles_maybe =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
-SOURCES = $(dist_lib_actuator_la_SOURCES) \
- $(nodist_lib_actuator_la_SOURCES) \
- $(dist_lib_datacell_la_SOURCES) \
- $(nodist_lib_datacell_la_SOURCES) \
- $(dist_lib_sensor_la_SOURCES) $(nodist_lib_sensor_la_SOURCES)
-DIST_SOURCES = $(dist_lib_actuator_la_SOURCES) \
- $(dist_lib_datacell_la_SOURCES) $(dist_lib_sensor_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
-AMTAR = @AMTAR@
-ANT = @ANT@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BASH = @BASH@
-BUILD = @BUILD@
-BZ_CFLAGS = @BZ_CFLAGS@
-BZ_LIBS = @BZ_LIBS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CFLAGS_NO_OPT = @CFLAGS_NO_OPT@
-CLASSPATH = @CLASSPATH@
-CONFIG_H = @CONFIG_H@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-CYGPATH_WP = @CYGPATH_WP@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIRSEP = @DIRSEP@
-DLLTOOL = @DLLTOOL@
-DL_LIBS = @DL_LIBS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-DVIPS = @DVIPS@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-Elocalstatedir = @Elocalstatedir@
-Elogdir = @Elogdir@
-Erundir = @Erundir@
-FGREP = @FGREP@
-FIG2DEV = @FIG2DEV@
-FIG2DEV_EPS = @FIG2DEV_EPS@
-GCC_BISON_CFLAGS = @GCC_BISON_CFLAGS@
-GCC_SWIG_CFLAGS = @GCC_SWIG_CFLAGS@
-GDK_VERSION = @GDK_VERSION@
-GEOS_CONFIG = @GEOS_CONFIG@
-GEOS_INCS = @GEOS_INCS@
-GEOS_LIBS = @GEOS_LIBS@
-GREP = @GREP@
-HWCOUNTERS_INCS = @HWCOUNTERS_INCS@
-HWCOUNTERS_LIBS = @HWCOUNTERS_LIBS@
-ICC_BISON_CFLAGS = @ICC_BISON_CFLAGS@
-ICC_SWIG_CFLAGS = @ICC_SWIG_CFLAGS@
-INSTALL = @INSTALL@
-INSTALL_BACKUP = @INSTALL_BACKUP@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-JAR = @JAR@
-JAVA = @JAVA@
-JAVAC = @JAVAC@
-JAVACFLAGS = @JAVACFLAGS@
-JAVADOC = @JAVADOC@
-JAVA_HOME = @JAVA_HOME@
-JAVA_VERSION = @JAVA_VERSION@
-LATEX = @LATEX@
-LATEX2HTML = @LATEX2HTML@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBICONV = @LIBICONV@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LINUX_DIST = @LINUX_DIST@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LOCKFILE = @LOCKFILE@
-LTLIBICONV = @LTLIBICONV@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MALLOC_LIBS = @MALLOC_LIBS@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MAPI_VERSION = @MAPI_VERSION@
-MATH_LIBS = @MATH_LIBS@
-MKDIR_P = @MKDIR_P@
-MONETDB5_VERSION = @MONETDB5_VERSION@
-MSEED_CFLAGS = @MSEED_CFLAGS@
-MSEED_LIBS = @MSEED_LIBS@
-MSGCONTROL_FLAGS = @MSGCONTROL_FLAGS@
-MV = @MV@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NO_INLINE_CFLAGS = @NO_INLINE_CFLAGS@
-NO_OPTIMIZE_FILES = @NO_OPTIMIZE_FILES@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-ODBC_INCS = @ODBC_INCS@
-ODBC_LIBS = @ODBC_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATHSEP = @PATHSEP@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PDFLATEX = @PDFLATEX@
-PERL = @PERL@
-PERL_INCS = @PERL_INCS@
-PERL_LIBDIR = @PERL_LIBDIR@
-PERL_LIBS = @PERL_LIBS@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PKG_CURL = @PKG_CURL@
-PKG_ZLIB = @PKG_ZLIB@
-PTHREAD_INCS = @PTHREAD_INCS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-PYTHON = @PYTHON@
-PYTHON_LIBDIR = @PYTHON_LIBDIR@
-QBUILD = @QBUILD@
-QDIRSEP = @QDIRSEP@
-QSOURCE = @QSOURCE@
-QXBUILD = @QXBUILD@
-QXSOURCE = @QXSOURCE@
-QXbindir = @QXbindir@
-QXdatadir = @QXdatadir@
-QXdatarootdir = @QXdatarootdir@
-QXexec_prefix = @QXexec_prefix@
-QXincludedir = @QXincludedir@
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
