[4.0] Modified configuration of folder and build

Change-Id: I62b1f54f9fcbe689c2893fb2f2d7d26569825c81

diff --git a/build/tizen/Makefile.am b/build/tizen/Makefile.am
index 228a26b..587ad5a 100644 (file)
--- a/build/tizen/Makefile.am
+++ b/build/tizen/Makefile.am
@@ -14,67 +14,7 @@
 # limitations under the License.
 #
 
-# Build the Dali feedback plugin
+SUBDIRS = ${subdirs}
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = dali-extension.pc
-
-extension_src_dir = ../../dali-extension
-
-include ../../dali-extension/file.list
-
-lib_LTLIBRARIES =
-
-if USE_KEY_EXTENSION
-lib_LTLIBRARIES += libdali-key-extension.la
-endif
-
-lib_LTLIBRARIES += libdali-video-player-plugin.la
-
-# key extension
-libdali_key_extension_la_SOURCES = \
-                       $(key_extension_src_files)
-libdali_key_extension_la_DEPENDENCIES =
-
-libdali_key_extension_la_CXXFLAGS =
-                       $(DLOG_CFLAGS) \
-                       $(DALI_CFLAGS) \
-                       -I../../dali-extension/ \
-                       -Werror -Wall
-
-libdali_key_extension_la_LIBADD = \
-                       $(DLOG_LIBS)
-
-libdali_key_extension_la_LDFLAGS = \
-                       -rdynamic
-
-libdali_key_extensiondir = $(devincludepath)/dali-extension/
-
-libdali_key_extension_HEADERS = $(key_extension_header_files)
-
-# Todo Video player plugin separation
-libdali_video_player_plugin_la_SOURCES = \
-                     $(video_player_plugin_src_files)
-
-libdali_video_player_plugin_la_DEPENDENCIES =
-
-libdali_video_player_plugin_la_CXXFLAGS = -DDALI_COMPILATION \
-                      -DDALI_ADAPTOR_COMPILATION \
-                      $(DLOG_CFLAGS) \
-                      $(DALI_CFLAGS) \
-                      $(ECORE_WAYLAND_CFLAGS) \
-                      $(CAPI_MEDIA_PLAYER_CFLAGS) \
-                      $(CAPI_SYSTEM_INFO_CFLAGS) \
-                      -I../../dali-extension/video-player \
-                      -Werror -Wall
-
-libdali_video_player_plugin_la_LIBADD = \
-                      $(DLOG_LIBS) \
-                      $(DALI_LIBS) \
-                      $(ECORE_WAYLAND_LIBS) \
-                      $(CAPI_MEDIA_PLAYER_LIBS) \
-                      $(CAPI_SYSTEM_INFO_LIBS)
-
-libdali_video_player_plugin_la_LDFLAGS = \
-                      -rdynamic
-

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index 0adc7d4..3d1e334 100644 (file)
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -14,23 +14,10 @@ LT_INIT
 DALI_EXTENSION_VERSION=dali_version
 AC_SUBST(DALI_EXTENSION_VERSION)
 
-AC_ARG_ENABLE([keyextension],
-              [AC_HELP_STRING([--enable-keyextension],
-              [enables the key extension of all the symbols in the library])],
-              [enable_keyextension=yes],
-              [enable_keyextension=no])
-
-AM_CONDITIONAL([USE_KEY_EXTENSION], [test x$enable_keyextension = xyes])
-
 PKG_CHECK_MODULES([DALI], [dali-core dali-adaptor dali-toolkit])
 
