Added libcrypto dependency to build with modern OpenSSL 48/46248/1 accepted/tizen/mobile/20151017.101157 accepted/tizen/tv/20151017.101416 accepted/tizen/wearable/20151017.101834 submit/tizen/20151016.055653 tizen_3.0.m2.a1_mobile_release tizen_3.0.m2.a1_tv_release
authorVyacheslav Barinov <v.barinov@samsung.com>
Tue, 18 Aug 2015 11:02:07 +0000 (14:02 +0300)
committerVyacheslav Barinov <v.barinov@samsung.com>
Tue, 18 Aug 2015 11:02:07 +0000 (14:02 +0300)
Parallel build enabled to speedup build.

Change-Id: I0d37e6e3e9f6f5431328f247227671675e6a4d32
Signed-off-by: Vyacheslav Barinov <v.barinov@samsung.com>
client/CMakeLists.txt
daemon/CMakeLists.txt
packaging/nfc-manager-neard.spec

index 518d1e5..a7ae306 100644 (file)
@@ -16,7 +16,7 @@ IF(WAYLAND_SUPPORT)
 ENDIF(WAYLAND_SUPPORT)
 INCLUDE(FindPkgConfig)
 pkg_check_modules(client_pkgs REQUIRED dlog vconf libtzplatform-config neardal
-                       libssl appsvc feedback capi-media-wav-player ${WIN_PKG})
+                       libssl libcrypto appsvc feedback capi-media-wav-player ${WIN_PKG})
 
 IF(WAYLAND_SUPPORT)
        ADD_DEFINITIONS("-DHAVE_WAYLAND")
index 0cfb65f..7ec36b1 100755 (executable)
@@ -17,12 +17,12 @@ ENDIF(WAYLAND_SUPPORT)
 INCLUDE(FindPkgConfig)
 IF(ARM_TARGET)
        pkg_check_modules(daemon_pkgs REQUIRED aul glib-2.0 gio-unix-2.0
-               vconf dlog tapi appsvc libcurl libssl feedback capi-media-wav-player
+               vconf dlog tapi appsvc libcurl libssl libcrypto feedback capi-media-wav-player
                pkgmgr pkgmgr-info capi-network-wifi pmapi capi-network-wifi-direct
                libtzplatform-config neardal ${WIN_PKG})
 ELSE(ARM_TARGET)
        pkg_check_modules(daemon_pkgs REQUIRED aul glib-2.0 gio-unix-2.0
-               vconf dlog tapi appsvc libcurl libssl feedback capi-media-wav-player
+               vconf dlog tapi appsvc libcurl libssl libcrypto feedback capi-media-wav-player
                pkgmgr pkgmgr-info capi-network-wifi pmapi libtzplatform-config neardal
                ${WIN_PKG})
 ENDIF(ARM_TARGET)
index 0919380..ff19125 100755 (executable)
@@ -26,6 +26,7 @@ BuildRequires:  pkgconfig(appsvc)
 BuildRequires:  pkgconfig(feedback)
 BuildRequires:  pkgconfig(capi-media-wav-player)
 BuildRequires:  pkgconfig(libssl)
+BuildRequires:  pkgconfig(libcrypto)
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(pkgmgr)
 BuildRequires:  pkgconfig(pkgmgr-info)
@@ -110,6 +111,7 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 -DX11_SUPPORT=Off
 %endif
 
+make %{?_smp_mflags}
 
 %install
 %make_install