Bring the hybrid translators back into the image.

build/jam/packages/HaikuSecondary

@@ -22,12 +22,12 @@ if $(HAIKU_GCC_VERSION_$(architecture)[1]) = 2 {
 
 
 # # add-ons
-# local addOnsDir = add-ons $(architecture) ;
+local addOnsDir = add-ons $(architecture) ;
 #
 # AddFilesToPackage $(addOnsDir) accelerants
 # 	: $(SYSTEM_ADD_ONS_ACCELERANTS) ;
-# AddFilesToPackage $(addOnsDir) Translators
-# 	: $(SYSTEM_ADD_ONS_TRANSLATORS) ;
+AddFilesToPackage $(addOnsDir) Translators
+	: [ MultiArchDefaultGristFiles $(SYSTEM_ADD_ONS_TRANSLATORS) ] ;
 # AddFilesToPackage $(addOnsDir) locale catalogs
 # 	: $(SYSTEM_ADD_ONS_LOCALE_CATALOGS) ;
 #

src/add-ons/translators/bmp/Jamfile

@@ -6,14 +6,20 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
 
 AddResources BMPTranslator : BMPTranslator.rdef ;
 
-Translator BMPTranslator :
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		Translator [ MultiArchDefaultGristFiles BMPTranslator ] :
 			BMPMain.cpp
 			BMPTranslator.cpp
 			BMPView.cpp
-	: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++)
-	localestub
+		: be translation 
+			[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
+			$(TARGET_LIBSUPC++) localestub
 		: true
 		;
+	}
+}
 
 DoCatalogs BMPTranslator :
 	x-vnd.Haiku-BMPTranslator

src/add-ons/translators/exr/Jamfile

@@ -9,16 +9,22 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
 
 AddResources EXRTranslator : EXRTranslator.rdef ;
 
-Translator EXRTranslator :
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		Translator [ MultiArchDefaultGristFiles EXRTranslator ] :
 			main.cpp
 			ConfigView.cpp
 			EXRGamma.cpp
 			EXRTranslator.cpp
 			IStreamWrapper.cpp
-	: be translation libilmimf.so $(TARGET_LIBSTDC++) libtranslatorsutils.a 
+			: be translation textencoding $(TARGET_LIBSTDC++) 
+			[ MultiArchDefaultGristFiles libtranslatorsutils.a  libilmimf.so ]
 			localestub
 			: true
 		;
+	}
+}
 
 DoCatalogs EXRTranslator :
 	x-vnd.Haiku-EXRTranslator

src/add-ons/translators/gif/Jamfile

@@ -6,7 +6,10 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
 
 AddResources GIFTranslator : GIFTranslator.rdef ;
 
-Translator GIFTranslator :
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		Translator [ MultiArchDefaultGristFiles GIFTranslator ] :
 			# Main Source
 			GIFTranslator.cpp
 			GIFView.cpp
@@ -19,9 +22,11 @@ Translator GIFTranslator :
 			SFHash.cpp
 			:
 			be translation $(TARGET_LIBSUPC++) localestub
-	libtranslatorsutils.a
+			[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
 			: true
 		;
+	}
+}
 
 DoCatalogs GIFTranslator :
 	x-vnd.Haiku-GIFTranslator

src/add-ons/translators/hpgs/Jamfile

@@ -2,9 +2,6 @@ SubDir HAIKU_TOP src add-ons translators hpgs ;
 
 SubDirSysHdrs [ FDirName $(SUBDIR) lib ] ;
 SubDirCcFlags -DHPGS_SHARED -std=c99 ;
-UseLibraryHeaders iconv ;
-UseBuildFeatureHeaders libpng ;
-UseBuildFeatureHeaders zlib ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
 
 local sources = 
@@ -46,7 +43,15 @@ Includes [ FGristFiles hpgsimage.c ]
 Includes [ FGristFiles hpgszostream.c ]
 	: [ BuildFeatureAttribute zlib : headers ] ;
 
-Translator HPGSTranslator :
+
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+UseLibraryHeaders iconv ;
+UseBuildFeatureHeaders libpng ;
+UseBuildFeatureHeaders zlib ;
+
+		Translator [ MultiArchDefaultGristFiles HPGSTranslator ] :
 			# HPGSTranslator classes
 			ConfigView.cpp
 			HPGSTranslator.cpp
@@ -54,9 +59,12 @@ Translator HPGSTranslator :
 			: be translation libtextencoding.so
 				[ BuildFeatureAttribute libpng : library ]
 				[ BuildFeatureAttribute zlib : library ]
