summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSunmin Lee <sunm.lee@samsung.com>2017-01-06 13:19:19 +0900
committerSunmin Lee <sunm.lee@samsung.com>2017-01-11 11:09:50 +0900
commita8439ea41ec1f99e2fe066617a13ee2f0da63dd8 (patch)
tree4b436a55cc9782d97e671a4a0f346e1f6db55c8d
parentf03c55e9b38cb6207c4eba4473c504db9e80c08f (diff)
downloadtizen-platform-config-accepted/tizen_3.0.m2_tv.tar.gz
tizen-platform-config-accepted/tizen_3.0.m2_tv.tar.bz2
tizen-platform-config-accepted/tizen_3.0.m2_tv.zip
Change-Id: I6c3efd0647b928a577808f01ad291d0f15440f68
-rw-r--r--libtzplatform-config.pc.in2
-rw-r--r--packaging/tizen-platform-config.spec4
-rw-r--r--src/Makefile.am10
3 files changed, 5 insertions, 11 deletions
diff --git a/libtzplatform-config.pc.in b/libtzplatform-config.pc.in
index b985220..933eb1d 100644
--- a/libtzplatform-config.pc.in
+++ b/libtzplatform-config.pc.in
@@ -6,5 +6,5 @@ Name: @PACKAGE_NAME@
Description: Tizen Platform Config library.
Version: @LIBTZPLATFORM_CONFIG_VERSION@
URL: @PACKAGE_URL@
-Libs: -L${libdir} -ltzplatform-config-static -ltzplatform-config-@LIBTZPLATFORM_CONFIG_VERSION@
+Libs: -L${libdir} -ltzplatform-config-@LIBTZPLATFORM_CONFIG_VERSION@
Cflags: -I${includedir}/
diff --git a/packaging/tizen-platform-config.spec b/packaging/tizen-platform-config.spec
index d89b832..405d385 100644
--- a/packaging/tizen-platform-config.spec
+++ b/packaging/tizen-platform-config.spec
@@ -2,7 +2,7 @@
%define keepstatic 1
Name: tizen-platform-config
-Version: 2.1
+Version: 2.2
Release: 0
Summary: Tizen Platform Configuration
License: MIT
@@ -67,6 +67,7 @@ cp %{SOURCE1001} .
install -m 755 %{SOURCE1002} -D %{buildroot}%{_datadir}/upgrade/scripts/201.tizen-platform-config_upgrade.sh
install -m 755 %{SOURCE2001} -D %{buildroot}%{_datadir}/upgrade/scripts/200.filesystem-pre.patch.sh
install -m 755 %{SOURCE2002} -D %{buildroot}%{_datadir}/upgrade/scripts/799.filesystem-post.patch.sh
+rm %{buildroot}%{_libdir}/*.a
%post
##############################################
@@ -176,7 +177,6 @@ HOME="$saveHOME"
%{_libdir}/pkgconfig/*.pc
%{_includedir}/*.h
%config %{_sysconfdir}/rpm/macros.tizen-platform
-%{_libdir}/*.a
%files -n %{name}-tools
%manifest %{name}.manifest
diff --git a/src/Makefile.am b/src/Makefile.am
index 2d71f0a..18e28dd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,5 @@
lib_LTLIBRARIES = libtzplatform-config-@LIBTZPLATFORM_CONFIG_VERSION@.la
-lib_LIBRARIES = libtzplatform-config-static.a
-
bin_PROGRAMS = tzplatform-get
wrappersrcdir=$(shell pkg-config --variable=datadir tizen-platform-wrapper)
@@ -48,10 +46,8 @@ BUILT_SOURCES=$(SRC_FROMWRAPPER) $(SRC_FROMTOOL)
CLEANFILES=$(SRC_FROMWRAPPER) $(SRC_FROMTOOL)
-libtzplatform_config_static_a_SOURCES = $(SRC_FROMWRAPPER_STATIC)
-
libtzplatform_config_@LIBTZPLATFORM_CONFIG_VERSION@_la_SOURCES = \
- $(SRC_FROMWRAPPER_SHARED) \
+ $(SRC_FROMWRAPPER) \
$(SRC_FROMTOOL)
tizen-platform.conf: /etc/tizen-platform.meta
@@ -86,7 +82,5 @@ tzplatform_config_sysconfdir= $(sysconfdir)/rpm
dist_tzplatform_config_sysconf_DATA=macros.tizen-platform
tzplatform_get_SOURCES = tzplatform_get.c
-tzplatform_get_LDADD = libtzplatform-config-static.a libtzplatform-config-@LIBTZPLATFORM_CONFIG_VERSION@.la
-
-
+tzplatform_get_LDADD = libtzplatform-config-@LIBTZPLATFORM_CONFIG_VERSION@.la