Spliting lib into core and mngt

diff --git a/fwp/Makefile.omk b/fwp/Makefile.omk
index 1ae38aafce6fa8aeea1f8f58cb5cf11953857e8b..5458b516984fdbee5e611043d2039a7552c464ba 100644 (file)
--- a/fwp/Makefile.omk
+++ b/fwp/Makefile.omk
@@ -1,2 +1,2 @@
 #SUBDIRS = $(ALL_OMK_SUBDIRS)
-SUBDIRS = ulut lib mngt mngr 
+SUBDIRS = ulut lib 

diff --git a/fwp/lib/Makefile.omk b/fwp/lib/Makefile.omk
deleted file mode 100644 (file)
index d92543e..0000000
--- a/fwp/lib/Makefile.omk
+++ /dev/null
@@ -1,10 +0,0 @@
-lib_LIBRARIES = fwp
-CFLAGS = -Wall -D_REENTRANT -g
-#LDFLAGS = -lpthread  -lrt
-fwp_SOURCES = fwp_util.c fwp_vres.c fwp_msgb.c fwp_msgq.c\
-             fwp_endpoint.c
-
-include_HEADERS=  fwp_vres.h fwp_msgb.h fwp_msgq.h \
-                 fwp_conf.h  fwp_util.h fwp_endpoint.h fwp.h 
-
-#lib_LOADLIBES+= pthread rt

diff --git a/fwp/lib/Makefile b/fwp/lib/core/Makefile
similarity index 100%
rename from fwp/lib/Makefile
rename to fwp/lib/core/Makefile

diff --git a/fwp/lib/core/Makefile.omk b/fwp/lib/core/Makefile.omk
new file mode 100644 (file)
index 0000000..11457d9
--- /dev/null
+++ b/fwp/lib/core/Makefile.omk
@@ -0,0 +1,10 @@
+#lib_LIBRARIES = fwp
+#CFLAGS = -Wall -D_REENTRANT -g
+#LDFLAGS = -lpthread  -lrt
+#fwp_SOURCES = fwp_util.c fwp_vres.c fwp_msgb.c fwp_msgq.c\
+             fwp_endpoint.c
+
+include_HEADERS=  fwp_vres.h fwp_msgb.h fwp_msgq.h \
+                 fwp_conf.h  fwp_util.h fwp_endpoint.h 
+
+#lib_LOADLIBES+= pthread rt

diff --git a/fwp/lib/fwp_conf.h b/fwp/lib/core/fwp_conf.h
similarity index 100%
rename from fwp/lib/fwp_conf.h
rename to fwp/lib/core/fwp_conf.h

diff --git a/fwp/lib/fwp_endpoint.c b/fwp/lib/core/fwp_endpoint.c
similarity index 100%
rename from fwp/lib/fwp_endpoint.c
rename to fwp/lib/core/fwp_endpoint.c

diff --git a/fwp/lib/fwp_endpoint.h b/fwp/lib/core/fwp_endpoint.h
similarity index 100%
rename from fwp/lib/fwp_endpoint.h
rename to fwp/lib/core/fwp_endpoint.h

diff --git a/fwp/lib/fwp_msgb.c b/fwp/lib/core/fwp_msgb.c
similarity index 100%
rename from fwp/lib/fwp_msgb.c
rename to fwp/lib/core/fwp_msgb.c

diff --git a/fwp/lib/fwp_msgb.h b/fwp/lib/core/fwp_msgb.h
similarity index 100%
rename from fwp/lib/fwp_msgb.h
rename to fwp/lib/core/fwp_msgb.h

diff --git a/fwp/lib/fwp_msgq.c b/fwp/lib/core/fwp_msgq.c
similarity index 100%
rename from fwp/lib/fwp_msgq.c
rename to fwp/lib/core/fwp_msgq.c

diff --git a/fwp/lib/fwp_msgq.h b/fwp/lib/core/fwp_msgq.h
similarity index 100%
rename from fwp/lib/fwp_msgq.h
rename to fwp/lib/core/fwp_msgq.h

diff --git a/fwp/lib/fwp_types.h b/fwp/lib/core/fwp_types.h
similarity index 100%
rename from fwp/lib/fwp_types.h
rename to fwp/lib/core/fwp_types.h

diff --git a/fwp/lib/fwp_util.c b/fwp/lib/core/fwp_util.c
similarity index 100%
rename from fwp/lib/fwp_util.c
rename to fwp/lib/core/fwp_util.c

diff --git a/fwp/lib/fwp_util.h b/fwp/lib/core/fwp_util.h
similarity index 100%
rename from fwp/lib/fwp_util.h
rename to fwp/lib/core/fwp_util.h

diff --git a/fwp/lib/fwp_vres.c b/fwp/lib/core/fwp_vres.c
similarity index 100%
rename from fwp/lib/fwp_vres.c
rename to fwp/lib/core/fwp_vres.c

diff --git a/fwp/lib/fwp_vres.h b/fwp/lib/core/fwp_vres.h
similarity index 100%
rename from fwp/lib/fwp_vres.h
rename to fwp/lib/core/fwp_vres.h