-		libtranslatorsutils.a $(TARGET_LIBSUPC++) localestub
+				[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
+				$(TARGET_LIBSUPC++) localestub
 			: true
 		;
+	}
+}
 
 DoCatalogs HPGSTranslator :
 	x-vnd.Haiku-HPGSTranslator

src/add-ons/translators/hvif/Jamfile

@@ -4,14 +4,20 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
 
 AddResources HVIFTranslator : HVIFTranslator.rdef ;
 
-Translator HVIFTranslator : 
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		Translator [ MultiArchDefaultGristFiles HVIFTranslator ] :
 			HVIFMain.cpp
 			HVIFTranslator.cpp
 			HVIFView.cpp
-	: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++)
-	localestub
+			: be translation 
+			[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
+			$(TARGET_LIBSUPC++) localestub
 			: true
 		;
+	}
+}
 
 DoCatalogs HVIFTranslator :
 	x-vnd.Haiku-HVIFTranslator

src/add-ons/translators/icns/Jamfile

@@ -2,18 +2,12 @@ SubDir HAIKU_TOP src add-ons translators icns ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-UseBuildFeatureHeaders libpng ;
-
 SubDirSysHdrs [ FDirName $(SUBDIR) openjpeg ] ;
 SubDirSysHdrs [ FDirName $(SUBDIR) libicns ] ;
 
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
 	#for BaseTranslator.h and friends
 	
-# Let Jam know where to find some of our source files
-SEARCH_SOURCE += [ FDirName $(SUBDIR) openjpeg ] ;
-SEARCH_SOURCE += [ FDirName $(SUBDIR) libicns ] ;
-
 SubDirC++Flags [ FDefines BEOS_R5_COMPATIBLE ] ;
 
 local openjpeg_files = 
@@ -63,7 +57,15 @@ ObjectCcFlags [ FGristFiles $(libicns_files:S=$(SUFOBJ)) ] : -w ;
 
 AddResources ICNSTranslator : ICNSTranslator.rdef ;
 
-Translator ICNSTranslator :
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		# Let Jam know where to find some of our source files
+		SEARCH_SOURCE += [ FDirName $(SUBDIR) openjpeg ] ;
+		SEARCH_SOURCE += [ FDirName $(SUBDIR) libicns ] ;
+
+		UseBuildFeatureHeaders libpng ;
+		Translator [ MultiArchDefaultGristFiles ICNSTranslator ] :
 
 			# ICNSTranslator
 			ICNSTranslator.cpp
@@ -75,11 +77,15 @@ Translator ICNSTranslator :
 			
 			$(libicns_files)
 
-	: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++)
+			: be translation 
+			[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
+			$(TARGET_LIBSUPC++)
 			[ BuildFeatureAttribute libpng : library ]
 			localestub
 			: true
 		;
+	}
+}
 
 DoCatalogs ICNSTranslator :
 	x-vnd.Haiku-ICNSTranslator

src/add-ons/translators/ico/Jamfile

@@ -6,16 +6,23 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
 
 AddResources ICOTranslator : ICOTranslator.rdef ;
 
-Translator ICOTranslator :
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		Translator [ MultiArchDefaultGristFiles ICOTranslator ] :
 			# ICOTranslator classes
 			main.cpp
 			ICOTranslator.cpp
 			ConfigView.cpp
 			ICO.cpp
-	: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++)
+			: be translation 
+			[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
+			$(TARGET_LIBSUPC++)
 			localestub
 			: true
 		;
+	}
+}
 
 DoCatalogs ICOTranslator :
 	x-vnd.Haiku-ICOTranslator

src/add-ons/translators/jpeg/Jamfile

@@ -16,17 +16,23 @@ Includes [ FGristFiles be_jdatadst.cpp be_jdatasrc.cpp be_jerror.cpp
 		JPEGTranslator.cpp ]
 	: [ BuildFeatureAttribute jpeg : headers ] ;
 
-Translator JPEGTranslator :
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		Translator [ MultiArchDefaultGristFiles JPEGTranslator ] :
 			be_jdatadst.cpp
 			be_jdatasrc.cpp
 			be_jerror.cpp
 			exif_parser.cpp
 			JPEGTranslator.cpp
-	: be translation libtranslatorsutils.a
+			: be translation
+			[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
 			[ BuildFeatureAttribute jpeg : library ]
 			$(TARGET_LIBSTDC++) localestub
 			: true
 		;
+	}
+}
 
 DoCatalogs JPEGTranslator :
 	x-vnd.Haiku-JPEGTranslator

