diff --git a/src/add-ons/translators/Jamfile b/src/add-ons/translators/Jamfile index e2a6ee561b..400ba9aacd 100644 --- a/src/add-ons/translators/Jamfile +++ b/src/add-ons/translators/Jamfile @@ -13,6 +13,7 @@ SubInclude HAIKU_TOP src add-ons translators ppm ; SubInclude HAIKU_TOP src add-ons translators raw ; SubInclude HAIKU_TOP src add-ons translators rtf ; SubInclude HAIKU_TOP src add-ons translators sgi ; +SubInclude HAIKU_TOP src add-ons translators shared ; SubInclude HAIKU_TOP src add-ons translators stxt ; SubInclude HAIKU_TOP src add-ons translators tga ; SubInclude HAIKU_TOP src add-ons translators tiff ; diff --git a/src/add-ons/translators/bmp/Jamfile b/src/add-ons/translators/bmp/Jamfile index efeefab7c2..18246c8553 100644 --- a/src/add-ons/translators/bmp/Jamfile +++ b/src/add-ons/translators/bmp/Jamfile @@ -2,21 +2,14 @@ SubDir HAIKU_TOP src add-ons translators bmp ; SetSubDirSupportedPlatformsBeOSCompatible ; -# Include BaseTranslator code from shared directory -SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators shared ] ; +SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; Translator BMPTranslator : - # shared classes - BaseTranslator.cpp - TranslatorSettings.cpp - TranslatorWindow.cpp - - # BMPTranslator classes BMPMain.cpp BMPTranslator.cpp BMPView.cpp - : be translation + : be translation libtranslatorsutils.a : true ; diff --git a/src/add-ons/translators/exr/Jamfile b/src/add-ons/translators/exr/Jamfile index aa04531da2..b255668eb3 100644 --- a/src/add-ons/translators/exr/Jamfile +++ b/src/add-ons/translators/exr/Jamfile @@ -5,8 +5,7 @@ SubDirSysHdrs [ FDirName $(SUBDIR) openexr iex ] ; SubDirSysHdrs [ FDirName $(SUBDIR) openexr ilmimf ] ; SubDirSysHdrs [ FDirName $(SUBDIR) openexr imath ] ; -# Include code from shared translator directory -SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators shared ] ; +SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; Translator EXRTranslator : main.cpp @@ -14,13 +13,7 @@ Translator EXRTranslator : EXRGamma.cpp EXRTranslator.cpp IStreamWrapper.cpp - - # shared classes - BaseTranslator.cpp - TranslatorSettings.cpp - TranslatorWindow.cpp - - : be translation libilmimf.so $(TARGET_LIBSTDC++) + : be translation libilmimf.so $(TARGET_LIBSTDC++) libtranslatorsutils.a : true ; diff --git a/src/add-ons/translators/hpgs/Jamfile b/src/add-ons/translators/hpgs/Jamfile index 5ea67b8523..a445bd86cf 100644 --- a/src/add-ons/translators/hpgs/Jamfile +++ b/src/add-ons/translators/hpgs/Jamfile @@ -3,9 +3,7 @@ SubDir HAIKU_TOP src add-ons translators hpgs ; SubDirSysHdrs [ FDirName $(SUBDIR) lib ] ; SubDirCcFlags -DHPGS_SHARED -std=c99 ; UseLibraryHeaders zlib png ; - -# Include code from shared translator directory -SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators shared ] ; +SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; local sources = hpgsbase.c @@ -46,13 +44,7 @@ Translator HPGSTranslator : ConfigView.cpp HPGSTranslator.cpp $(sources) - - # shared classes - BaseTranslator.cpp - TranslatorSettings.cpp - TranslatorWindow.cpp - - : be translation libpng.so libtextencoding.so libz.so + : be translation libpng.so libtextencoding.so libz.so libtranslatorsutils.a : true ; diff --git a/src/add-ons/translators/ico/Jamfile b/src/add-ons/translators/ico/Jamfile index acbbe5a6d8..a629ae8eda 100644 --- a/src/add-ons/translators/ico/Jamfile +++ b/src/add-ons/translators/ico/Jamfile @@ -2,8 +2,7 @@ SubDir HAIKU_TOP src add-ons translators ico ; SetSubDirSupportedPlatformsBeOSCompatible ; -# Include code from shared translator directory -SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators shared ] ; +SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; Translator ICOTranslator : # ICOTranslator classes @@ -11,13 +10,7 @@ Translator ICOTranslator : ICOTranslator.cpp ConfigView.cpp ICO.cpp - - # shared classes - BaseTranslator.cpp - TranslatorSettings.cpp - TranslatorWindow.cpp - - : be translation + : be translation libtranslatorsutils.a : true ; diff --git a/src/add-ons/translators/pcx/Jamfile b/src/add-ons/translators/pcx/Jamfile index ede992989e..006fa6b9e6 100644 --- a/src/add-ons/translators/pcx/Jamfile +++ b/src/add-ons/translators/pcx/Jamfile @@ -2,8 +2,7 @@ SubDir HAIKU_TOP src add-ons translators pcx ; SetSubDirSupportedPlatformsBeOSCompatible ; -# Include code from shared translator directory -SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators shared ] ; +SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; Translator PCXTranslator : # PCXTranslator classes @@ -11,13 +10,7 @@ Translator PCXTranslator : PCXTranslator.cpp ConfigView.cpp PCX.cpp - - # shared classes - BaseTranslator.cpp - TranslatorSettings.cpp - TranslatorWindow.cpp - - : be translation + : be translation libtranslatorsutils.a : true ; diff --git a/src/add-ons/translators/png/Jamfile b/src/add-ons/translators/png/Jamfile index 98e32c4a6b..acdf7a8b70 100644 --- a/src/add-ons/translators/png/Jamfile +++ b/src/add-ons/translators/png/Jamfile @@ -2,24 +2,15 @@ SubDir HAIKU_TOP src add-ons translators png ; SetSubDirSupportedPlatformsBeOSCompatible ; -UseLibraryHeaders zlib ; -UseLibraryHeaders png ; - -# Include BaseTranslator code from shared directory -SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators shared ] ; +UseLibraryHeaders png zlib ; +SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; Translator PNGTranslator : - # shared classes - BaseTranslator.cpp - TranslatorSettings.cpp - TranslatorWindow.cpp - - # PNGTranslator classes PNGMain.cpp PNGTranslator.cpp PNGView.cpp - : be translation libpng.a z + : be translation libpng.a z libtranslatorsutils.a : true ; diff --git a/src/add-ons/translators/raw/Jamfile b/src/add-ons/translators/raw/Jamfile index 14a6d2bc60..200e841467 100644 --- a/src/add-ons/translators/raw/Jamfile +++ b/src/add-ons/translators/raw/Jamfile @@ -2,8 +2,7 @@ SubDir HAIKU_TOP src add-ons translators raw ; SetSubDirSupportedPlatformsBeOSCompatible ; -# Include code from shared translator directory -SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators shared ] ; +SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; Translator RAWTranslator : # RawTranslator classes @@ -11,13 +10,7 @@ Translator RAWTranslator : RAWTranslator.cpp ConfigView.cpp RAW.cpp - - # shared classes - BaseTranslator.cpp - TranslatorSettings.cpp - TranslatorWindow.cpp - - : be translation + : be translation libtranslatorsutils.a : true ; diff --git a/src/add-ons/translators/rtf/Jamfile b/src/add-ons/translators/rtf/Jamfile index 159e4d08c0..83814f3824 100644 --- a/src/add-ons/translators/rtf/Jamfile +++ b/src/add-ons/translators/rtf/Jamfile @@ -2,13 +2,12 @@ SubDir HAIKU_TOP src add-ons translators rtf ; SetSubDirSupportedPlatformsBeOSCompatible ; -# Include code from shared translator directory -SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators shared ] ; - # It's called RTF-Translator (with a dash) to differentiate it from the # RTFTranslator that comes with Gobe Productive (that doesn't support # STXT or plain text files output). +SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; + Translator RTF-Translator : # RTFTranslator classes main.cpp @@ -16,11 +15,7 @@ Translator RTF-Translator : ConfigView.cpp RTF.cpp convert.cpp - - # shared classes - TranslatorWindow.cpp - - : be translation + : be translation libtranslatorsutils.a : true ; diff --git a/src/add-ons/translators/sgi/Jamfile b/src/add-ons/translators/sgi/Jamfile index a1c6d3c58c..9b04b7f84a 100644 --- a/src/add-ons/translators/sgi/Jamfile +++ b/src/add-ons/translators/sgi/Jamfile @@ -2,22 +2,15 @@ SubDir HAIKU_TOP src add-ons translators sgi ; SetSubDirSupportedPlatformsBeOSCompatible ; -# Include BaseTranslator code from shared directory -SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators shared ] ; +SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; Translator SGITranslator : - # shared classes - BaseTranslator.cpp - TranslatorSettings.cpp - TranslatorWindow.cpp - - # SGITranslator classes SGIImage.cpp SGIMain.cpp SGITranslator.cpp SGIView.cpp - : be translation + : be translation libtranslatorsutils.a : true ; diff --git a/src/add-ons/translators/shared/Jamfile b/src/add-ons/translators/shared/Jamfile new file mode 100644 index 0000000000..46c086fd0a --- /dev/null +++ b/src/add-ons/translators/shared/Jamfile @@ -0,0 +1,10 @@ +SubDir HAIKU_TOP src add-ons translators shared ; + +SetSubDirSupportedPlatformsBeOSCompatible ; + +StaticLibrary libtranslatorsutils.a : + BaseTranslator.cpp + StreamBuffer.cpp + TranslatorSettings.cpp + TranslatorWindow.cpp + ; diff --git a/src/add-ons/translators/stxt/Jamfile b/src/add-ons/translators/stxt/Jamfile index f2d5b2fc24..c69491db22 100644 --- a/src/add-ons/translators/stxt/Jamfile +++ b/src/add-ons/translators/stxt/Jamfile @@ -6,21 +6,13 @@ UsePrivateHeaders textencoding ; UseHeaders [ FDirName $(HAIKU_TOP) src servers registrar ] ; # for the text identification -# Include BaseTranslator code from shared directory -SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators shared ] ; +SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; Translator STXTTranslator : - # shared classes - BaseTranslator.cpp - TranslatorSettings.cpp - TranslatorWindow.cpp - - # STXTTranslator classes STXTMain.cpp STXTTranslator.cpp STXTView.cpp - - : be translation libtextencoding.so + : be translation libtextencoding.so libtranslatorsutils.a : true ; diff --git a/src/add-ons/translators/tga/Jamfile b/src/add-ons/translators/tga/Jamfile index bdb2653740..bbb28381b8 100644 --- a/src/add-ons/translators/tga/Jamfile +++ b/src/add-ons/translators/tga/Jamfile @@ -2,22 +2,13 @@ SubDir HAIKU_TOP src add-ons translators tga ; SetSubDirSupportedPlatformsBeOSCompatible ; -# Include BaseTranslator code from shared directory -SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators shared ] ; +SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; Translator TGATranslator : - # shared classes - BaseTranslator.cpp - TranslatorSettings.cpp - TranslatorWindow.cpp - StreamBuffer.cpp - - # TGATranslator classes TGAMain.cpp TGATranslator.cpp TGAView.cpp - - : be translation + : be translation libtranslatorsutils.a : true ; diff --git a/src/add-ons/translators/tiff/Jamfile b/src/add-ons/translators/tiff/Jamfile index 2754d35dd1..e0228d1dac 100644 --- a/src/add-ons/translators/tiff/Jamfile +++ b/src/add-ons/translators/tiff/Jamfile @@ -4,8 +4,7 @@ SetSubDirSupportedPlatformsBeOSCompatible ; UseLibraryHeaders zlib ; -# Include BaseTranslator code from shared directory -SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators shared ] ; +SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; local tiff_files = # libtiff @@ -50,17 +49,12 @@ ObjectCcFlags [ FGristFiles $(tiff_files:S=$(SUFOBJ)) ] : -w ; Translator TIFFTranslator : [ FGristFiles $(tiff_files:S=$(SUFOBJ)) ] - # shared classes - BaseTranslator.cpp - TranslatorSettings.cpp - TranslatorWindow.cpp - # TIFFTranslator classes TIFFMain.cpp TIFFTranslator.cpp TIFFView.cpp - : be translation z + : be translation z libtranslatorsutils.a : true ; diff --git a/src/add-ons/translators/wonderbrush/Jamfile b/src/add-ons/translators/wonderbrush/Jamfile index eb7c81f528..17f53d50eb 100644 --- a/src/add-ons/translators/wonderbrush/Jamfile +++ b/src/add-ons/translators/wonderbrush/Jamfile @@ -2,21 +2,13 @@ SubDir HAIKU_TOP src add-ons translators wonderbrush ; SetSubDirSupportedPlatformsBeOSCompatible ; -# Include BaseTranslator code from shared directory -SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators shared ] ; - # Include support sub folder SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators wonderbrush support ] ; UseLibraryHeaders zlib ; +SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; Translator WonderBrushTranslator : - # shared classes - BaseTranslator.cpp - TranslatorSettings.cpp - TranslatorWindow.cpp - - # WonderBrushTranslator classes Canvas.cpp Layer.cpp WonderBrushImage.cpp @@ -29,7 +21,7 @@ Translator WonderBrushTranslator : blending.cpp lab_convert.cpp - : be translation z + : be translation z libtranslatorsutils.a : true ;