Split to multiple directories

diff --git a/Makefile.omk b/Makefile.omk
index d443c94c5dd35bf096dd73cc8e7cfc1406212427..b9e000acc344c8782d5dd38e1eed56ce7e1be794 100644 (file)
--- a/Makefile.omk
+++ b/Makefile.omk
@@ -1,15 +1,2 @@
 default_CONFIG = CONFIG_FRSH_FORB=y
-
-ifeq ($(CONFIG_FRSH_FORB),y)
-
-SUBDIRS=tests
-
-shared_LIBRARIES = frsh
-
-frsh_SOURCES = forb_contract.c frsh_contract.c
-frsh_CLIENT_IDL = forb_contract_idl.idl
-
-include_HEADERS = forb_contract.h frsh_opaque_types.h idl_native.h
-
-include_GEN_HEADERS = forb_contract_idl.h
-endif
+SUBDIRS=$(ALL_OMK_SUBDIRS)

diff --git a/tests/Makefile b/cm/Makefile
similarity index 100%
rename from tests/Makefile
rename to cm/Makefile

diff --git a/cm/Makefile.omk b/cm/Makefile.omk
new file mode 100644 (file)
index 0000000..f4b0738
--- /dev/null
+++ b/cm/Makefile.omk
@@ -0,0 +1,9 @@
+shared_LIBRARIES = cm
+
+cm_SOURCES = forb_contract.c
+cm_CLIENT_IDL = forb_contract_idl.idl
+
+include_HEADERS = forb_contract.h forb_contract_internal.h idl_native.h
+include_GEN_HEADERS = forb_contract_idl.h
+
+SUBDIRS=$(ALL_OMK_SUBDIRS)

diff --git a/forb_contract.c b/cm/forb_contract.c
similarity index 100%
rename from forb_contract.c
rename to cm/forb_contract.c

diff --git a/forb_contract.h b/cm/forb_contract.h
similarity index 100%
rename from forb_contract.h
rename to cm/forb_contract.h

diff --git a/forb_contract_idl.idl b/cm/forb_contract_idl.idl
similarity index 100%
rename from forb_contract_idl.idl
rename to cm/forb_contract_idl.idl

diff --git a/forb_contract_internal.h b/cm/forb_contract_internal.h
similarity index 100%
rename from forb_contract_internal.h
rename to cm/forb_contract_internal.h

diff --git a/idl_native.h b/cm/idl_native.h
similarity index 68%
rename from idl_native.h
rename to cm/idl_native.h
index b2618951cc893c37ca8ff543a7b1d019eb8d33fc..bddcd6545b729880933f72432763ec666a9bbf13 100644 (file)
--- a/idl_native.h
+++ b/cm/idl_native.h
@@ -1,8 +1,6 @@
 #ifndef _IDL_NATIVE_H
 #define _IDL_NATIVE_H
 
-/* /\* FIXME: time.h should be included in fosa_opaque_types.h *\/ */
-/* #include <time.h>           /\* We need struct timespec *\/ */
 #include <fosa.h>
 
 #define fosa_rel_time_t_serialize(a,b) CORBA_FALSE

diff --git a/cm/tests/Makefile b/cm/tests/Makefile
new file mode 100644 (file)
index 0000000..b22a357
--- /dev/null
+++ b/cm/tests/Makefile
@@ -0,0 +1,14 @@
+# Generic directory or leaf node makefile for OCERA make framework
+
+ifndef MAKERULES_DIR
+MAKERULES_DIR := $(shell ( old_pwd="" ;  while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd`  ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) )
+endif
+
+ifeq ($(MAKERULES_DIR),)
+all : default
+.DEFAULT::
+       @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n"
+else
+include $(MAKERULES_DIR)/Makefile.rules
+endif
+

diff --git a/tests/Makefile.omk b/cm/tests/Makefile.omk
similarity index 72%
rename from tests/Makefile.omk
rename to cm/tests/Makefile.omk
index 0715edc8e19f159d212c1644b0a1574f82f256d2..a68574bf4ed5538f8f62a590c530f23251ac412d 100644 (file)
--- a/tests/Makefile.omk
+++ b/cm/tests/Makefile.omk
@@ -2,5 +2,5 @@ test_PROGRAMS:=$(basename $(notdir $(wildcard $(SOURCES_DIR)/*.c)))
 
 $(foreach t,$(test_PROGRAMS),\
 $(eval $(t)_SOURCES = $(t).c)\
-$(eval $(t)_LIBS = fosa m frsh utils rt forb)\
+$(eval $(t)_LIBS = fosa m cm frsh utils rt forb)\
 )

diff --git a/tests/contract.c b/cm/tests/contract.c
similarity index 100%
rename from tests/contract.c
rename to cm/tests/contract.c

diff --git a/frsh_api/Makefile b/frsh_api/Makefile
new file mode 100644 (file)
index 0000000..b22a357
--- /dev/null
+++ b/frsh_api/Makefile
@@ -0,0 +1,14 @@
+# Generic directory or leaf node makefile for OCERA make framework
+
+ifndef MAKERULES_DIR
+MAKERULES_DIR := $(shell ( old_pwd="" ;  while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd`  ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) )
+endif
+
+ifeq ($(MAKERULES_DIR),)
+all : default
+.DEFAULT::
+       @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n"
+else
+include $(MAKERULES_DIR)/Makefile.rules
+endif
+

diff --git a/frsh_api/Makefile.omk b/frsh_api/Makefile.omk
new file mode 100644 (file)
index 0000000..1273fa5
--- /dev/null
+++ b/frsh_api/Makefile.omk
@@ -0,0 +1,4 @@
+shared_LIBRARIES = frsh
+frsh_SOURCES = frsh_contract.c
+include_HEADERS = frsh_opaque_types.h
+

diff --git a/frsh_contract.c b/frsh_api/frsh_contract.c
similarity index 100%
rename from frsh_contract.c
rename to frsh_api/frsh_contract.c

diff --git a/frsh_opaque_types.h b/frsh_api/frsh_opaque_types.h
similarity index 98%
rename from frsh_opaque_types.h
rename to frsh_api/frsh_opaque_types.h
index 769dc7e7d145f72d7cc9943067af45778935eb25..9c344756e5b93d24de9868327c160e390762732b 100644 (file)
--- a/frsh_opaque_types.h
+++ b/frsh_api/frsh_opaque_types.h
@@ -66,6 +66,10 @@
 // FRSH(FRescor ScHeduler), pronounced "fresh"
 //==============================================
 
+#ifdef FRSH_CORE_TYPES_H_
+#define frsh_vres_id_t frsh_vres_id_t_old
+#endif
+
 // Implementation dependent definitions
 #ifndef _FRSH_OPAQUE_TYPES_H_
 #define _FRSH_OPAQUE_TYPES_H_