env: cleaned directory structure up

Moved supplements for SDK to supplements directory.
Moved protobuf to src directory.

Change-Id: I77ba0f7b948b0befd06e1888d9d9846a10293f7d
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

diff --git a/tizen/src/Makefile b/tizen/src/Makefile
index 675ff44..87ec3b5 100644 (file)
--- a/tizen/src/Makefile
+++ b/tizen/src/Makefile
@@ -189,8 +189,8 @@ endif
 
 # Enable HW Virtualization on Linux
 ifdef CONFIG_LINUX
-       cp -pP ../distrib/initscript/tizen-kvm $(EMUL_DIR)/etc
-       cp -pP ../distrib/initscript/45-tizen-kvm.rules $(EMUL_DIR)/etc
+       cp -pP ../supplements/SDK/tizen-kvm $(EMUL_DIR)/etc
+       cp -pP ../supplements/SDK/45-tizen-kvm.rules $(EMUL_DIR)/etc
 endif
 
 # check HW Virtualization on Windows and MAC OS X.
@@ -275,17 +275,15 @@ ifdef CONFIG_USE_SHM
 endif
 endif
 
-# check capabilities of OpenGL, Webcam and net
-       cp -pP util/check-net$(EXESUF) $(DIBS_COMMON_DIR)/bin
+# check capabilities of OpenGL, Webcam and proxy
        cp -pP util/check-gl$(EXESUF) $(DIBS_COMMON_DIR)/bin
        cp -pP util/check-cam$(EXESUF) $(DIBS_COMMON_DIR)/bin
-
+       cp -pP util/check-net$(EXESUF) $(DIBS_COMMON_DIR)/bin
 
 # Enable HW Virtualization on Linux
 ifdef CONFIG_LINUX
-       echo "Copying tizen-kvm to $(DIBS_X86_DIR)/etc"
-       cp -pP ../distrib/initscript/tizen-kvm $(DIBS_X86_DIR)/etc
-       cp -pP ../distrib/initscript/45-tizen-kvm.rules $(DIBS_X86_DIR)/etc
+       cp -pP ../supplements/SDK/tizen-kvm $(DIBS_X86_DIR)/etc
+       cp -pP ../supplements/SDK/45-tizen-kvm.rules $(DIBS_X86_DIR)/etc
 endif
 
 # check HW Virtualization on Windows and MAC OS X.

diff --git a/tizen/distrib/protobuf/protobuf-c-private.h b/tizen/src/distrib/protobuf/protobuf-c-private.h
similarity index 100%
rename from tizen/distrib/protobuf/protobuf-c-private.h
rename to tizen/src/distrib/protobuf/protobuf-c-private.h

diff --git a/tizen/distrib/protobuf/protobuf-c.c b/tizen/src/distrib/protobuf/protobuf-c.c
similarity index 100%
rename from tizen/distrib/protobuf/protobuf-c.c
rename to tizen/src/distrib/protobuf/protobuf-c.c

diff --git a/tizen/distrib/protobuf/protobuf-c.h b/tizen/src/distrib/protobuf/protobuf-c.h
similarity index 100%
rename from tizen/distrib/protobuf/protobuf-c.h
rename to tizen/src/distrib/protobuf/protobuf-c.h

diff --git a/tizen/src/ecs/Makefile.objs b/tizen/src/ecs/Makefile.objs
index 5f58026..e5fb63d 100644 (file)
--- a/tizen/src/ecs/Makefile.objs
+++ b/tizen/src/ecs/Makefile.objs
@@ -1,4 +1,4 @@
-obj-y += genmsg/ecs.pb-c.o genmsg/ecs_ids.pb-c.o ../../distrib/protobuf/protobuf-c.o
+obj-y += genmsg/ecs.pb-c.o genmsg/ecs_ids.pb-c.o ../distrib/protobuf/protobuf-c.o
 obj-y += ecs.o ecs_msg.o ecs_msg_injector.o ecs_msg_device.o
 obj-y += ecs_mon.o ecs-json-streamer.o
 obj-y += ecs_eventcast.o

diff --git a/tizen/src/ecs/genmsg/ecs.pb-c.h b/tizen/src/ecs/genmsg/ecs.pb-c.h
index 2b97f86..2dfba74 100644 (file)
--- a/tizen/src/ecs/genmsg/ecs.pb-c.h
+++ b/tizen/src/ecs/genmsg/ecs.pb-c.h
@@ -3,7 +3,7 @@
 #ifndef PROTOBUF_C_ecs_2eproto__INCLUDED
 #define PROTOBUF_C_ecs_2eproto__INCLUDED
 
-#include "../../../distrib/protobuf/protobuf-c.h"
+#include "../../distrib/protobuf/protobuf-c.h"
 
 PROTOBUF_C_BEGIN_DECLS
 

diff --git a/tizen/src/ecs/genmsg/ecs_ids.pb-c.h b/tizen/src/ecs/genmsg/ecs_ids.pb-c.h
index b855d79..d81fc0a 100644 (file)
--- a/tizen/src/ecs/genmsg/ecs_ids.pb-c.h
+++ b/tizen/src/ecs/genmsg/ecs_ids.pb-c.h
@@ -3,7 +3,7 @@
 #ifndef PROTOBUF_C_ecs_5fids_2eproto__INCLUDED
 #define PROTOBUF_C_ecs_5fids_2eproto__INCLUDED
 
-#include "../../../distrib/protobuf/protobuf-c.h"
+#include "../../distrib/protobuf/protobuf-c.h"
 
 PROTOBUF_C_BEGIN_DECLS
 

diff --git a/tizen/src/eventcast/genmsg/eventcast.pb-c.h b/tizen/src/eventcast/genmsg/eventcast.pb-c.h
index 6d78492..e446a55 100644 (file)
--- a/tizen/src/eventcast/genmsg/eventcast.pb-c.h
+++ b/tizen/src/eventcast/genmsg/eventcast.pb-c.h
@@ -3,7 +3,7 @@
 #ifndef PROTOBUF_C_eventcast_2eproto__INCLUDED
 #define PROTOBUF_C_eventcast_2eproto__INCLUDED
 
-#include "../../../distrib/protobuf/protobuf-c.h"
+#include "../../distrib/protobuf/protobuf-c.h"
 
 PROTOBUF_C_BEGIN_DECLS
 

diff --git a/tizen/distrib/initscript/45-tizen-kvm.rules b/tizen/supplements/SDK/45-tizen-kvm.rules
similarity index 100%
rename from tizen/distrib/initscript/45-tizen-kvm.rules
rename to tizen/supplements/SDK/45-tizen-kvm.rules

diff --git a/tizen/distrib/initscript/tizen-kvm b/tizen/supplements/SDK/tizen-kvm
similarity index 100%
rename from tizen/distrib/initscript/tizen-kvm
rename to tizen/supplements/SDK/tizen-kvm