-# ToDO Videoplayer plugin separation
-PKG_CHECK_MODULES(CAPI_MEDIA_PLAYER, capi-media-player)
-PKG_CHECK_MODULES(ECORE_WAYLAND, ecore-wayland)
-PKG_CHECK_MODULES(CAPI_SYSTEM_INFO, capi-system-info)
-
-devincludepath=${includedir}
-AC_SUBST(devincludepath)
+AC_CONFIG_SUBDIRS(key)
+AC_CONFIG_SUBDIRS(video-player)
 
 AC_CONFIG_FILES([
 Makefile

diff --git a/build/tizen/key/Makefile.am b/build/tizen/key/Makefile.am
new file mode 100644 (file)
index 0000000..a479f43
--- /dev/null
+++ b/build/tizen/key/Makefile.am
@@ -0,0 +1,48 @@
+#
+# Copyright (c) 2015 Samsung Electronics Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Build the Dali feedback plugin
+
+extension_src_dir = ../../../dali-extension
+
+include ../../../dali-extension/key/file.list
+include ../../../dali-extension/integration-api/file.list
+
+lib_LTLIBRARIES =
+
+lib_LTLIBRARIES += libdali-key-extension.la
+
+# key extension
+libdali_key_extension_la_SOURCES = \
+                       $(key_extension_src_files)
+
+libdali_key_extension_la_DEPENDENCIES =
+
+libdali_key_extension_la_CXXFLAGS = \
+                       -I../../../dali-extension/ \
+                       -I../../../dali-extension/integration-api \
+                       $(DLOG_CFLAGS) \
+                       $(DALI_CFLAGS) \
+                       -Werror -Wall
+
+libdali_key_extension_la_LIBADD = \
+                       $(DLOG_LIBS)
+
+libdali_key_extension_la_LDFLAGS = \
+                       -rdynamic
+
+libdali_key_extensiondir = $(devincludepath)/dali-extension/integration-api
+libdali_key_extension_HEADERS = $(key_extension_header_files)

diff --git a/build/tizen/key/configure.ac b/build/tizen/key/configure.ac
new file mode 100644 (file)
index 0000000..4fac011
--- /dev/null
+++ b/build/tizen/key/configure.ac
@@ -0,0 +1,32 @@
+4_define([dali_version],[0.1.0])
+AC_INIT([dali], [dali_version])
+AM_INIT_AUTOMAKE([-Wall foreign])
+
+AC_CONFIG_MACRO_DIR([m4])
+
+AC_PROG_CXX
+AC_PROG_LIBTOOL
+
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+LT_INIT
+
+DALI_EXTENSION_VERSION=dali_version
+AC_SUBST(DALI_EXTENSION_VERSION)
+
+AC_ARG_ENABLE([keyextension],
+              [AC_HELP_STRING([--enable-keyextension],
+              [enables the key extension of all the symbols in the library])],
+              [enable_keyextension=yes],
+              [enable_keyextension=no])
+
+AM_CONDITIONAL([USE_KEY_EXTENSION], [test x$enable_keyextension = xyes])
+
+devincludepath=${includedir}
+AC_SUBST(devincludepath)
+
+AC_CONFIG_FILES([
+Makefile
+])
+
+AC_OUTPUT

diff --git a/build/tizen/video-player/Makefile.am b/build/tizen/video-player/Makefile.am
new file mode 100644 (file)
index 0000000..6e7f133
--- /dev/null
+++ b/build/tizen/video-player/Makefile.am
@@ -0,0 +1,52 @@
+#
+# Copyright (c) 2015 Samsung Electronics Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Build the Dali feedback plugin
+
+extension_src_dir = ../../../dali-extension
+
+include ../../../dali-extension/video-player/file.list
+
+lib_LTLIBRARIES =
+
+lib_LTLIBRARIES += libdali-video-player-plugin.la
+
+# Todo Video player plugin separation
+libdali_video_player_plugin_la_SOURCES = \
+                     $(video_player_plugin_src_files)
+
+libdali_video_player_plugin_la_DEPENDENCIES =
+
+libdali_video_player_plugin_la_CXXFLAGS = -DDALI_COMPILATION \
+                      -DDALI_ADAPTOR_COMPILATION \
+                      $(DLOG_CFLAGS) \
+                      $(DALI_CFLAGS) \
+                      $(ECORE_WAYLAND_CFLAGS) \
+                      $(CAPI_MEDIA_PLAYER_CFLAGS) \
+                      $(CAPI_SYSTEM_INFO_CFLAGS) \
+                      -I../../../dali-extension/video-player \
+                      -Werror -Wall
+
+libdali_video_player_plugin_la_LIBADD = \
+                      $(DLOG_LIBS) \
+                      $(DALI_LIBS) \
+                      $(ECORE_WAYLAND_LIBS) \
+                      $(CAPI_MEDIA_PLAYER_LIBS) \
+                      $(CAPI_SYSTEM_INFO_LIBS)
+
+libdali_video_player_plugin_la_LDFLAGS = \
+                      -rdynamic
+

diff --git a/build/tizen/video-player/configure.ac b/build/tizen/video-player/configure.ac
new file mode 100644 (file)
index 0000000..4d1a899
--- /dev/null
+++ b/build/tizen/video-player/configure.ac
@@ -0,0 +1,28 @@
+4_define([dali_version],[0.1.0])
+AC_INIT([dali], [dali_version])
+AM_INIT_AUTOMAKE([-Wall foreign])
+
+AC_CONFIG_MACRO_DIR([m4])
+
+AC_PROG_CXX
+AC_PROG_LIBTOOL
+
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+LT_INIT
+
+DALI_EXTENSION_VERSION=dali_version
+AC_SUBST(DALI_EXTENSION_VERSION)
+
+PKG_CHECK_MODULES(CAPI_MEDIA_PLAYER, capi-media-player)
+PKG_CHECK_MODULES(ECORE_WAYLAND, ecore-wayland)
+PKG_CHECK_MODULES(CAPI_SYSTEM_INFO, capi-system-info)
+
+devincludepath=${includedir}
+AC_SUBST(devincludepath)
+
+AC_CONFIG_FILES([
+Makefile
+])
+
+AC_OUTPUT

diff --git a/dali-extension/file.list b/dali-extension/file.list
deleted file mode 100644 (file)
index 621a5bc..0000000
--- a/dali-extension/file.list
+++ /dev/null
@@ -1,8 +0,0 @@
-key_extension_src_files = \
-   $(extension_src_dir)/key/key-extension.cpp
-
-key_extension_header_files = \
-   $(extension_src_dir)/key/key-extension.h
-
-video_player_plugin_src_files = \
-   $(extension_src_dir)/video-player/tizen-video-player.cpp

diff --git a/dali-extension/integration-api/file.list b/dali-extension/integration-api/file.list
new file mode 100644 (file)
index 0000000..2b6c6af
--- /dev/null
+++ b/dali-extension/integration-api/file.list
@@ -0,0 +1,2 @@
+key_extension_header_files = \
+   $(extension_src_dir)/integration-api/key-extension.h

diff --git a/dali-extension/key/key-extension.h b/dali-extension/integration-api/key-extension.h
similarity index 100%
rename from dali-extension/key/key-extension.h
rename to dali-extension/integration-api/key-extension.h

diff --git a/dali-extension/key/file.list b/dali-extension/key/file.list
new file mode 100644 (file)
index 0000000..1122fa8
--- /dev/null
+++ b/dali-extension/key/file.list
@@ -0,0 +1,2 @@
+key_extension_src_files = \
+   $(extension_src_dir)/key/key-extension.cpp

diff --git a/dali-extension/key/key-extension.cpp b/dali-extension/key/key-extension.cpp
index f084ee0..fbf64a2 100644 (file)
--- a/dali-extension/key/key-extension.cpp
+++ b/dali-extension/key/key-extension.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include "key-extension.h"
+#include <integration-api/key-extension.h>
 
 
 // The plugin factories

diff --git a/dali-extension/video-player/file.list b/dali-extension/video-player/file.list
new file mode 100644 (file)
index 0000000..b0d2f03
--- /dev/null
+++ b/dali-extension/video-player/file.list
@@ -0,0 +1,2 @@
+video_player_plugin_src_files = \
+   $(extension_src_dir)/video-player/tizen-video-player.cpp