Changeset: 400d19c8dfa6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=400d19c8dfa6
Removed Files:
sql/backends/monet5/iot/receptor.c
sql/backends/monet5/iot/receptor.h
sql/backends/monet5/iot/receptor.mal
Modified Files:
sql/backends/monet5/iot/50_iot.mal
sql/backends/monet5/iot/50_iot.sql
sql/backends/monet5/iot/Makefile.ag
sql/backends/monet5/iot/Makefile.am
sql/backends/monet5/iot/Makefile.in
sql/backends/monet5/iot/Makefile.msc
sql/backends/monet5/iot/Tests/iot00.sql
sql/backends/monet5/iot/Tests/iot05.sql
sql/backends/monet5/iot/basket.c
sql/backends/monet5/iot/basket.h
sql/backends/monet5/iot/basket.mal
sql/backends/monet5/iot/iot.c
sql/backends/monet5/iot/iot.h
sql/backends/monet5/iot/iot.mal
sql/backends/monet5/iot/petrinet.c
sql/backends/monet5/iot/petrinet.h
sql/backends/monet5/iot/petrinet.mal
Branch: iot
Log Message:
Intermittend commit
Still struggling with the Makefile.ag to get the libraries
loaded.
diffs (truncated from 1119 to 300 lines):
diff --git a/sql/backends/monet5/iot/50_iot.mal
b/sql/backends/monet5/iot/50_iot.mal
--- a/sql/backends/monet5/iot/50_iot.mal
+++ b/sql/backends/monet5/iot/50_iot.mal
@@ -19,6 +19,5 @@
include iot;
include basket;
include petrinet;
-include receptor;
io.printf("# MonetDB/iot loaded\n");
diff --git a/sql/backends/monet5/iot/50_iot.sql
b/sql/backends/monet5/iot/50_iot.sql
--- a/sql/backends/monet5/iot/50_iot.sql
+++ b/sql/backends/monet5/iot/50_iot.sql
@@ -41,36 +41,25 @@ create procedure iot.stop ()
create procedure iot."drop" ()
external name iot."drop";
-
create procedure iot.stop ("schema" string, name string)
external name iot.stop;
create procedure iot.dump()
external name iot.dump;
-create procedure iot.baskets()
- external name iot.baskets;
-
create procedure iot.petrinet()
external name iot.petrinet;
-create procedure iot.receptors()
- external name iot.receptors;
-
-- Inspection tables
---create function iot.baskets()
---returns table( "schema" string, "table" string, threshold int, winsize int,
winstride int, timeslice int, timestride int, beat int, seen timestamp, events
int)
---external name baskets.table;
-
-create function iot.queries()
-returns table( "schema" string, "function" string, status string, lastrun
timestamp, cycles int, events int, time bigint, error string)
-external name petrinet.queries;
-
---create function iot.receptors()
---returns table( "primary" string, "secondary" string, status string)
---external name receptor."table";
+-- create function iot.baskets()
+-- returns table( "schema" string, "table" string, threshold int, winsize
int, winstride int, timeslice int, timestride int, beat int, seen timestamp,
events int)
+-- external name iot.baskets;
+--
+-- create function iot.queries()
+-- returns table( "schema" string, "function" string, status string, lastrun
timestamp, cycles int, events int, time bigint, error string)
+-- external name petrinet.queries;
-- create function iot.errors()
-- returns table( "schema" string, "table" string, error string)
diff --git a/sql/backends/monet5/iot/Makefile.ag
b/sql/backends/monet5/iot/Makefile.ag
--- a/sql/backends/monet5/iot/Makefile.ag
+++ b/sql/backends/monet5/iot/Makefile.ag
@@ -30,46 +30,35 @@ INCLUDES = .. \
../../../../clients/mapilib \
../../../../common/options \
../../../../common/stream \
+ ../../../../common/utils \
../../../../gdk
lib__iot = {
MODULE
DIR = libdir/monetdb5
- SEP = _
- SOURCES = \
- iot.c \
- basket.c \
- receptor.c \
- petrinet.c
-# emitter.c
-
+ SOURCES = iot.c basket.c petrinet.c
LIBS = ../../../../monetdb5/tools/libmonetdb5 \
../../../../gdk/libbat
}
-scripts_mal = {
+headers_mal = {
HEADERS = mal
DIR = libdir/monetdb5
- SOURCES = basket.mal \
- iot.mal \
- petrinet.mal \
- receptor.mal
-# emitter.mal \
+ SOURCES = iot.mal basket.mal petrinet.mal
}
-scripts_sql = {
+headers_sql = {
HEADERS = sql
DIR = libdir/monetdb5/createdb
SOURCES = 50_iot.sql
}
-headers_iotautoload = {
+headers_autoload = {
HEADERS = mal
DIR = libdir/monetdb5/autoload
SOURCES = 50_iot.mal
}
-EXTRA_DIST = 50_iot.mal 50_iot.sql basket.mal basket.h iot.mal iot.h
petrinet.mal petrinet.h receptor.mal receptor.h
-# emitter.mal emitter.h
+EXTRA_DIST = 50_iot.mal basket.mal iot.mal petrinet.mal
EXTRA_DIST_DIR = Tests
diff --git a/sql/backends/monet5/iot/Makefile.am
b/sql/backends/monet5/iot/Makefile.am
--- a/sql/backends/monet5/iot/Makefile.am
+++ b/sql/backends/monet5/iot/Makefile.am
@@ -5,56 +5,6 @@
AUTOMAKE_OPTIONS = no-dependencies 1.4 foreign
-script_basket.mal: basket.mal
-install-exec-local-basket.mal: basket.mal
- -mkdir -p $(DESTDIR)$(libdir)/monetdb5
- -$(RM) $(DESTDIR)$(libdir)/monetdb5/basket.mal
- $(INSTALL) -m0755 $< $(DESTDIR)$(libdir)/monetdb5/basket.mal
-
-uninstall-local-basket.mal:
- $(RM) $(DESTDIR)$(libdir)/monetdb5/basket.mal
-
-script_iot.mal: iot.mal
-install-exec-local-iot.mal: iot.mal
- -mkdir -p $(DESTDIR)$(libdir)/monetdb5
- -$(RM) $(DESTDIR)$(libdir)/monetdb5/iot.mal
- $(INSTALL) -m0755 $< $(DESTDIR)$(libdir)/monetdb5/iot.mal
-
-uninstall-local-iot.mal:
- $(RM) $(DESTDIR)$(libdir)/monetdb5/iot.mal
-
-script_petrinet.mal: petrinet.mal
-install-exec-local-petrinet.mal: petrinet.mal
- -mkdir -p $(DESTDIR)$(libdir)/monetdb5
- -$(RM) $(DESTDIR)$(libdir)/monetdb5/petrinet.mal
- $(INSTALL) -m0755 $< $(DESTDIR)$(libdir)/monetdb5/petrinet.mal
-
-uninstall-local-petrinet.mal:
- $(RM) $(DESTDIR)$(libdir)/monetdb5/petrinet.mal
-
-script_receptor.mal: receptor.mal
-install-exec-local-receptor.mal: receptor.mal
- -mkdir -p $(DESTDIR)$(libdir)/monetdb5
- -$(RM) $(DESTDIR)$(libdir)/monetdb5/receptor.mal
- $(INSTALL) -m0755 $< $(DESTDIR)$(libdir)/monetdb5/receptor.mal
-
-uninstall-local-receptor.mal:
- $(RM) $(DESTDIR)$(libdir)/monetdb5/receptor.mal
-
-iot.o iot.lo: iot.c iot.h ../../../../monetdb5/optimizer/opt_prelude.h
../../../../monetdb5/optimizer/opt_support.h
../../../../monetdb5/optimizer/../mal/mal.h
../../../../monetdb5/optimizer/../mal/mal_function.h
../../../../monetdb5/optimizer/../mal/mal_scenario.h
../../../../monetdb5/optimizer/../mal/mal_builder.h
../../../../monetdb5/optimizer/opt_pipes.h
../../../../monetdb5/optimizer/opt_iot.h ../sql_optimizer.h ../sql_gencode.h
-petrinet.o petrinet.lo: petrinet.c iot.h petrinet.h
../../../../monetdb5/mal/mal_builder.h
../../../../monetdb5/optimizer/opt_support.h
../../../../monetdb5/optimizer/../mal/mal.h
../../../../monetdb5/optimizer/../mal/mal_function.h
../../../../monetdb5/optimizer/../mal/mal_scenario.h
../../../../monetdb5/optimizer/../mal/mal_builder.h
../../../../monetdb5/optimizer/opt_prelude.h
-basket.o basket.lo: basket.c ../../../../gdk/gdk.h iot.h basket.h receptor.h
../../../../monetdb5/mal/mal_instruction.h ../../../../monetdb5/mal/mal_type.h
../../../../monetdb5/mal/mal.h ../../../../monetdb5/mal/../../gdk/gdk.h
../../../../monetdb5/mal/mal_stack.h ../../../../monetdb5/mal/mal_namespace.h
../../../../monetdb5/mal/mal_errors.h ../../../../monetdb5/mal/mal_exception.h
../../../../monetdb5/mal/mal_builder.h
../../../../monetdb5/optimizer/opt_support.h
../../../../monetdb5/optimizer/../mal/mal.h
../../../../monetdb5/optimizer/../mal/mal_function.h
../../../../monetdb5/optimizer/../mal/mal_scenario.h
../../../../monetdb5/optimizer/../mal/mal_builder.h
../../../../monetdb5/optimizer/opt_prelude.h
-receptor.o receptor.lo: receptor.c receptor.h
-script_50_iot.sql: 50_iot.sql
-install-exec-local-50_iot.sql: 50_iot.sql
- -mkdir -p $(DESTDIR)$(libdir)/monetdb5/createdb
- -$(RM) $(DESTDIR)$(libdir)/monetdb5/createdb/50_iot.sql
- $(INSTALL) -m0755 $< $(DESTDIR)$(libdir)/monetdb5/createdb/50_iot.sql
-
-uninstall-local-50_iot.sql:
- $(RM) $(DESTDIR)$(libdir)/monetdb5/createdb/50_iot.sql
-
-AM_CPPFLAGS = -I$(srcdir) -I.. -I$(srcdir)/.. -I../../../include
-I$(srcdir)/../../../include -I../../../common -I$(srcdir)/../../../common
-I../../../storage -I$(srcdir)/../../../storage -I../../../server
-I$(srcdir)/../../../server -I../../../../monetdb5/modules/atoms
-I$(srcdir)/../../../../monetdb5/modules/atoms
-I../../../../monetdb5/modules/kernel
-I$(srcdir)/../../../../monetdb5/modules/kernel -I../../../../monetdb5/mal
-I$(srcdir)/../../../../monetdb5/mal -I../../../../monetdb5/modules/mal
-I$(srcdir)/../../../../monetdb5/modules/mal -I../../../../monetdb5/optimizer
-I$(srcdir)/../../../../monetdb5/optimizer -I../../../../clients/mapilib
-I$(srcdir)/../../../../clients/mapilib -I../../../../common/options
-I$(srcdir)/../../../../common/options -I../../../../common/stream
-I$(srcdir)/../../../../common/stream -I../../../../gdk
-I$(srcdir)/../../../../gdk
install-exec-local-50_iot.mal: 50_iot.mal
-mkdir -p $(DESTDIR)$(libdir)/monetdb5/autoload
-$(RM) $(DESTDIR)$(libdir)/monetdb5/autoload/50_iot.mal
@@ -63,32 +13,63 @@ install-exec-local-50_iot.mal: 50_iot.ma
uninstall-local-50_iot.mal:
$(RM) $(DESTDIR)$(libdir)/monetdb5/autoload/50_iot.mal
-dist-hook:
- mkdir -p $(distdir)/Tests
- cp -pR $(srcdir)/Tests/* $(distdir)/Tests
+iot.o iot.lo: iot.c iot.h ../../../../monetdb5/optimizer/opt_prelude.h
../../../../monetdb5/optimizer/opt_support.h
../../../../monetdb5/optimizer/../mal/mal.h
../../../../monetdb5/optimizer/../mal/mal_function.h
../../../../monetdb5/optimizer/../mal/mal_scenario.h
../../../../monetdb5/optimizer/../mal/mal_builder.h
../../../../monetdb5/optimizer/opt_pipes.h
../../../../monetdb5/optimizer/opt_iot.h ../sql_optimizer.h ../sql_gencode.h
+petrinet.o petrinet.lo: petrinet.c iot.h petrinet.h
../../../../monetdb5/mal/mal_builder.h
../../../../monetdb5/optimizer/opt_support.h
../../../../monetdb5/optimizer/../mal/mal.h
../../../../monetdb5/optimizer/../mal/mal_function.h
../../../../monetdb5/optimizer/../mal/mal_scenario.h
../../../../monetdb5/optimizer/../mal/mal_builder.h
../../../../monetdb5/optimizer/opt_prelude.h
+basket.o basket.lo: basket.c ../../../../gdk/gdk.h iot.h basket.h
../../../../monetdb5/mal/mal_instruction.h ../../../../monetdb5/mal/mal_type.h
../../../../monetdb5/mal/mal.h ../../../../monetdb5/mal/../../gdk/gdk.h
../../../../monetdb5/mal/mal_stack.h ../../../../monetdb5/mal/mal_namespace.h
../../../../monetdb5/mal/mal_errors.h ../../../../monetdb5/mal/mal_exception.h
../../../../monetdb5/mal/mal_builder.h
../../../../monetdb5/optimizer/opt_support.h
../../../../monetdb5/optimizer/../mal/mal.h
../../../../monetdb5/optimizer/../mal/mal_function.h
../../../../monetdb5/optimizer/../mal/mal_scenario.h
../../../../monetdb5/optimizer/../mal/mal_builder.h
../../../../monetdb5/optimizer/opt_prelude.h
+install-exec-local-basket.mal: basket.mal
+ -mkdir -p $(DESTDIR)$(libdir)/monetdb5
+ -$(RM) $(DESTDIR)$(libdir)/monetdb5/basket.mal
+ $(INSTALL_DATA) $< $(DESTDIR)$(libdir)/monetdb5/basket.mal
+
+uninstall-local-basket.mal:
+ $(RM) $(DESTDIR)$(libdir)/monetdb5/basket.mal
+
+install-exec-local-petrinet.mal: petrinet.mal
+ -mkdir -p $(DESTDIR)$(libdir)/monetdb5
+ -$(RM) $(DESTDIR)$(libdir)/monetdb5/petrinet.mal
+ $(INSTALL_DATA) $< $(DESTDIR)$(libdir)/monetdb5/petrinet.mal
+
+uninstall-local-petrinet.mal:
+ $(RM) $(DESTDIR)$(libdir)/monetdb5/petrinet.mal
+
+install-exec-local-iot.mal: iot.mal
+ -mkdir -p $(DESTDIR)$(libdir)/monetdb5
+ -$(RM) $(DESTDIR)$(libdir)/monetdb5/iot.mal
+ $(INSTALL_DATA) $< $(DESTDIR)$(libdir)/monetdb5/iot.mal
+
+uninstall-local-iot.mal:
+ $(RM) $(DESTDIR)$(libdir)/monetdb5/iot.mal
+
+AM_CPPFLAGS = -I$(srcdir) -I.. -I$(srcdir)/.. -I../../../include
-I$(srcdir)/../../../include -I../../../common -I$(srcdir)/../../../common
-I../../../storage -I$(srcdir)/../../../storage -I../../../server
-I$(srcdir)/../../../server -I../../../../monetdb5/modules/atoms
-I$(srcdir)/../../../../monetdb5/modules/atoms
-I../../../../monetdb5/modules/kernel
-I$(srcdir)/../../../../monetdb5/modules/kernel -I../../../../monetdb5/mal
-I$(srcdir)/../../../../monetdb5/mal -I../../../../monetdb5/modules/mal
-I$(srcdir)/../../../../monetdb5/modules/mal -I../../../../monetdb5/optimizer
-I$(srcdir)/../../../../monetdb5/optimizer -I../../../../clients/mapilib
-I$(srcdir)/../../../../clients/mapilib -I../../../../common/options
-I$(srcdir)/../../../../common/options -I../../../../common/stream
-I$(srcdir)/../../../../common/stream -I../../../../common/utils
-I$(srcdir)/../../../../common/utils -I../../../../gdk
-I$(srcdir)/../../../../gdk
+install-exec-local-50_iot.sql: 50_iot.sql
+ -mkdir -p $(DESTDIR)$(libdir)/monetdb5/createdb
+ -$(RM) $(DESTDIR)$(libdir)/monetdb5/createdb/50_iot.sql
+ $(INSTALL_DATA) $< $(DESTDIR)$(libdir)/monetdb5/createdb/50_iot.sql
+
+uninstall-local-50_iot.sql:
+ $(RM) $(DESTDIR)$(libdir)/monetdb5/createdb/50_iot.sql
+
lib_iot_la_CFLAGS=-DLIBIOT $(AM_CFLAGS)
iotdir = $(libdir)/monetdb5
lib_iot_la_LIBADD = ../../../../monetdb5/tools/libmonetdb5.la
../../../../gdk/libbat.la
$(do)install-iotLTLIBRARIES :
lib_iot_la-iot.lo: iot.c iot.h ../../../../monetdb5/optimizer/opt_prelude.h
../../../../monetdb5/optimizer/opt_support.h
../../../../monetdb5/optimizer/../mal/mal.h
../../../../monetdb5/optimizer/../mal/mal_function.h
../../../../monetdb5/optimizer/../mal/mal_scenario.h
../../../../monetdb5/optimizer/../mal/mal_builder.h
../../../../monetdb5/optimizer/opt_pipes.h
../../../../monetdb5/optimizer/opt_iot.h ../sql_optimizer.h ../sql_gencode.h
$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_iot_la_CFLAGS) $(CFLAGS)
$(iot_CFLAGS) -c -o lib_iot_la-iot.lo `test -f 'iot.c' || echo
'$(srcdir)/'`iot.c
-lib_iot_la-basket.lo: basket.c ../../../../gdk/gdk.h iot.h basket.h receptor.h
../../../../monetdb5/mal/mal_instruction.h ../../../../monetdb5/mal/mal_type.h
../../../../monetdb5/mal/mal.h ../../../../monetdb5/mal/../../gdk/gdk.h
../../../../monetdb5/mal/mal_stack.h ../../../../monetdb5/mal/mal_namespace.h
../../../../monetdb5/mal/mal_errors.h ../../../../monetdb5/mal/mal_exception.h
../../../../monetdb5/mal/mal_builder.h
../../../../monetdb5/optimizer/opt_support.h
../../../../monetdb5/optimizer/../mal/mal.h
../../../../monetdb5/optimizer/../mal/mal_function.h
../../../../monetdb5/optimizer/../mal/mal_scenario.h
../../../../monetdb5/optimizer/../mal/mal_builder.h
../../../../monetdb5/optimizer/opt_prelude.h
+lib_iot_la-basket.lo: basket.c ../../../../gdk/gdk.h iot.h basket.h
../../../../monetdb5/mal/mal_instruction.h ../../../../monetdb5/mal/mal_type.h
../../../../monetdb5/mal/mal.h ../../../../monetdb5/mal/../../gdk/gdk.h
../../../../monetdb5/mal/mal_stack.h ../../../../monetdb5/mal/mal_namespace.h
../../../../monetdb5/mal/mal_errors.h ../../../../monetdb5/mal/mal_exception.h
../../../../monetdb5/mal/mal_builder.h
../../../../monetdb5/optimizer/opt_support.h
../../../../monetdb5/optimizer/../mal/mal.h
../../../../monetdb5/optimizer/../mal/mal_function.h
../../../../monetdb5/optimizer/../mal/mal_scenario.h
../../../../monetdb5/optimizer/../mal/mal_builder.h
../../../../monetdb5/optimizer/opt_prelude.h
$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_iot_la_CFLAGS) $(CFLAGS)
$(basket_CFLAGS) -c -o lib_iot_la-basket.lo `test -f 'basket.c' || echo
'$(srcdir)/'`basket.c
-lib_iot_la-receptor.lo: receptor.c receptor.h
- $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_iot_la_CFLAGS) $(CFLAGS)
$(receptor_CFLAGS) -c -o lib_iot_la-receptor.lo `test -f 'receptor.c' || echo
'$(srcdir)/'`receptor.c
lib_iot_la-petrinet.lo: petrinet.c iot.h petrinet.h
../../../../monetdb5/mal/mal_builder.h
../../../../monetdb5/optimizer/opt_support.h
../../../../monetdb5/optimizer/../mal/mal.h
../../../../monetdb5/optimizer/../mal/mal_function.h
../../../../monetdb5/optimizer/../mal/mal_scenario.h
../../../../monetdb5/optimizer/../mal/mal_builder.h
../../../../monetdb5/optimizer/opt_prelude.h
$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_iot_la_CFLAGS) $(CFLAGS)
$(petrinet_CFLAGS) -c -o lib_iot_la-petrinet.lo `test -f 'petrinet.c' || echo
'$(srcdir)/'`petrinet.c
nodist_lib_iot_la_SOURCES =
-dist_lib_iot_la_SOURCES = iot.c basket.c receptor.c petrinet.c
+dist_lib_iot_la_SOURCES = iot.c basket.c petrinet.c
lib_iot_la_LDFLAGS = -module -avoid-version
-BUILT_SOURCES = 50_iot.sql basket.mal iot.mal petrinet.mal receptor.mal
+dist-hook:
+ mkdir -p $(distdir)/Tests
+ cp -pR $(srcdir)/Tests/* $(distdir)/Tests
+BUILT_SOURCES =
MOSTLYCLEANFILES =
-EXTRA_DIST = Makefile.ag Makefile.msc 50_iot.mal 50_iot.sql basket.c basket.h
basket.mal iot.c iot.h iot.mal petrinet.c petrinet.h petrinet.mal receptor.c
receptor.h receptor.mal
+EXTRA_DIST = Makefile.ag Makefile.msc 50_iot.mal 50_iot.sql basket.c
basket.mal iot.c iot.mal petrinet.c petrinet.mal
iot_LTLIBRARIES = lib_iot.la
-bin_SCRIPTS = script_50_iot.sql script_basket.mal script_iot.mal
script_petrinet.mal script_receptor.mal
-install-exec-local-SCRIPTS:
-all-local-SCRIPTS: $(bin_SCRIPTS)
-uninstall-local: uninstall-local-50_iot.mal uninstall-local-50_iot.sql
uninstall-local-basket.mal uninstall-local-iot.mal uninstall-local-petrinet.mal
uninstall-local-receptor.mal
-install-exec-local: install-exec-local-50_iot.mal
install-exec-local-50_iot.sql install-exec-local-basket.mal
install-exec-local-iot.mal install-exec-local-petrinet.mal
install-exec-local-receptor.mal
+uninstall-local: uninstall-local-50_iot.mal uninstall-local-50_iot.sql
uninstall-local-basket.mal uninstall-local-iot.mal uninstall-local-petrinet.mal
+install-exec-local: install-exec-local-50_iot.mal
install-exec-local-50_iot.sql install-exec-local-basket.mal
install-exec-local-iot.mal install-exec-local-petrinet.mal
include $(top_srcdir)/buildtools/conf/rules.mk
diff --git a/sql/backends/monet5/iot/Makefile.in
b/sql/backends/monet5/iot/Makefile.in
--- a/sql/backends/monet5/iot/Makefile.in
+++ b/sql/backends/monet5/iot/Makefile.in
@@ -14,7 +14,6 @@
@SET_MAKE@
-
VPATH = @srcdir@
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
@@ -132,12 +131,12 @@ am__uninstall_files_from_dir = { \
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
-am__installdirs = "$(DESTDIR)$(iotdir)" "$(DESTDIR)$(bindir)"
+am__installdirs = "$(DESTDIR)$(iotdir)"
LTLIBRARIES = $(iot_LTLIBRARIES)
lib_iot_la_DEPENDENCIES = ../../../../monetdb5/tools/libmonetdb5.la \
../../../../gdk/libbat.la
dist_lib_iot_la_OBJECTS = lib_iot_la-iot.lo lib_iot_la-basket.lo \
- lib_iot_la-receptor.lo lib_iot_la-petrinet.lo
+ lib_iot_la-petrinet.lo
nodist_lib_iot_la_OBJECTS =
lib_iot_la_OBJECTS = $(dist_lib_iot_la_OBJECTS) \
$(nodist_lib_iot_la_OBJECTS)
@@ -148,7 +147,6 @@ am__v_lt_1 =
lib_iot_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(lib_iot_la_CFLAGS) \
$(CFLAGS) $(lib_iot_la_LDFLAGS) $(LDFLAGS) -o $@
-SCRIPTS = $(bin_SCRIPTS)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -507,18 +505,17 @@ valgrind_LIBS = @valgrind_LIBS@
zlib_CFLAGS = @zlib_CFLAGS@
zlib_LIBS = @zlib_LIBS@
AUTOMAKE_OPTIONS = no-dependencies 1.4 foreign
-AM_CPPFLAGS = -I$(srcdir) -I.. -I$(srcdir)/.. -I../../../include
-I$(srcdir)/../../../include -I../../../common -I$(srcdir)/../../../common
-I../../../storage -I$(srcdir)/../../../storage -I../../../server
-I$(srcdir)/../../../server -I../../../../monetdb5/modules/atoms
-I$(srcdir)/../../../../monetdb5/modules/atoms
-I../../../../monetdb5/modules/kernel
-I$(srcdir)/../../../../monetdb5/modules/kernel -I../../../../monetdb5/mal
-I$(srcdir)/../../../../monetdb5/mal -I../../../../monetdb5/modules/mal
-I$(srcdir)/../../../../monetdb5/modules/mal -I../../../../monetdb5/optimizer
-I$(srcdir)/../../../../monetdb5/optimizer -I../../../../clients/mapilib
-I$(srcdir)/../../../../clients/mapilib -I../../../../common/options
-I$(srcdir)/../../../../common/options -I../../../../common/stream
-I$(srcdir)/../../../../common/stream -I../../../../gdk
-I$(srcdir)/../../../../gdk
+AM_CPPFLAGS = -I$(srcdir) -I.. -I$(srcdir)/.. -I../../../include
-I$(srcdir)/../../../include -I../../../common -I$(srcdir)/../../../common
-I../../../storage -I$(srcdir)/../../../storage -I../../../server
-I$(srcdir)/../../../server -I../../../../monetdb5/modules/atoms
-I$(srcdir)/../../../../monetdb5/modules/atoms
-I../../../../monetdb5/modules/kernel
-I$(srcdir)/../../../../monetdb5/modules/kernel -I../../../../monetdb5/mal
-I$(srcdir)/../../../../monetdb5/mal -I../../../../monetdb5/modules/mal
-I$(srcdir)/../../../../monetdb5/modules/mal -I../../../../monetdb5/optimizer
-I$(srcdir)/../../../../monetdb5/optimizer -I../../../../clients/mapilib
-I$(srcdir)/../../../../clients/mapilib -I../../../../common/options
-I$(srcdir)/../../../../common/options -I../../../../common/stream
-I$(srcdir)/../../../../common/stream -I../../../../common/utils
-I$(srcdir)/../../../../common/utils -I../../../../gdk
-I$(srcdir)/../../../../gdk
lib_iot_la_CFLAGS = -DLIBIOT $(AM_CFLAGS)
iotdir = $(libdir)/monetdb5
lib_iot_la_LIBADD = ../../../../monetdb5/tools/libmonetdb5.la
../../../../gdk/libbat.la
nodist_lib_iot_la_SOURCES =
-dist_lib_iot_la_SOURCES = iot.c basket.c receptor.c petrinet.c
+dist_lib_iot_la_SOURCES = iot.c basket.c petrinet.c
lib_iot_la_LDFLAGS = -module -avoid-version
-BUILT_SOURCES = 50_iot.sql basket.mal iot.mal petrinet.mal receptor.mal
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
