diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-05-08 13:07:18 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-05-08 13:07:18 +0000 |
| commit | ef17708b2a1158e01ca6f1f092e383b4b52d57c3 (patch) | |
| tree | 32ba05ff414dcea168dcf3ff494bdb769a62558b /rules/libpv.make | |
| parent | d08d2b16dcb99358000d570be94d3d5d0757b527 (diff) | |
| download | ptxdist-ef17708b2a1158e01ca6f1f092e383b4b52d57c3.tar.gz ptxdist-ef17708b2a1158e01ca6f1f092e383b4b52d57c3.tar.xz | |
* libpv: update to 1.3.0
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10404 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/libpv.make')
| -rw-r--r-- | rules/libpv.make | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/rules/libpv.make b/rules/libpv.make index ad14066d4..96b9092f9 100644 --- a/rules/libpv.make +++ b/rules/libpv.make @@ -3,7 +3,7 @@ # # Copyright (C) 2005 by Robert Schwebel # 2009 by Marc Kleine-Budde <mkl@pengutronix.de> -# +# # See CREDITS for details about who has contributed to this project. # # For further information about the PTXdist project and license conditions @@ -18,7 +18,7 @@ PACKAGES-$(PTXCONF_LIBPV) += libpv # # Paths and names # -LIBPV_VERSION = 1.2.10 +LIBPV_VERSION = 1.3.0 LIBPV = libpv-$(LIBPV_VERSION) LIBPV_SUFFIX = tar.bz2 LIBPV_URL = http://www.pengutronix.de/software/libpv/download/$(LIBPV).$(LIBPV_SUFFIX) @@ -44,8 +44,10 @@ LIBPV_ENV := $(CROSS_ENV) # # autoconf # -LIBPV_AUTOCONF := \ +LIBPV_AUTOCONF = \ $(CROSS_AUTOCONF_USR) \ + --enable-shared \ + --enable-static \ --disable-debug ifdef PTXCONF_LIBPV_EVENT @@ -60,6 +62,12 @@ else LIBPV_AUTOCONF += --disable-python endif +ifdef PTXCONF_LIBPV_XML_EXPAT +LIBPV_AUTOCONF += --with-expat +else +LIBPV_AUTOCONF += --without-expat +endif + # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- @@ -77,14 +85,12 @@ $(STATEDIR)/libpv.targetinstall: @$(call install_fixup, libpv,DESCRIPTION,missing) ifdef PTXCONF_LIBPV_PVTOOL - @$(call install_copy, libpv, 0, 0, 0755, -, /usr/bin/pvtool) + @$(call install_copy, libpv, 0, 0, 0755, $(LIBPV_DIR)/src/pvtool, /usr/bin/pvtool) endif - @$(call install_copy, libpv, 0, 0, 0644, -, \ - /usr/lib/libpv.so.8.2.0) - - @$(call install_link, libpv, libpv.so.8.2.0, /usr/lib/libpv.so.8) - @$(call install_link, libpv, libpv.so.8.2.0, /usr/lib/libpv.so) + @$(call install_copy, libpv, 0, 0, 0644, - , /usr/lib/libpv.so.11.0.0) + @$(call install_link, libpv, libpv.so.11.0.0, /usr/lib/libpv.so.11) + @$(call install_link, libpv, libpv.so.11.0.0, /usr/lib/libpv.so) ifdef PTXCONF_LIBPV_PYTHON @$(call install_copy, libpv, 0, 0, 0644, -, \ |