src/add-ons/translators/jpeg2000/Jamfile

@@ -15,9 +15,6 @@ CCFLAGS += -DEXCLUDE_MIF_SUPPORT
 	-DEXCLUDE_JPG_SUPPORT 
 	-DEXCLUDE_PGX_SUPPORT ;
 
-# Let Jam know where to find some of our source files
-SEARCH_SOURCE += [ FDirName $(SUBDIR) libjasper ] ;
-
 SubDirC++Flags [ FDefines BEOS_R5_COMPATIBLE ] ;
 
 local jasper_files = 
@@ -60,21 +57,30 @@ local jasper_files =
 	jpc_util.c
 	;
 
-ObjectCcFlags [ FGristFiles $(jasper_files:S=$(SUFOBJ)) ] : -w ;
-
 AddResources JPEG2000Translator : JPEG2000Translator.rdef ;
 
-Translator JPEG2000Translator :
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		# Let Jam know where to find some of our source files
+		SEARCH_SOURCE += [ FDirName $(SUBDIR) libjasper ] ;
+
+		ObjectCcFlags [ FGristFiles $(jasper_files:S=$(SUFOBJ)) ] : -w ;
+
+		Translator [ MultiArchDefaultGristFiles JPEG2000Translator ] :
 
 			# JPEG2000Translator
 			JPEG2000Translator.cpp
 
 			$(jasper_files)
 
-	: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++)
-	localestub
+			: be translation 
+			[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
+			$(TARGET_LIBSUPC++) localestub
 			: true
 		;
+	}
+}
 
 DoCatalogs JPEG2000Translator :
 	x-vnd.Haiku-JPEG2000Translator

src/add-ons/translators/jpeg2000/libjasper/jas_debug.c

@@ -115,8 +115,8 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#include "jasper/jas_types.h"
 #include "jasper/jas_debug.h"
+#include "jasper/jas_types.h"
 
 /******************************************************************************\
 * Local data.
@@ -145,7 +145,7 @@ int jas_setdbglevel(int dbglevel)
 }
 
 /* Get the library debug level. */
-int jas_getdbglevel()
+int jas_getdbglevel(void)
 {
 	return jas_dbglevel;
 }
@@ -169,8 +169,8 @@ int jas_eprintf(const char *fmt, ...)
 /* Dump memory to a stream. */
 int jas_memdump(FILE *out, void *data, size_t len)
 {
-	int i;
-	int j;
+	unsigned int i;
+	unsigned int j;
 	jpr_uchar_t *dp;
 	dp = data;
 	for (i = 0; i < len; i += 16) {

src/add-ons/translators/jpeg2000/libjasper/jasper/jas_debug.h

@@ -143,7 +143,7 @@ extern "C" {
 #endif
 
 /* Get the library debug level. */
-int jas_getdbglevel();
+int jas_getdbglevel(void);
 
 /* Set the library debug level. */
 int jas_setdbglevel(int dbglevel);

src/add-ons/translators/pcx/Jamfile

@@ -6,15 +6,22 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
 
 AddResources PCXTranslator : PCXTranslator.rdef ;
 
-Translator PCXTranslator :
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		Translator [ MultiArchDefaultGristFiles PCXTranslator ] :
 			# PCXTranslator classes
 			main.cpp
 			PCXTranslator.cpp
 			ConfigView.cpp
 			PCX.cpp
-	: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) localestub
+			: be translation
+			[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
+			$(TARGET_LIBSUPC++) localestub
 			: true
 		;
+	}
+}
 
 DoCatalogs PCXTranslator :
 	x-vnd.Haiku-PCXTranslator

src/add-ons/translators/png/Jamfile

@@ -2,8 +2,6 @@ SubDir HAIKU_TOP src add-ons translators png ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-UseBuildFeatureHeaders libpng ;
-UseBuildFeatureHeaders zlib ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
 
 AddResources PNGTranslator : PNGTranslator.rdef ;
@@ -12,10 +10,16 @@ if $(TARGET_GCC_VERSION_$(TARGET_PACKAGING_ARCH)[1]) = 2 {
 	SubDirCcFlags -DPNG_NO_PEDANTIC_WARNINGS ;
 }
 
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		UseBuildFeatureHeaders libpng ;
+		UseBuildFeatureHeaders zlib ;
+
 		Includes [ FGristFiles PNGTranslator.cpp PNGView.cpp ]
 			: [ BuildFeatureAttribute libpng : headers ] ;
 
-Translator PNGTranslator : 
+		Translator [ MultiArchDefaultGristFiles PNGTranslator ] : 
 			PNGMain.cpp
 			PNGTranslator.cpp
 			PNGView.cpp
@@ -23,10 +27,13 @@ Translator PNGTranslator :
 		: be translation
 			[ BuildFeatureAttribute libpng : library ]
 			[ BuildFeatureAttribute zlib : library ]
-		$(TARGET_LIBSUPC++) libtranslatorsutils.a
+			$(TARGET_LIBSUPC++)
+			[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
 			localestub
 		: true
 		;
+	}
+}
 
 DoCatalogs PNGTranslator :
 	x-vnd.Haiku-PNGTranslator

