summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKunhoon Baik <knhoon.baik@samsung.com>2017-01-06 18:46:59 +0900
committerKunhoon Baik <knhoon.baik@samsung.com>2017-01-06 19:12:09 +0900
commit09cc872dce1757581ef780d01bcd146591bf7beb (patch)
treea6be6b5951341ae6712ebc41a509cf913ea96922
parenta596b550cc3b6010374006385c0126e642b85a60 (diff)
downloadtizen-platform-config-09cc872dce1757581ef780d01bcd146591bf7beb.tar.gz
tizen-platform-config-09cc872dce1757581ef780d01bcd146591bf7beb.tar.bz2
tizen-platform-config-09cc872dce1757581ef780d01bcd146591bf7beb.zip
Change-Id: I2d35cb9cbd0f7110cd95b72902200cef87b0ff5a
-rw-r--r--libtzplatform-config.pc.in2
-rw-r--r--packaging/tizen-platform-config.spec13
-rw-r--r--src/Makefile.am10
3 files changed, 4 insertions, 21 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 fcd31b4..272d6af 100644
--- a/packaging/tizen-platform-config.spec
+++ b/packaging/tizen-platform-config.spec
@@ -43,14 +43,6 @@ Requires: %{libname} = %{version}
Tizen Platform Configuration - helper library headers to include in source code,
RPM macros to call in spec files
-%package -n %{libname}-static
-Summary: Tizen Platform Configuration - static libray
-Group: Development/Libraries
-License: LGPL-2.0
-Requires: %{libname} = %{version}
-%description -n %{libname}-static
-Tizen Platform Configuration - static library
-
%package -n %{name}-tools
Summary: Tizen Platform Configuration - tools
Group: System/Utilities
@@ -75,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
##############################################
@@ -187,10 +180,6 @@ HOME="$saveHOME"
%{_includedir}/*.h
%config %{_sysconfdir}/rpm/macros.tizen-platform
-%files -n %{libname}-static
-%manifest %{name}.manifest
-%{_libdir}/*.a
-
%files -n %{name}-tools
%manifest %{name}.manifest
%{_bindir}/*
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