X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Ftizen%2FMakefile.am;h=108ccb2671cd74e46e9ecde44f77c83f7db8713a;hb=d6f6fa74934abfacd61edb5529c081d890e3be24;hp=aba9958d42eeaed2cd4111d116bc53146b668722;hpb=dd9fee43aa5548e08282170a3b0e5a04ff20e3a6;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/build/tizen/Makefile.am b/build/tizen/Makefile.am
index aba9958..108ccb2 100644
--- a/build/tizen/Makefile.am
+++ b/build/tizen/Makefile.am
@@ -14,17 +14,7 @@
 # limitations under the License.
 #
 
-SUBDIRS = common dali-application
-
-if ! LITE_PROFILE
-if ! WEARABLE_PROFILE
-SUBDIRS += plugins
-endif
-endif
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = dali.pc \
-                 dali-application.pc
+SUBDIRS = ${subdirs}
 
 MAINTAINERCLEANFILES = \
     aclocal.m4 \
@@ -45,18 +35,23 @@ CLEANFILES = \
 COVERAGE_DIR=.cov
 COVERAGE_OUTPUT_DIR=doc/coverage
 
-cov_data:
+# 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`
+
+rename_cov_data:
 	@test -z $(COVERAGE_DIR) || mkdir -p $(COVERAGE_DIR)
 	@rm -f $(COVERAGE_DIR)/*
-	@-cp common/.libs/*.gcda common/.libs/*.gcno  $(COVERAGE_DIR)
-	@for i in `find $(COVERAGE_DIR) -name "libdali_adaptor_common_la-*.gcda" -o -name "libdali_adaptor_common_la-*.gcno"` ;\
-		do mv $$i `echo $$i | sed s/libdali_adaptor_common_la-//` ; echo $$i ; done
-	@cd $(COVERAGE_DIR) ; lcov --base-directory . --directory . -c -o dali.info
-	@cd $(COVERAGE_DIR) ; lcov --remove dali.info "*boost*" "dali-env/*" "/usr/include/*" -o dali.info
+	@-cp adaptor/.libs/*.gcda adaptor/.libs/*.gcno  $(COVERAGE_DIR)
+	@for i in `find $(COVERAGE_DIR) -name "libdali_adaptor*_la-*.gcda" -o -name "libdali_adaptor*_la-*.gcno"` ;\
+		do mv $$i `echo $$i | sed s/libdali_adaptor*_la-//` ; 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 "*/dali-env/*" "/usr/include/*" -o dali.info
 	@test -z $(COVERAGE_OUTPUT_DIR) || mkdir -p $(COVERAGE_OUTPUT_DIR)
 
 coverage: cov_data
-	@genhtml -o $(COVERAGE_OUTPUT_DIR) $(COVERAGE_DIR)/dali.info
+	@genhtml $(LCOV_OPTS) -o $(COVERAGE_OUTPUT_DIR) $(COVERAGE_DIR)/dali.info
 
 reset_coverage:
 	@lcov -z --directory `pwd`