X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=build%2Ftizen%2FMakefile.am;h=164911298f98f6cc85c0fd768f79658d36f50804;hp=a672053339cfb889f3fe4181695a954e5c8dd1d2;hb=d529fa16df49f5647f399854fff14f651dbbc835;hpb=f5cb40c6bbbf566541637d09126e1f3c1984de89

diff --git a/build/tizen/Makefile.am b/build/tizen/Makefile.am
old mode 100644
new mode 100755
index a672053..1649112
--- a/build/tizen/Makefile.am
+++ b/build/tizen/Makefile.am
@@ -17,13 +17,18 @@
 SUBDIRS = dali-toolkit
 
 if ENABLE_JAVASCRIPT_PLUGIN
-SUBDIRS +=plugins
+SUBDIRS +=plugins/javascript
+endif
+
+if ENABLE_CSHARP_PLUGIN
+SUBDIRS +=plugins/csharp
 endif
 
 # perform documentation last, so it doesn't prevent code from building if there's an error
 SUBDIRS += docs
 
 pkgconfigdir = $(libdir)/pkgconfig
+
 pkgconfig_DATA = dali-toolkit.pc
 
 MAINTAINERCLEANFILES = \
@@ -48,12 +53,14 @@ COVERAGE_OUTPUT_DIR=doc/coverage
 # From lcov version 1.10 onwards, branch coverage is off by default and earlier versions do not support the rc option
 LCOV_OPTS=`if [ \`printf "\\\`lcov --version | cut -d' ' -f4\\\`\n1.10\n" | sort -V | head -n 1\` = 1.10 ] ; then echo "--rc lcov_branch_coverage=1" ; fi`
 
-cov_data:
+rename_cov_data:
 	@test -z $(COVERAGE_DIR) || mkdir -p $(COVERAGE_DIR)
 	@rm -f $(COVERAGE_DIR)/*
 	@cp dali-toolkit/.libs/*.gcda dali-toolkit/.libs/*.gcno  $(COVERAGE_DIR)
-	@for i in `find $(COVERAGE_DIR) -name "libdali_toolkit_la-*.gcda" -o -name "libdali_toolkit_la-*.gcno"` ;\
-		do mv $$i `echo $$i | sed s/libdali_toolkit_la-//` ; echo $$i ; done
+	@for i in `find $(COVERAGE_DIR) -name "libdali_toolkit*_la-*.gcda" -o -name "libdali_toolkit*_la-*.gcno"` ;\
+		do dest=`echo $$i | sed s/libdali_.*_la-//` ; mv $$i $$dest ; echo $$i ; done
+
+cov_data: rename_cov_data
 	@cd $(COVERAGE_DIR) ; lcov $(LCOV_OPTS) --base-directory . --directory . -c -o dali.info
 	@cd $(COVERAGE_DIR) ; lcov $(LCOV_OPTS) --remove dali.info "/usr/include/*" "*/dali-env/*" "*solid-color-actor*" "*/dali-toolkit/third-party/*"  -o dali.info
 	@test -z $(COVERAGE_OUTPUT_DIR) || mkdir -p $(COVERAGE_OUTPUT_DIR)