diff --git a/fwp/lib/fwp.h b/fwp/lib/fwp.h
index 223fcfc7dd78cf3cb4ad7e66824e96df0304c69a..eb2b862b545c6f54832e4ac8487c9248a6a8f8d2 100644 (file)
--- a/fwp/lib/fwp.h
+++ b/fwp/lib/fwp.h
@@ -3,8 +3,7 @@
 
 #include "fwp_conf.h"
 #include "fwp_endpoint.h"
-#include "fwp_contract.h"
-#include "fwp_comm.h"
+#include "fwp_mngt.h"
 
 /**
  * FWP initialisation
@@ -22,7 +21,7 @@ static inline int fwp_init()
 
        if ((rv = fwp_endpoint_table_init(FWP_EPOINT_MAX)) ||
            (rv = fwp_vres_table_init(FWP_VRES_MAX)) ||
-           (rv = fwp_comm_init())) 
+           (rv = fwp_mngt_init())) 
                return rv;
        return 0;
 }

diff --git a/fwp/mngt/Makefile b/fwp/lib/mngt/Makefile
similarity index 100%
rename from fwp/mngt/Makefile
rename to fwp/lib/mngt/Makefile

diff --git a/fwp/mngt/Makefile.omk b/fwp/lib/mngt/Makefile.omk
similarity index 50%
rename from fwp/mngt/Makefile.omk
rename to fwp/lib/mngt/Makefile.omk
index 2af80612cdd8ad64d20a48471dceaa71441e90cb..8ec1b8d27b14504749f8acab0fd4b8e2dccdf881 100644 (file)
--- a/fwp/mngt/Makefile.omk
+++ b/fwp/lib/mngt/Makefile.omk
@@ -1,9 +1,9 @@
-lib_LIBRARIES = fwpmngt
-CFLAGS = -Wall -D_REENTRANT -g
+#lib_LIBRARIES = fwpmngt
+#CFLAGS = -Wall -D_REENTRANT -g
 #LDFLAGS = -lpthread  -lrt
-fwpmngt_SOURCES = fwp_msg.c fwp_mngt.c  
+#fwpmngt_SOURCES = fwp_msg.c fwp_mngt.c  
 
 include_HEADERS= fwp_msg.h fwp_participant.h fwp_contract.h fwp_mngt.h 
 
-lib_LOADLIBES+= fwp ulut
+#lib_LOADLIBES+= fwp ulut
 #lib_LOADLIBES+= pthread rt

diff --git a/fwp/mngt/fwp_contract.c b/fwp/lib/mngt/fwp_contract.c
similarity index 100%
rename from fwp/mngt/fwp_contract.c
rename to fwp/lib/mngt/fwp_contract.c

diff --git a/fwp/mngt/fwp_contract.h b/fwp/lib/mngt/fwp_contract.h
similarity index 100%
rename from fwp/mngt/fwp_contract.h
rename to fwp/lib/mngt/fwp_contract.h

diff --git a/fwp/mngt/fwp_contract_table.c b/fwp/lib/mngt/fwp_contract_table.c
similarity index 100%
rename from fwp/mngt/fwp_contract_table.c
rename to fwp/lib/mngt/fwp_contract_table.c

diff --git a/fwp/mngt/fwp_contract_table.h b/fwp/lib/mngt/fwp_contract_table.h
similarity index 100%
rename from fwp/mngt/fwp_contract_table.h
rename to fwp/lib/mngt/fwp_contract_table.h

diff --git a/fwp/mngt/fwp_mngt.c b/fwp/lib/mngt/fwp_mngt.c
similarity index 100%
rename from fwp/mngt/fwp_mngt.c
rename to fwp/lib/mngt/fwp_mngt.c

diff --git a/fwp/mngt/fwp_mngt.h b/fwp/lib/mngt/fwp_mngt.h
similarity index 91%
rename from fwp/mngt/fwp_mngt.h
rename to fwp/lib/mngt/fwp_mngt.h
index 8c7654039d1179775d3cadb7ada1704e55837d48..4dd254fb33770c0b794141f6323c0efe6cc50156 100644 (file)
--- a/fwp/mngt/fwp_mngt.h
+++ b/fwp/lib/mngt/fwp_mngt.h
@@ -8,11 +8,6 @@
 #include "fwp_endpoint.h"
 
 #define FWP_MNGR_STREAM_ID     3000
-
-
-typedef int tr_id_t;
-
-
 #define FWP_MNGT_DISCOVERY_STREAM_ID   3000
 
 int fwp_mngt_init();

diff --git a/fwp/mngt/fwp_msg.c b/fwp/lib/mngt/fwp_msg.c
similarity index 100%
rename from fwp/mngt/fwp_msg.c
rename to fwp/lib/mngt/fwp_msg.c

diff --git a/fwp/mngt/fwp_msg.h b/fwp/lib/mngt/fwp_msg.h
similarity index 100%
rename from fwp/mngt/fwp_msg.h
rename to fwp/lib/mngt/fwp_msg.h

diff --git a/fwp/mngt/fwp_participant.h b/fwp/lib/mngt/fwp_participant.h
similarity index 100%
rename from fwp/mngt/fwp_participant.h
rename to fwp/lib/mngt/fwp_participant.h