diff options
author | Sunmin Lee <sunm.lee@samsung.com> | 2017-01-06 19:29:55 +0900 |
---|---|---|
committer | Sunmin Lee <sunm.lee@samsung.com> | 2017-01-06 19:29:55 +0900 |
commit | 22adb667404ae4c819f6e52256911cb2534580d5 (patch) | |
tree | 5611b4ca560797957deaaac14f897b00e02a091e | |
parent | acc78053342d2ebbfe4673592f0b744e0cde1981 (diff) | |
parent | 09cc872dce1757581ef780d01bcd146591bf7beb (diff) | |
download | tizen-platform-config-22adb667404ae4c819f6e52256911cb2534580d5.tar.gz tizen-platform-config-22adb667404ae4c819f6e52256911cb2534580d5.tar.bz2 tizen-platform-config-22adb667404ae4c819f6e52256911cb2534580d5.zip |
Merge branch 'tizen_3.0' into tizensubmit/tizen/20170113.100726submit/tizen/20170106.103957accepted/tizen/wearable/20170113.225257accepted/tizen/tv/20170113.225242accepted/tizen/mobile/20170113.225225accepted/tizen/ivi/20170113.225315accepted/tizen/common/20170113.184410
Change-Id: Iab8a82d347b20490ed832d386609f993f332790a
-rw-r--r-- | libtzplatform-config.pc.in | 2 | ||||
-rw-r--r-- | packaging/tizen-platform-config.spec | 4 | ||||
-rw-r--r-- | src/Makefile.am | 10 |
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 6f36793..771ae9b 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: 3.0 +Version: 4.0 Release: 1 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 ############################################## @@ -178,7 +179,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 |