SUBDIRS = $(ALL_OMK_SUBDIRS)
-test_PROGRAMS = hello_inproc hello_remote proto_unix discovery syncobj regobjref
-CFLAGS += -DTEST
+wvtest_PROGRAMS += hello_inproc test_proto_inet discovery syncobj regobjref
+
+test_PROGRAMS += hello_remote executor_id #executor_calls
+ifeq ($(CONFIG_FORB_PROTO_UNIX),y)
+wvtest_PROGRAMS += test_proto_unix
+endif
+
+wvtest_PROGRAMS += sequence
+sequence_SOURCES = sequence.c
+sequence_CLIENT_IDL = sequence.idl
+sequence_LIBS = wvtest
+
+CFLAGS += -DTEST -DWVTEST_CONFIGURED
+INCLUDES += -I.
lib_LOADLIBES = forb ulut fosa rt
# hello_server_SOURCES = hello_server.c
# hello_inproc_SERVER_IDL = hello.idl
-proto_unix_SOURCES = proto_unix.c
+test_proto_unix_SOURCES = test_proto_unix.c
+test_proto_inet_SOURCES = test_proto_inet.c
discovery_SOURCES = discovery.c
syncobj_SOURCES = test_syncobj.c
+
+executor_id_SOURCES = executor_id.c
+
+executor_calls_SOURCES = executor_calls.c