From ed3346f5d42e18b38f1d92cdf2cb725f99553c4e Mon Sep 17 00:00:00 2001 From: Jeongmo Yang Date: Mon, 31 Aug 2015 16:02:10 +0900 Subject: [PATCH] Fix build error on wearable profile(no wayland) Change-Id: I429877b1332a9f761cf6aaae8924efa8600e4240 Signed-off-by: Jeongmo Yang --- packaging/libmm-camcorder.spec | 4 +++- src/Makefile.am | 13 +++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/packaging/libmm-camcorder.spec b/packaging/libmm-camcorder.spec index fb95f78..6549a2d 100644 --- a/packaging/libmm-camcorder.spec +++ b/packaging/libmm-camcorder.spec @@ -3,7 +3,7 @@ Name: libmm-camcorder Summary: Camera and recorder library Version: 0.10.6 -Release: 0 +Release: 1 Group: Multimedia/Libraries License: Apache-2.0 Source0: %{name}-%{version}.tar.gz @@ -91,6 +91,8 @@ vconftool set -t int file/camera/shutter_sound_policy 0 -u 5000 -s system::vconf %files devel %defattr(-,root,root,-) %{_includedir}/mmf/mm_camcorder.h +%if %{with wayland} %{_includedir}/mmf/mm_camcorder_mused.h +%endif %{_libdir}/pkgconfig/mm-camcorder.pc %{_libdir}/*.so diff --git a/src/Makefile.am b/src/Makefile.am index 2c838b8..06aa51e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,8 +4,7 @@ lib_LTLIBRARIES = libmmfcamcorder.la includelibmmfcamcorderdir = $(includedir)/mmf -includelibmmfcamcorder_HEADERS = include/mm_camcorder.h \ - include/mm_camcorder_mused.h +includelibmmfcamcorder_HEADERS = include/mm_camcorder.h noinst_HEADERS = include/mm_camcorder_audiorec.h \ include/mm_camcorder_attribute.h \ @@ -18,8 +17,7 @@ noinst_HEADERS = include/mm_camcorder_audiorec.h \ include/mm_camcorder_util.h \ include/mm_camcorder_exifinfo.h\ include/mm_camcorder_exifdef.h \ - include/mm_camcorder_sound.h \ - include/mm_camcorder_mused.h + include/mm_camcorder_sound.h libmmfcamcorder_la_SOURCES = mm_camcorder.c \ mm_camcorder_internal.c \ @@ -32,8 +30,7 @@ libmmfcamcorder_la_SOURCES = mm_camcorder.c \ mm_camcorder_configure.c \ mm_camcorder_util.c \ mm_camcorder_exifinfo.c \ - mm_camcorder_sound.c \ - mm_camcorder_mused.c + mm_camcorder_sound.c libmmfcamcorder_la_CFLAGS = -I$(srcdir)/include \ $(GST_CFLAGS) \ @@ -73,8 +70,12 @@ libmmfcamcorder_la_LDFLAGS = -Wl,--gc-sections \ libmmfcamcorder_la_LIBADD += $(SYSTEMINFO_LIBS) if WAYLAND_SUPPORT +includelibmmfcamcorder_HEADERS += include/mm_camcorder_mused.h +libmmfcamcorder_la_SOURCES += mm_camcorder_mused.c libmmfcamcorder_la_CFLAGS += $(GST_WAYLAND_CFLAGS) libmmfcamcorder_la_LIBADD += $(GST_WAYLAND_LIBS) +else +noinst_HEADERS += include/mm_camcorder_mused.h endif install-exec-hook: -- 2.7.4