From: Geunsik Lim Date: Thu, 8 Dec 2016 07:15:14 +0000 (+0900) Subject: [4.0] Remove any assumption on the profile macro values X-Git-Tag: submit/tizen_unified/20170309.085327~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dee53b075ba76fa03460e60611cefac7796b8fc7;p=platform%2Fcore%2Fuifw%2Fefl-ext.git [4.0] Remove any assumption on the profile macro values - This is for Tizen 4.0. - Remove profile build dependency . This commit is to do not make any assumption on the profile macro values in the unified build. Change-Id: Ie4a932e7d3873eb49c71d546559ce6ca747fdcce Signed-off-by: Geunsik Lim --- diff --git a/packaging/efl-extension.spec b/packaging/efl-extension.spec index 07d9688..cea4ac1 100644 --- a/packaging/efl-extension.spec +++ b/packaging/efl-extension.spec @@ -1,6 +1,7 @@ # This is for backward-compatibility. This does not deteriorate 4.0 Configurability +# Note that it can be modified after the wearable and others are unified. # if wearable || "undefined" -%if "%{?profile}" == "wearable" || "%{?profile}" == "" +%if "%{?profile}" != "common" && "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" %define server wayland %endif @@ -14,8 +15,9 @@ URL: http://www.tizen.org/ Source0: %{name}-%{version}.tar.gz # This is for backward-compatibility. This does not deteriorate 4.0 Configurability +# Note that it can be modified after the wearable and others are unified. # if wearable || "undefined" -%if "%{?profile}" == "wearable" || "%{?profile}" == "" +%if "%{?profile}" != "common" && "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" BuildRequires: pkgconfig(eina) BuildRequires: pkgconfig(ecore) BuildRequires: pkgconfig(elementary) @@ -81,15 +83,17 @@ export LDFLAGS+=" -fvisibility=hidden -Wl,-z,defs -Wl,--hash-style=both -Wl,--as export CFLAGS="$CFLAGS -DTIZEN_MOBILE" %else # This is for backward-compatibility. This does not deteriorate 4.0 Configurability +# Note that it can be modified after the wearable and others are unified. # if wearable || "undefined" -%if "%{?profile}" == "wearable" || "%{?profile}" == "" +%if "%{?profile}" != "common" && "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" export CFLAGS="$CFLAGS -DTIZEN_WEARABLE" %endif %endif # This is for backward-compatibility. This does not deteriorate 4.0 Configurability +# Note that it can be modified after the wearable and others are unified. # if wearable || "undefined" -%if "%{?profile}" == "wearable" || "%{?profile}" == "" +%if "%{?profile}" != "common" && "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" %if "%{?server}" == "x" cmake \ . -DCMAKE_INSTALL_PREFIX=/usr -DWITH_X=1 @@ -125,8 +129,9 @@ cp %{_builddir}/%{buildsubdir}/LICENSE %{buildroot}/%{_datadir}/license/%{name} %{_libdir}/libefl-extension.so.* # This is for backward-compatibility. This does not deteriorate 4.0 Configurability +# Note that it can be modified after the wearable and others are unified. # if wearable || "undefined" -%if "%{?profile}" == "wearable" || "%{?profile}" == "" +%if "%{?profile}" != "common" && "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" %{_datadir}/locale/* %endif @@ -139,8 +144,9 @@ cp %{_builddir}/%{buildsubdir}/LICENSE %{buildroot}/%{_datadir}/license/%{name} %manifest %{name}.manifest # This is for backward-compatibility. This does not deteriorate 4.0 Configurability +# Note that it can be modified after the wearable and others are unified. # if wearable || "undefined" -%if "%{?profile}" == "wearable" || "%{?profile}" == "" +%if "%{?profile}" != "common" && "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" %{_datadir}/efl-extension/images/* %endif @@ -151,8 +157,9 @@ cp %{_builddir}/%{buildsubdir}/LICENSE %{buildroot}/%{_datadir}/license/%{name} %{_libdir}/pkgconfig/efl-extension.pc # This is for backward-compatibility. This does not deteriorate 4.0 Configurability +# Note that it can be modified after the wearable and others are unified. # if wearable || "undefined" -%if "%{?profile}" == "wearable" || "%{?profile}" == "" +%if "%{?profile}" != "common" && "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" %{_includedir}/efl-extension/circle/*.h %{_includedir}/efl-extension/common/*.h %endif