Merge "Fix the build issue for TV" into tizensubmit/tizen_wearable/20160114.064033submit/tizen_tv/20160114.064009submit/tizen_mobile/20160114.063956accepted/tizen/wearable/20160115.011839accepted/tizen/mobile/20160115.011059

2 files changed, 20 insertions, 18 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7bca217..761af4f 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,8 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 
 SET(INC_DIR include)
 IF (TIZEN_TV)
-	INCLUDE_DIRECTORIES(${INC_DIR}/tv)
+    INCLUDE_DIRECTORIES(${INC_DIR})
+    INCLUDE_DIRECTORIES(${INC_DIR}/tv)
 ELSE ()
 	INCLUDE_DIRECTORIES(${INC_DIR})
 	IF (TIZEN_WEARABLE)
@@ -19,7 +20,7 @@ ELSE ()
 ENDIF (TIZEN_TV)
 
 IF (TIZEN_TV)
-SET(dependents "dlog glib-2.0 capi-base-common bluetooth-tv-api db-util")
+SET(dependents "dlog glib-2.0 capi-base-common bluetooth-api db-util")
 ELSE ()
 	IF (TIZEN_WEARABLE)
 		SET(dependents "dlog glib-2.0 capi-base-common bluetooth-api privacy-manager-client")
@@ -49,20 +50,19 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}")
 
 IF (TIZEN_TV)
 SET(SOURCES
-tv_src/bluetooth-common.c
-tv_src/bluetooth-adapter.c
-tv_src/bluetooth-device.c
-tv_src/bluetooth-socket.c
-tv_src/bluetooth-opp-server.c
-tv_src/bluetooth-opp-client.c
-tv_src/bluetooth-pan.c
-tv_src/bluetooth-hdp.c
-tv_src/bluetooth-hid.c
-tv_src/bluetooth-audio.c
-tv_src/bluetooth-avrcp.c
-tv_src/bluetooth-gatt.c
-tv_src/bluetooth-dut.c
-tv_src/bluetooth-sync3d.c
+src/bluetooth-common.c
+src/bluetooth-adapter.c
+src/bluetooth-device.c
+src/bluetooth-socket.c
+src/bluetooth-opp-server.c
+src/bluetooth-opp-client.c
+src/bluetooth-pan.c
+src/bluetooth-hdp.c
+src/bluetooth-hid.c
+src/bluetooth-audio.c
+src/bluetooth-avrcp.c
+src/bluetooth-gatt.c
+src/bluetooth-ipsp.c
 )
 ELSE ()
 SET(SOURCES
diff --git a/packaging/capi-network-bluetooth.spec b/packaging/capi-network-bluetooth.spec
index bb5b3cd..4c636e0 100644
--- a/packaging/capi-network-bluetooth.spec
+++ b/packaging/capi-network-bluetooth.spec
@@ -15,7 +15,7 @@ BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(vconf)
 %if "%{?profile}" == "tv"
-BuildRequires:  pkgconfig(bluetooth-tv-api)
+BuildRequires:  pkgconfig(bluetooth-api)
 BuildRequires:  pkgconfig(db-util)
 %else
 BuildRequires:  pkgconfig(bluetooth-api)
@@ -109,7 +109,7 @@ export FFLAGS+=" -DARCH64"
 %if "%{?profile}" == "wearable"
 #	-DTIZEN_WEARABLE=YES \
 %else
-%if "%{?tizen_profile_name}" == "tv"
+%if "%{?profile}" == "tv"
 	-DTIZEN_TV=YES \
 %else
 %if "%{?profile}" == "mobile"
@@ -143,7 +143,9 @@ install -D -m 0644 LICENSE %{buildroot}%{_datadir}/license/capi-network-bluetoot
 
 %files test
 %manifest %{name}.manifest
+%if "%{?profile}" != "tv"
 %{_bindir}/bt_unit_test
+%endif
 #%{_bindir}/bt_onoff
 #/etc/smack/accesses.d/capi-network-bluetooth-test.efl