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
+AddFilesToPackage $(addOnsDir) Translators
-# 	: $(SYSTEM_ADD_ONS_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 ;
-	BMPMain.cpp
+for architectureObject in [ MultiArchSubDirSetup ] {
-	BMPTranslator.cpp
+	on $(architectureObject) {
-	BMPView.cpp
+		Translator [ MultiArchDefaultGristFiles BMPTranslator ] :
-	: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++)
+			BMPMain.cpp
-	localestub
+			BMPTranslator.cpp
-	: true
+			BMPView.cpp
-;
+		: 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 ;
-	main.cpp
+for architectureObject in [ MultiArchSubDirSetup ] {
-	ConfigView.cpp
+	on $(architectureObject) {
-	EXRGamma.cpp
+		Translator [ MultiArchDefaultGristFiles EXRTranslator ] :
-	EXRTranslator.cpp
+			main.cpp
-	IStreamWrapper.cpp
+			ConfigView.cpp
-	: be translation libilmimf.so $(TARGET_LIBSTDC++) libtranslatorsutils.a 
+			EXRGamma.cpp
-	localestub
+			EXRTranslator.cpp
-	: true
+			IStreamWrapper.cpp
-;
+			: 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,22 +6,27 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
 
 AddResources GIFTranslator : GIFTranslator.rdef ;
 
-Translator GIFTranslator :
+local architectureObject ;
-	# Main Source
+for architectureObject in [ MultiArchSubDirSetup ] {
-	GIFTranslator.cpp
+	on $(architectureObject) {
-	GIFView.cpp
+		Translator [ MultiArchDefaultGristFiles GIFTranslator ] :
+			# Main Source
+			GIFTranslator.cpp
+			GIFView.cpp
 
-	# Real Work
+			# Real Work
-	GIFLoad.cpp
+			GIFLoad.cpp
-	LoadPalette.cpp
+			LoadPalette.cpp
-	GIFSave.cpp
+			GIFSave.cpp
-	SavePalette.cpp
+			SavePalette.cpp
-	SFHash.cpp
+			SFHash.cpp
-	:
+			:
-	be translation $(TARGET_LIBSUPC++) localestub
+			be translation $(TARGET_LIBSUPC++) localestub
-	libtranslatorsutils.a
+			[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
-	: true
+			: 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,17 +43,28 @@ Includes [ FGristFiles hpgsimage.c ]
 Includes [ FGristFiles hpgszostream.c ]
 	: [ BuildFeatureAttribute zlib : headers ] ;
 
-Translator HPGSTranslator :
+
-	# HPGSTranslator classes
+local architectureObject ;
-	ConfigView.cpp
+for architectureObject in [ MultiArchSubDirSetup ] {
-	HPGSTranslator.cpp
+	on $(architectureObject) {
-	$(sources)
+UseLibraryHeaders iconv ;
-	: be translation libtextencoding.so
+UseBuildFeatureHeaders libpng ;
-		[ BuildFeatureAttribute libpng : library ]
+UseBuildFeatureHeaders zlib ;
-		[ BuildFeatureAttribute zlib : library ]
+
-		libtranslatorsutils.a $(TARGET_LIBSUPC++) localestub
+		Translator [ MultiArchDefaultGristFiles HPGSTranslator ] :
-	: true
+			# HPGSTranslator classes
-;
+			ConfigView.cpp
+			HPGSTranslator.cpp
+			$(sources)
+			: be translation libtextencoding.so
+				[ BuildFeatureAttribute libpng : library ]
+				[ BuildFeatureAttribute zlib : library ]
+				[ 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 ;
-	HVIFMain.cpp
+for architectureObject in [ MultiArchSubDirSetup ] {
-	HVIFTranslator.cpp
+	on $(architectureObject) {
-	HVIFView.cpp
+		Translator [ MultiArchDefaultGristFiles HVIFTranslator ] :
-	: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++)
+			HVIFMain.cpp
-	localestub
+			HVIFTranslator.cpp
-	: true
+			HVIFView.cpp
-;
+			: 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,23 +57,35 @@ 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 ] ;
 
-	# ICNSTranslator
+		UseBuildFeatureHeaders libpng ;
-	ICNSTranslator.cpp
+		Translator [ MultiArchDefaultGristFiles ICNSTranslator ] :
-	ICNSLoader.cpp
-	ConfigView.cpp
-	main.cpp
 
-	$(openjpeg_files)
+			# ICNSTranslator
-	
+			ICNSTranslator.cpp
-	$(libicns_files)
+			ICNSLoader.cpp
+			ConfigView.cpp
+			main.cpp
 
-	: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++)
+			$(openjpeg_files)
-	[ BuildFeatureAttribute libpng : library ]
+			
-	localestub
+			$(libicns_files)
-	: true
+
-;
+			: 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 ;
-	# ICOTranslator classes
+for architectureObject in [ MultiArchSubDirSetup ] {
-	main.cpp
+	on $(architectureObject) {
-	ICOTranslator.cpp
+		Translator [ MultiArchDefaultGristFiles ICOTranslator ] :
-	ConfigView.cpp
+			# ICOTranslator classes
-	ICO.cpp
+			main.cpp
-	: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++)
+			ICOTranslator.cpp
-	localestub
+			ConfigView.cpp
-	: true
+			ICO.cpp
-;
+			: 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 ;
-	be_jdatadst.cpp
+for architectureObject in [ MultiArchSubDirSetup ] {
-	be_jdatasrc.cpp
+	on $(architectureObject) {
-	be_jerror.cpp
+		Translator [ MultiArchDefaultGristFiles JPEGTranslator ] :
-	exif_parser.cpp
+			be_jdatadst.cpp
-	JPEGTranslator.cpp
+			be_jdatasrc.cpp
-	: be translation libtranslatorsutils.a
+			be_jerror.cpp
-	[ BuildFeatureAttribute jpeg : library ]
+			exif_parser.cpp
-	$(TARGET_LIBSTDC++) localestub
+			JPEGTranslator.cpp
-	: true
+			: 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 ] ;
 
-	# JPEG2000Translator
+		ObjectCcFlags [ FGristFiles $(jasper_files:S=$(SUFOBJ)) ] : -w ;
-	JPEG2000Translator.cpp
 
-	$(jasper_files)
+		Translator [ MultiArchDefaultGristFiles JPEG2000Translator ] :
 
-	: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++)
+			# JPEG2000Translator
-	localestub
+			JPEG2000Translator.cpp
-	: true
+
-;
+			$(jasper_files)
+
+			: 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;
+	unsigned int i;
-	int j;
+	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 ;
-	# PCXTranslator classes
+for architectureObject in [ MultiArchSubDirSetup ] {
-	main.cpp
+	on $(architectureObject) {
-	PCXTranslator.cpp
+		Translator [ MultiArchDefaultGristFiles PCXTranslator ] :
-	ConfigView.cpp
+			# PCXTranslator classes
-	PCX.cpp
+			main.cpp
-	: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) localestub
+			PCXTranslator.cpp
-	: true
+			ConfigView.cpp
-;
+			PCX.cpp
+			: 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,21 +10,30 @@ if $(TARGET_GCC_VERSION_$(TARGET_PACKAGING_ARCH)[1]) = 2 {
 	SubDirCcFlags -DPNG_NO_PEDANTIC_WARNINGS ;
 }
 
-Includes [ FGristFiles PNGTranslator.cpp PNGView.cpp ]
+local architectureObject ;
-	: [ BuildFeatureAttribute libpng : headers ] ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		UseBuildFeatureHeaders libpng ;
+		UseBuildFeatureHeaders zlib ;
 
-Translator PNGTranslator : 
+		Includes [ FGristFiles PNGTranslator.cpp PNGView.cpp ]
-	PNGMain.cpp
+			: [ BuildFeatureAttribute libpng : headers ] ;
-	PNGTranslator.cpp
-	PNGView.cpp
 
-	: be translation
+		Translator [ MultiArchDefaultGristFiles PNGTranslator ] : 
-		[ BuildFeatureAttribute libpng : library ]
+			PNGMain.cpp
-		[ BuildFeatureAttribute zlib : library ]
+			PNGTranslator.cpp
-		$(TARGET_LIBSUPC++) libtranslatorsutils.a
+			PNGView.cpp
-		localestub
+
-	: true
+		: be translation
-;
+			[ BuildFeatureAttribute libpng : library ]
+			[ BuildFeatureAttribute zlib : library ]
+			$(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 ;
-	: PPMMain.cpp PPMTranslator.cpp colorspace.cpp
+for architectureObject in [ MultiArchSubDirSetup ] {
-	: be translation $(TARGET_LIBSUPC++) localestub
+	on $(architectureObject) {
-	: true
+		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 ;
-	PSDTranslatorApp.cpp
+for architectureObject in [ MultiArchSubDirSetup ] {
-	PSDTranslator.cpp
+	on $(architectureObject) {
-	PSDLoader.cpp
+		Translator [ MultiArchDefaultGristFiles PSDTranslator ] :
-	ConfigView.cpp
+			PSDTranslatorApp.cpp
-	: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++)
+			PSDTranslator.cpp
-	localestub
+			PSDLoader.cpp
-	: true
+			ConfigView.cpp
-;
+			: 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 ;
-	# RawTranslator classes
+for architectureObject in [ MultiArchSubDirSetup ] {
-	main.cpp
+	on $(architectureObject) {
-	RAWTranslator.cpp
+		Translator [ MultiArchDefaultGristFiles RAWTranslator ] :
-	ConfigView.cpp
+			# RawTranslator classes
-	RAW.cpp
+			main.cpp
-	: 
+			RAWTranslator.cpp
-	be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) 
+			ConfigView.cpp
-	localestub
+			RAW.cpp
-	: 
+			: 
-	true
+			be translation 
-;
+			[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
+			$(TARGET_LIBSUPC++) localestub
+			: 
+			true
+		;
+	}
+}
 
 DoCatalogs RAWTranslator :
 	x-vnd.Haiku-RAWTranslator

src/add-ons/translators/rtf/Jamfile

@@ -10,17 +10,24 @@ UsePrivateHeaders shared storage ;
 
 AddResources RTFTranslator : RTFTranslator.rdef ;
 
-Translator RTFTranslator :
+local architectureObject ;
-	main.cpp
+for architectureObject in [ MultiArchSubDirSetup ] {
-	ConfigView.cpp
+	on $(architectureObject) {
+		Translator [ MultiArchDefaultGristFiles RTFTranslator ] :
+			main.cpp
+			ConfigView.cpp
 
-	convert.cpp
+			convert.cpp
-	RTF.cpp
+			RTF.cpp
-	RTFTranslator.cpp
+			RTFTranslator.cpp
 
-	: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) localestub
+			: be translation 
-	: true
+			[ 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 ;
-	SGIImage.cpp
+for architectureObject in [ MultiArchSubDirSetup ] {
-	SGIMain.cpp
+	on $(architectureObject) {
-	SGITranslator.cpp
+		Translator [ MultiArchDefaultGristFiles SGITranslator ] :
-	SGIView.cpp
+			SGIImage.cpp
-	: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) localestub
+			SGIMain.cpp
-	: true
+			SGITranslator.cpp
-;
+			SGIView.cpp
+			: 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 ;
-	BaseTranslator.cpp
+for architectureObject in [ MultiArchSubDirSetup ] {
-	StreamBuffer.cpp
+	on $(architectureObject) {
-	TranslatorSettings.cpp
+		StaticLibrary [ MultiArchDefaultGristFiles libtranslatorsutils.a ] :
-	TranslatorWindow.cpp
+			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 ;
-	STXTMain.cpp
+for architectureObject in [ MultiArchSubDirSetup ] {
-	STXTTranslator.cpp
+	on $(architectureObject) {
-	STXTView.cpp
+		Translator [ MultiArchDefaultGristFiles STXTTranslator ] :
-	: be translation libtextencoding.so libtranslatorsutils.a 
+			STXTMain.cpp
-	$(TARGET_LIBSUPC++) localestub
+			STXTTranslator.cpp
-	: true
+			STXTView.cpp
-;
+			: 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 ;
-	TGAMain.cpp
+for architectureObject in [ MultiArchSubDirSetup ] {
-	TGATranslator.cpp
+	on $(architectureObject) {
-	TGAView.cpp
+		Translator [ MultiArchDefaultGristFiles TGATranslator ] :
-	: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) localestub
+			TGAMain.cpp
-	: true
+			TGATranslator.cpp
-;
+			TGAView.cpp
+			: be translation 
+			[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
+			$(TARGET_LIBSUPC++) localestub
+			: true
+		;
+	}
+}
 
 DoCatalogs TGATranslator :
 	x-vnd.Haiku-TGATranslator

src/add-ons/translators/tiff/Jamfile

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

src/add-ons/translators/webp/Jamfile

@@ -7,20 +7,25 @@ SubDirHdrs [ FDirName $(SUBDIR) libwebp ] ;
 
 AddResources WebPTranslator : WebPTranslator.rdef ;
 
-Translator WebPTranslator :
+local architectureObject ;
+for architectureObject in [ MultiArchSubDirSetup ] {
+	on $(architectureObject) {
+		Translator [ MultiArchDefaultGristFiles WebPTranslator ] :
 
-	main.cpp
+			main.cpp
 
-	WebPTranslator.cpp
+			WebPTranslator.cpp
-	ConfigView.cpp
+			ConfigView.cpp
 
-	:
+			:
-	<libwebp>webpdecode.o
+			<libwebp>webpdecode.o
-	<libwebp>webpencode.o
+			<libwebp>webpencode.o
-	be translation libtranslatorsutils.a
+			be translation [ MultiArchDefaultGristFiles libtranslatorsutils.a ]
-	$(TARGET_LIBSUPC++)	localestub
+			$(TARGET_LIBSUPC++)	localestub
-	: true
+			: 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,25 +10,33 @@ AddResources WonderBrushTranslator : WonderBrushTranslator.rdef ;
 Includes [ FGristFiles bitmap_compression.cpp ]
 	: [ BuildFeatureAttribute zlib : headers ] ;
 
-Translator WonderBrushTranslator :
+local architectureObject ;
-	Canvas.cpp
+for architectureObject in [ MultiArchSubDirSetup ] {
-	Layer.cpp
+	on $(architectureObject) {
-	WonderBrushImage.cpp
+		# Include support sub folder
-	WonderBrushMain.cpp
+		SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators wonderbrush support ] ;
-	WonderBrushTranslator.cpp
-	WonderBrushView.cpp
 
-	# support
+		Translator [ MultiArchDefaultGristFiles WonderBrushTranslator ] :
-	bitmap_compression.cpp
+			Canvas.cpp
-	blending.cpp
+			Layer.cpp
-	lab_convert.cpp
+			WonderBrushImage.cpp
+			WonderBrushMain.cpp
+			WonderBrushTranslator.cpp
+			WonderBrushView.cpp
 
-	: be translation
+			# support
-	[ BuildFeatureAttribute zlib : library ]
+			bitmap_compression.cpp
-	libtranslatorsutils.a
+			blending.cpp
-	$(TARGET_LIBSUPC++) localestub
+			lab_convert.cpp
-	: true
+
-;
+			: be translation
+			[ BuildFeatureAttribute zlib : library ]
+			[ MultiArchDefaultGristFiles libtranslatorsutils.a ]
+			$(TARGET_LIBSUPC++) localestub
+			: true
+		;
+	}
+}
 
 DoCatalogs WonderBrushTranslator :
 	x-vnd.Haiku-WonderBrushTranslator