src/add-ons/translators/ppm/Jamfile

@@ -4,11 +4,16 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
 
 AddResources PPMTranslator : PPMTranslator.rdef ;
 
-Translator PPMTranslator
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		Translator [ MultiArchDefaultGristFiles PPMTranslator ]
 			: PPMMain.cpp PPMTranslator.cpp colorspace.cpp
 			: be translation $(TARGET_LIBSUPC++) localestub
 			: true
 		;
+	}
+}
 
 DoCatalogs PPMTranslator :
 	x-vnd.Haiku-PPMTranslator

src/add-ons/translators/psd/Jamfile

@@ -6,15 +6,21 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
 
 AddResources PSDTranslator : PSDTranslator.rdef ;
 
-Translator PSDTranslator :
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		Translator [ MultiArchDefaultGristFiles PSDTranslator ] :
 			PSDTranslatorApp.cpp
 			PSDTranslator.cpp
 			PSDLoader.cpp
 			ConfigView.cpp
-	: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++)
-	localestub
+			: be translation 
+			[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
+			$(TARGET_LIBSUPC++) localestub
 			: true
 		;
+	}
+}
 
 DoCatalogs PSDTranslator :
 	x-vnd.Haiku-PSDTranslator

src/add-ons/translators/raw/Jamfile

@@ -6,18 +6,24 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
 
 AddResources RAWTranslator : RAWTranslator.rdef ;
 
-Translator RAWTranslator :
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		Translator [ MultiArchDefaultGristFiles RAWTranslator ] :
 			# RawTranslator classes
 			main.cpp
 			RAWTranslator.cpp
 			ConfigView.cpp
 			RAW.cpp
 			: 
-	be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) 
-	localestub
+			be translation 
+			[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
+			$(TARGET_LIBSUPC++) localestub
 			: 
 			true
 		;
+	}
+}
 
 DoCatalogs RAWTranslator :
 	x-vnd.Haiku-RAWTranslator

src/add-ons/translators/rtf/Jamfile

@@ -10,7 +10,10 @@ UsePrivateHeaders shared storage ;
 
 AddResources RTFTranslator : RTFTranslator.rdef ;
 
-Translator RTFTranslator :
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		Translator [ MultiArchDefaultGristFiles RTFTranslator ] :
 			main.cpp
 			ConfigView.cpp
 
@@ -18,9 +21,13 @@ Translator RTFTranslator :
 			RTF.cpp
 			RTFTranslator.cpp
 
-	: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) localestub
+			: be translation 
+			[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
+			$(TARGET_LIBSUPC++) localestub
 			: true
 		;
+	}
+}
 
 DoCatalogs RTFTranslator :
 	x-vnd.Haiku-RTFTranslator

src/add-ons/translators/sgi/Jamfile

@@ -6,14 +6,21 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
 
 AddResources SGITranslator : SGITranslator.rdef ; 
 
-Translator SGITranslator :
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		Translator [ MultiArchDefaultGristFiles SGITranslator ] :
 			SGIImage.cpp
 			SGIMain.cpp
 			SGITranslator.cpp
 			SGIView.cpp
-	: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) localestub
+			: be translation 
+			[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
+			$(TARGET_LIBSUPC++) localestub
 			: true
 		;
+	}
+}
 
 DoCatalogs SGITranslator :
 	x-vnd.Haiku-SGITranslator

src/add-ons/translators/shared/Jamfile

@@ -2,12 +2,17 @@ SubDir HAIKU_TOP src add-ons translators shared ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-StaticLibrary libtranslatorsutils.a :
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		StaticLibrary [ MultiArchDefaultGristFiles libtranslatorsutils.a ] :
 			BaseTranslator.cpp
 			StreamBuffer.cpp
 			TranslatorSettings.cpp
 			TranslatorWindow.cpp
 		;
