Automatic registration of FCB's reference

[frescor/forb.git] / src / Makefile.omk

diff --git a/src/Makefile.omk b/src/Makefile.omk
index d9d49feb5dfdfaf22673844c3def9c89a34e3ff3..9461a70aa83e75986c59a38a7fbab50f4544e149 100644 (file)
--- a/src/Makefile.omk
+++ b/src/Makefile.omk
@@ -7,7 +7,7 @@ CFLAGS += -I.
 shared_LIBRARIES += forb
 forb_SOURCES = forb.c cdr.c sha1.c uuid.c iop.c proto.c syncobj.c      \
               request.c executor.c object.c peer.c port.c refcnt.c     \
-              exec_req.c regref.c
+              exec_req.c regref.c discovery.c
 forb_CLIENT_IDL = types.idl iop-idl.idl forb-idl.idl
 forb_SERVER_IDL = forb-idl.idl
 
@@ -18,16 +18,24 @@ forb_SOURCES += proto_unix.c
 renamed_include_HEADERS += $(call to_forb_subdir, proto_unix.h) 
 endif
 
+# TODO: proto_inet should be a separate library as it should be used
+# only by FCB
+forb_SOURCES += proto_inet.c
+renamed_include_HEADERS += $(call to_forb_subdir, proto_inet.h) 
+
+
 include_HEADERS = forb.h
 renamed_include_HEADERS += \
        $(call to_forb_subdir, basic_types.h) \
        $(call to_forb_subdir, cdr.h) \
        $(call to_forb_subdir, cdr_codec.h) \
        $(call to_forb_subdir, executor.h) \
+       $(call to_forb_subdir, exec_req.h) \
        $(call to_forb_subdir, forb-internal.h) \
        $(call to_forb_subdir, iop.h) \
        $(call to_forb_subdir, object.h) \
        $(call to_forb_subdir, object_type.h) \
+       $(call to_forb_subdir, port.h) \
        $(call to_forb_subdir, refcnt.h) \
        $(call to_forb_subdir, request.h) \
        $(call to_forb_subdir, syncobj.h) \
@@ -40,17 +48,21 @@ renamed_include_GEN_HEADERS = \
        $(call to_forb_subdir,types.h)
 
 default_CONFIG = CONFIG_FORB_PROTO_UNIX=y \
-                CONFIG_FORB_RECV_BUF_SIZE=4096
+                CONFIG_FORB_RECV_BUF_SIZE=4096 \
+                CONFIG_FORB_PROTO_INET_DEFAULT=n
 
 config_include_HEADERS = forb/config.h
 config_DEFINES = CONFIG_FORB_PROTO_UNIX \
-                CONFIG_FORB_RECV_BUF_SIZE
+                CONFIG_FORB_RECV_BUF_SIZE \
+                CONFIG_FORB_PROTO_INET_DEFAULT \
+                CONFIG_FCB     # To see whether we are compiled with FRSH_FORB
 
 include-pass_HOOKS = log_domains.inc #request_gavl.inc
 
-log_domains.inc:
+log_domains.inc: $(addprefix $(SOURCES_DIR)/,ul_log_domains $(forb_SOURCES))
        @echo "  UL_LOG  $@"
-       $(Q)$(SOURCES_DIR)/ul_log_domains $(SOURCES_DIR) > $@
+       $(Q)$(SOURCES_DIR)/ul_log_domains --array forb_logreg_domains_array \
+               $(SOURCES_DIR) > $@
 
 clean-custom:
        -$(Q)rm log_domains.inc