plucker: use ICONV notation

This commit is contained in:
kyak 2011-02-06 22:55:51 +03:00
parent 3cda7c2879
commit daa3743c39
1 changed files with 3 additions and 5 deletions

View File

@ -12,12 +12,13 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/plucker
SECTION:=utils
CATEGORY:=Utilities
TITLE:=Plucker files reader (PDB)
DEPENDS:=@BROKEN +zlib +libintl +libiconv +libgconf2 +libjpeg +pixman +fontconfig +libfreetype +pango +atk +libpng +DirectFB
DEPENDS:=@BROKEN +zlib $(ICONV_DEPENDS) $(INTL_DEPENDS) +libgconf2 +libjpeg +pixman +fontconfig +libfreetype +pango +atk +libpng +DirectFB
URL=http://www.plkr.org
endef
@ -25,9 +26,6 @@ define Package/plucker/description
Plucker can view files made by the Plucker Distiller (Project Gutenberg books, for example).
endef
TARGET_CFLAGS+= -I$(STAGING_DIR)/usr/lib/libintl/include
TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib/libintl/lib
TARGET_LDFLAGS+= -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
define Build/Configure
@ -40,7 +38,7 @@ define Build/Configure
--enable-unplug \
--disable-explode \
--disable-desktopbuild, \
LIBS="-L$(STAGING_DIR)/usr/lib/libiconv/lib -L$(STAGING_DIR)/usr/lib/libintl/lib -L$(STAGING_DIR)/usr/lib -lgtk-directfb-2.0 -lgdk-directfb-2.0 -latk-1.0 -lgio-2.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lpangoft2-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lintl -liconv -lfreetype -lfontconfig -ljpeg -lpng -lpixman-1 -ldirectfb -ldirect -lfusion -lexpat -lz -lm"\
LIBS="$(ICONV_LDFLAGS) $(INTL_LDFLAGS) -L$(STAGING_DIR)/usr/lib -lgtk-directfb-2.0 -lgdk-directfb-2.0 -latk-1.0 -lgio-2.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lpangoft2-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lfreetype -lfontconfig -ljpeg -lpng -lpixman-1 -ldirectfb -ldirect -lfusion -lexpat -lz -lm"\
)
endef