+	}
+}
 
 DoCatalogs libtranslatorsutils.a :
 	x-pseudo.libtranslatorsutils

src/add-ons/translators/stxt/Jamfile

@@ -10,14 +10,20 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
 
 AddResources STXTTranslator : STXTTranslator.rdef ;
 
-Translator STXTTranslator :
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		Translator [ MultiArchDefaultGristFiles STXTTranslator ] :
 			STXTMain.cpp
 			STXTTranslator.cpp
 			STXTView.cpp
-	: be translation libtextencoding.so libtranslatorsutils.a 
+			: be translation textencoding
+			[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
 			$(TARGET_LIBSUPC++) localestub
 			: true
 		;
+	}
+}
 
 DoCatalogs STXTTranslator :
 	x-vnd.Haiku-STXTTranslator

src/add-ons/translators/tga/Jamfile

@@ -6,13 +6,20 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
 
 AddResources TGATranslator : TGATranslator.rdef ;
 
-Translator TGATranslator :
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		Translator [ MultiArchDefaultGristFiles TGATranslator ] :
 			TGAMain.cpp
 			TGATranslator.cpp
 			TGAView.cpp
-	: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) localestub
+			: be translation 
+			[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
+			$(TARGET_LIBSUPC++) localestub
 			: true
 		;
+	}
+}
 
 DoCatalogs TGATranslator :
 	x-vnd.Haiku-TGATranslator

src/add-ons/translators/tiff/Jamfile

@@ -8,7 +8,10 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
 
 AddResources TIFFTranslator : TIFFTranslator.rdef ;
 
-Translator TIFFTranslator : 
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		Translator [ MultiArchDefaultGristFiles TIFFTranslator ] :
 			# [ FGristFiles $(tiff_files:S=$(SUFOBJ)) ]
 
 			# TIFFTranslator classes
@@ -16,10 +19,13 @@ Translator TIFFTranslator :
 			TIFFTranslator.cpp
 			TIFFView.cpp
 
-	: be libtiff.so translation libtranslatorsutils.a $(TARGET_LIBSUPC++)
-	localestub
+			: be libtiff.so translation 
+			[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
+			$(TARGET_LIBSUPC++) localestub
 			: true
 		;
+	}
+}
 
 DoCatalogs TIFFTranslator :
 	x-vnd.Haiku-TIFFTranslator

src/add-ons/translators/webp/Jamfile

@@ -7,7 +7,10 @@ SubDirHdrs [ FDirName $(SUBDIR) libwebp ] ;
 
 AddResources WebPTranslator : WebPTranslator.rdef ;
 
-Translator WebPTranslator :
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		Translator [ MultiArchDefaultGristFiles WebPTranslator ] :
 
 			main.cpp
 
@@ -17,10 +20,12 @@ Translator WebPTranslator :
 			:
 			<libwebp>webpdecode.o
 			<libwebp>webpencode.o
-	be translation libtranslatorsutils.a
+			be translation [ MultiArchDefaultGristFiles libtranslatorsutils.a ]
 			$(TARGET_LIBSUPC++)	localestub
 			: true
 		;
+	}
+}
 
 DoCatalogs WebPTranslator :
 	x-vnd.Haiku-WebPTranslator

src/add-ons/translators/wonderbrush/Jamfile

@@ -2,9 +2,6 @@ SubDir HAIKU_TOP src add-ons translators wonderbrush ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-# Include support sub folder
-SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators wonderbrush support ] ;
-
 UseBuildFeatureHeaders zlib ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
 
@@ -13,7 +10,13 @@ AddResources WonderBrushTranslator : WonderBrushTranslator.rdef ;
 Includes [ FGristFiles bitmap_compression.cpp ]
 	: [ BuildFeatureAttribute zlib : headers ] ;
 
-Translator WonderBrushTranslator :
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		# Include support sub folder
+		SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators wonderbrush support ] ;
+
+		Translator [ MultiArchDefaultGristFiles WonderBrushTranslator ] :
 			Canvas.cpp
 			Layer.cpp
 			WonderBrushImage.cpp
@@ -28,10 +31,12 @@ Translator WonderBrushTranslator :
 
 			: be translation
 			[ BuildFeatureAttribute zlib : library ]
-	libtranslatorsutils.a
+			[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
 			$(TARGET_LIBSUPC++) localestub
 			: true
 		;
+	}
+}
 
 DoCatalogs WonderBrushTranslator :
 	x-vnd.Haiku-WonderBrushTranslator