From 4600788b1d6aa971f9506e8e2ccf83cb5d9782f2 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Thu, 5 Dec 2013 21:24:22 +0100
Subject: [PATCH] Fix more translator build feature dependencies

---
 src/add-ons/translators/hpgs/Jamfile        | 16 ++++++++--------
 src/add-ons/translators/wonderbrush/Jamfile |  8 +++++---
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/add-ons/translators/hpgs/Jamfile b/src/add-ons/translators/hpgs/Jamfile
index e8c96ea94e..342eb5a508 100644
--- a/src/add-ons/translators/hpgs/Jamfile
+++ b/src/add-ons/translators/hpgs/Jamfile
@@ -38,18 +38,18 @@ hpgstransform.c
 hpgszostream.c
 ;
 
-Includes [ FGristFiles hpgsimage.c ]
-	: [ BuildFeatureAttribute libpng : headers ] ;
-Includes [ FGristFiles hpgszostream.c ]
-	: [ BuildFeatureAttribute zlib : headers ] ;
-
 
 local architectureObject ;
 for architectureObject in [ MultiArchSubDirSetup ] {
 	on $(architectureObject) {
-UseLibraryHeaders iconv ;
-UseBuildFeatureHeaders libpng ;
-UseBuildFeatureHeaders zlib ;
+		UseLibraryHeaders iconv ;
+		UseBuildFeatureHeaders libpng ;
+		UseBuildFeatureHeaders zlib ;
+
+		Includes [ FGristFiles hpgsimage.c ]
+			: [ BuildFeatureAttribute libpng : headers ] ;
+		Includes [ FGristFiles hpgszostream.c ]
+			: [ BuildFeatureAttribute zlib : headers ] ;
 
 		Translator [ MultiArchDefaultGristFiles HPGSTranslator ] :
 			# HPGSTranslator classes
diff --git a/src/add-ons/translators/wonderbrush/Jamfile b/src/add-ons/translators/wonderbrush/Jamfile
index 917531593e..d2c10eaf50 100644
--- a/src/add-ons/translators/wonderbrush/Jamfile
+++ b/src/add-ons/translators/wonderbrush/Jamfile
@@ -2,13 +2,10 @@ SubDir HAIKU_TOP src add-ons translators wonderbrush ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-UseBuildFeatureHeaders zlib ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
 
 AddResources WonderBrushTranslator : WonderBrushTranslator.rdef ;
 
-Includes [ FGristFiles bitmap_compression.cpp ]
-	: [ BuildFeatureAttribute zlib : headers ] ;
 
 local architectureObject ;
 for architectureObject in [ MultiArchSubDirSetup ] {
@@ -16,6 +13,11 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 		# Include support sub folder
 		SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators wonderbrush support ] ;
 
+		UseBuildFeatureHeaders zlib ;
+
+		Includes [ FGristFiles bitmap_compression.cpp ]
+			: [ BuildFeatureAttribute zlib : headers ] ;
+
 		Translator [ MultiArchDefaultGristFiles WonderBrushTranslator ] :
 			Canvas.cpp
 			Layer.cpp