diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-06-03 15:29:23 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-06-03 15:29:23 +0200 |
| commit | a0ac049d3e0ad78c7f9c647ae858bb45592cdb60 (patch) | |
| tree | 57879d4ec743b478057d5a42ba6f5b13411f4994 /rules/libnetpbm.make | |
| parent | 531e88a649f10e4e05b6fa6059ef7c5612777ee8 (diff) | |
| download | ptxdist-a0ac049d3e0ad78c7f9c647ae858bb45592cdb60.tar.gz ptxdist-a0ac049d3e0ad78c7f9c647ae858bb45592cdb60.tar.xz | |
[libnetpbm] avoid unused dependencies and install pngtopnm
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/libnetpbm.make')
| -rw-r--r-- | rules/libnetpbm.make | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/rules/libnetpbm.make b/rules/libnetpbm.make index 1e9254550..ad6ada332 100644 --- a/rules/libnetpbm.make +++ b/rules/libnetpbm.make @@ -36,10 +36,17 @@ $(LIBNETPBM_SOURCE): # Prepare # ---------------------------------------------------------------------------- -LIBNETPBM_PATH := PATH=$(CROSS_PATH) -LIBNETPBM_MAKE_ENV := $(CROSS_ENV) -LIBNETPBM_MAKE_PAR := NO -LIBNETPBM_INSTALL_OPT := install-run install-dev pkgdir=$(LIBNETPBM_PKGDIR)/usr +LIBNETPBM_MAKE_ENV := $(CROSS_ENV) +LIBNETPBM_MAKE_PAR := NO +LIBNETPBM_MAKE_OPT := XML2_LIBS=NONE +ifndef PTXCONF_LIBNETPBM_PNG2PNM +LIBNETPBM_MAKE_OPT += HAVE_PNGLIB=N +endif +LIBNETPBM_INSTALL_OPT := \ + $(LIBNETPBM_MAKE_OPT) \ + pkgdir=$(LIBNETPBM_PKGDIR)/usr \ + install-run install-dev + $(STATEDIR)/libnetpbm.prepare: @$(call targetinfo) @@ -89,6 +96,9 @@ endif ifdef PTXCONF_LIBNETPBM_PPM2LJ @$(call install_copy, libnetpbm, 0, 0, 0755, -, /usr/bin/ppmtolj) endif +ifdef PTXCONF_LIBNETPBM_PNG2PNM + @$(call install_copy, libnetpbm, 0, 0, 0755, -, /usr/bin/pngtopnm) +endif ifdef PTXCONF_LIBNETPBM_PNM2XWD @$(call install_copy, libnetpbm, 0, 0, 0755, -, /usr/bin/pnmtoxwd) endif |