[Buildroot] [PATCH v2 1/1] package/tiff: Rework tiff utilities handling

[Buildroot] [PATCH v2 1/1] package/tiff: Rework tiff utilities handling

[Bernd Kuhls]

Remove all utility-specific options in favour of a generic
option which select either all or no packages. If users
want something more fine-grained than that, they can always
remove the unnecessary tools in a post-build script.

Since tiff has no configure option or Makefile target to prevent
the build/install of its utilities specific Makefile targets are
called to build the libtiff and, optionally, the utilities.

--
v2: Replaced submenu with a new all-or-nothing option (Thomas)

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 Config.in.legacy       |   16 +++++++++++++
 package/tiff/Config.in |   11 +++------
 package/tiff/tiff.mk   |   59 +++++++++++++++++++++---------------------------
 3 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/Config.in.legacy b/Config.in.legacy
index a8c5dab..aae93d7 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -102,6 +102,22 @@ endif
 
 comment "Legacy options removed in 2015.02"
 
+config BR2_PACKAGE_TIFF_TIFF2PDF
+	bool "tiff utility-specific option removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_TIFF_UTILITIES
+	help
+	  utility-specific options have been removed in favour of
+	  the new option BR2_PACKAGE_TIFF_UTILITIES.
+
+config BR2_PACKAGE_TIFF_TIFFCP
+	bool "tiff utility-specific option removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_TIFF_UTILITIES
+	help
+	  utility-specific options have been removed in favour of
+	  the new option BR2_PACKAGE_TIFF_UTILITIES.
+
 config BR2_PACKAGE_M4
 	bool "m4 target package removed"
 	select BR2_LEGACY
diff --git a/package/tiff/Config.in b/package/tiff/Config.in
index 3a929f7..957bbce 100644
--- a/package/tiff/Config.in
+++ b/package/tiff/Config.in
@@ -60,14 +60,9 @@ config BR2_PACKAGE_TIFF_JBIG
 	default y
 endmenu
 
-config BR2_PACKAGE_TIFF_TIFF2PDF
-	bool "tiff2pdf"
+config BR2_PACKAGE_TIFF_UTILITIES
+	bool "tiffutils"
 	help
-	  tiff2pdf utility
-
-config BR2_PACKAGE_TIFF_TIFFCP
-	bool "tiffcp"
-	help
-	  tiffcp utility
+	  install tiff utilities
 
 endif
diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk
index 43f96b7..e4f0265 100644
--- a/package/tiff/tiff.mk
+++ b/package/tiff/tiff.mk
@@ -15,36 +15,6 @@ TIFF_CONF_OPTS = \
 
 TIFF_DEPENDENCIES = host-pkgconf
 
-TIFF_TOOLS_TO_DELETE = \
-	bmp2tiff \
-	fax2ps \
-	fax2tiff \
-	gif2tiff \
-	pal2rgb \
-	ppm2tiff \
-	ras2tiff \
-	raw2tiff \
-	rgb2ycbcr \
-	thumbnail \
-	tiff2bw \
-	tiff2ps \
-	tiff2rgba \
-	tiffcmp \
-	tiffcrop \
-	tiffdither \
-	tiffdump \
-	tiffinfo \
-	tiffmedian \
-	tiffset \
-	tiffsplit \
-
-ifeq ($(BR2_PACKAGE_TIFF_TIFF2PDF),)
-	TIFF_TOOLS_TO_DELETE += tiff2pdf
-endif
-ifeq ($(BR2_PACKAGE_TIFF_TIFFCP),)
-	TIFF_TOOLS_TO_DELETE += tiffcp
-endif
-
 ifneq ($(BR2_PACKAGE_TIFF_CCITT),y)
 	TIFF_CONF_OPTS += --disable-ccitt
 endif
@@ -97,10 +67,33 @@ ifneq ($(BR2_PACKAGE_TIFF_JBIG),y)
 	TIFF_CONF_OPTS += --disable-jbig
 endif
 
-define TIFF_REMOVE_TOOLS_FIXUP
-	rm -f $(addprefix $(TARGET_DIR)/usr/bin/,$(TIFF_TOOLS_TO_DELETE))
+ifeq ($(BR2_PACKAGE_TIFF_UTILITIES),y)
+define TIFF_MAKE_TOOLS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/tools
 endef
+define TIFF_INSTALL_STAGING_TOOLS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/tools DESTDIR=$(STAGING_DIR) install
+endef
+define TIFF_INSTALL_TARGET_TOOLS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/tools DESTDIR=$(TARGET_DIR) install
+endef
+endif
 
-TIFF_POST_INSTALL_TARGET_HOOKS += TIFF_REMOVE_TOOLS_FIXUP
+define TIFF_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/port
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libtiff
+	$(TIFF_MAKE_TOOLS)
+endef
+
+define TIFF_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libtiff DESTDIR=$(STAGING_DIR) install
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install-pkgconfigDATA
+	$(TIFF_INSTALL_STAGING_TOOLS)
+endef
+
+define TIFF_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libtiff DESTDIR=$(TARGET_DIR) install
+	$(TIFF_INSTALL_TARGET_TOOLS)
+endef
 
 $(eval $(autotools-package))
-- 
1.7.10.4