i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added libtranslatorsutils.a and used it in every translator instead of reusing sources

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24067 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2008-02-22 18:39:39 +00:00
parent a409d733e9
commit a9c0a648b1
15 changed files with 39 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/translators/Jamfile
+1
View File
@@ -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 raw ;
SubInclude HAIKU_TOP src add-ons translators rtf ; SubInclude HAIKU_TOP src add-ons translators rtf ;
SubInclude HAIKU_TOP src add-ons translators sgi ; 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 stxt ;
SubInclude HAIKU_TOP src add-ons translators tga ; SubInclude HAIKU_TOP src add-ons translators tga ;
SubInclude HAIKU_TOP src add-ons translators tiff ; SubInclude HAIKU_TOP src add-ons translators tiff ;
src/add-ons/translators/bmp/Jamfile
+2 -9
View File
@@ -2,21 +2,14 @@ SubDir HAIKU_TOP src add-ons translators bmp ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
# Include BaseTranslator code from shared directory SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators shared ] ;
Translator BMPTranslator : Translator BMPTranslator :
# shared classes
BaseTranslator.cpp
TranslatorSettings.cpp
TranslatorWindow.cpp
# BMPTranslator classes
BMPMain.cpp BMPMain.cpp
BMPTranslator.cpp BMPTranslator.cpp
BMPView.cpp BMPView.cpp
: be translation : be translation libtranslatorsutils.a
: true : true
; ;
src/add-ons/translators/exr/Jamfile
+2 -9
View File
@@ -5,8 +5,7 @@ SubDirSysHdrs [ FDirName $(SUBDIR) openexr iex ] ;
SubDirSysHdrs [ FDirName $(SUBDIR) openexr ilmimf ] ; SubDirSysHdrs [ FDirName $(SUBDIR) openexr ilmimf ] ;
SubDirSysHdrs [ FDirName $(SUBDIR) openexr imath ] ; SubDirSysHdrs [ FDirName $(SUBDIR) openexr imath ] ;
# Include code from shared translator directory SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators shared ] ;
Translator EXRTranslator : Translator EXRTranslator :
main.cpp main.cpp
@@ -14,13 +13,7 @@ Translator EXRTranslator :
EXRGamma.cpp EXRGamma.cpp
EXRTranslator.cpp EXRTranslator.cpp
IStreamWrapper.cpp IStreamWrapper.cpp
: be translation libilmimf.so $(TARGET_LIBSTDC++) libtranslatorsutils.a
# shared classes
BaseTranslator.cpp
TranslatorSettings.cpp
TranslatorWindow.cpp
: be translation libilmimf.so $(TARGET_LIBSTDC++)
: true : true
; ;
src/add-ons/translators/hpgs/Jamfile
+2 -10
View File
@@ -3,9 +3,7 @@ SubDir HAIKU_TOP src add-ons translators hpgs ;
SubDirSysHdrs [ FDirName $(SUBDIR) lib ] ; SubDirSysHdrs [ FDirName $(SUBDIR) lib ] ;
SubDirCcFlags -DHPGS_SHARED -std=c99 ; SubDirCcFlags -DHPGS_SHARED -std=c99 ;
UseLibraryHeaders zlib png ; UseLibraryHeaders zlib png ;
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
# Include code from shared translator directory
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators shared ] ;
local sources = local sources =
hpgsbase.c hpgsbase.c
@@ -46,13 +44,7 @@ Translator HPGSTranslator :
ConfigView.cpp ConfigView.cpp
HPGSTranslator.cpp HPGSTranslator.cpp
$(sources) $(sources)
: be translation libpng.so libtextencoding.so libz.so libtranslatorsutils.a
# shared classes
BaseTranslator.cpp
TranslatorSettings.cpp
TranslatorWindow.cpp
: be translation libpng.so libtextencoding.so libz.so
: true : true
; ;
src/add-ons/translators/ico/Jamfile
+2 -9
View File
@@ -2,8 +2,7 @@ SubDir HAIKU_TOP src add-ons translators ico ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
# Include code from shared translator directory SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators shared ] ;
Translator ICOTranslator : Translator ICOTranslator :
# ICOTranslator classes # ICOTranslator classes
@@ -11,13 +10,7 @@ Translator ICOTranslator :
ICOTranslator.cpp ICOTranslator.cpp
ConfigView.cpp ConfigView.cpp
ICO.cpp ICO.cpp
: be translation libtranslatorsutils.a
# shared classes
BaseTranslator.cpp
TranslatorSettings.cpp
TranslatorWindow.cpp
: be translation
: true : true
; ;
src/add-ons/translators/pcx/Jamfile
+2 -9
View File
@@ -2,8 +2,7 @@ SubDir HAIKU_TOP src add-ons translators pcx ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
# Include code from shared translator directory SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators shared ] ;
Translator PCXTranslator : Translator PCXTranslator :
# PCXTranslator classes # PCXTranslator classes
@@ -11,13 +10,7 @@ Translator PCXTranslator :
PCXTranslator.cpp PCXTranslator.cpp
ConfigView.cpp ConfigView.cpp
PCX.cpp PCX.cpp
: be translation libtranslatorsutils.a
# shared classes
BaseTranslator.cpp
TranslatorSettings.cpp
TranslatorWindow.cpp
: be translation
: true : true
; ;
src/add-ons/translators/png/Jamfile
+3 -12
View File
@@ -2,24 +2,15 @@ SubDir HAIKU_TOP src add-ons translators png ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
UseLibraryHeaders zlib ; UseLibraryHeaders png zlib ;
UseLibraryHeaders png ; SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
# Include BaseTranslator code from shared directory
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators shared ] ;
Translator PNGTranslator : Translator PNGTranslator :
# shared classes
BaseTranslator.cpp
TranslatorSettings.cpp
TranslatorWindow.cpp
# PNGTranslator classes
PNGMain.cpp PNGMain.cpp
PNGTranslator.cpp PNGTranslator.cpp
PNGView.cpp PNGView.cpp
: be translation libpng.a z : be translation libpng.a z libtranslatorsutils.a
: true : true
; ;
src/add-ons/translators/raw/Jamfile
+2 -9
View File
@@ -2,8 +2,7 @@ SubDir HAIKU_TOP src add-ons translators raw ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
# Include code from shared translator directory SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators shared ] ;
Translator RAWTranslator : Translator RAWTranslator :
# RawTranslator classes # RawTranslator classes
@@ -11,13 +10,7 @@ Translator RAWTranslator :
RAWTranslator.cpp RAWTranslator.cpp
ConfigView.cpp ConfigView.cpp
RAW.cpp RAW.cpp
: be translation libtranslatorsutils.a
# shared classes
BaseTranslator.cpp
TranslatorSettings.cpp
TranslatorWindow.cpp
: be translation
: true : true
; ;
src/add-ons/translators/rtf/Jamfile
+3 -8
View File
@@ -2,13 +2,12 @@ SubDir HAIKU_TOP src add-ons translators rtf ;
SetSubDirSupportedPlatformsBeOSCompatible ; 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 # It's called RTF-Translator (with a dash) to differentiate it from the
# RTFTranslator that comes with Gobe Productive (that doesn't support # RTFTranslator that comes with Gobe Productive (that doesn't support
# STXT or plain text files output). # STXT or plain text files output).
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
Translator RTF-Translator : Translator RTF-Translator :
# RTFTranslator classes # RTFTranslator classes
main.cpp main.cpp
@@ -16,11 +15,7 @@ Translator RTF-Translator :
ConfigView.cpp ConfigView.cpp
RTF.cpp RTF.cpp
convert.cpp convert.cpp
: be translation libtranslatorsutils.a
# shared classes
TranslatorWindow.cpp
: be translation
: true : true
; ;
src/add-ons/translators/sgi/Jamfile
+2 -9
View File
@@ -2,22 +2,15 @@ SubDir HAIKU_TOP src add-ons translators sgi ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
# Include BaseTranslator code from shared directory SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators shared ] ;
Translator SGITranslator : Translator SGITranslator :
# shared classes
BaseTranslator.cpp
TranslatorSettings.cpp
TranslatorWindow.cpp
# SGITranslator classes
SGIImage.cpp SGIImage.cpp
SGIMain.cpp SGIMain.cpp
SGITranslator.cpp SGITranslator.cpp
SGIView.cpp SGIView.cpp
: be translation : be translation libtranslatorsutils.a
: true : true
; ;
src/add-ons/translators/shared/Jamfile
+10
View File
@@ -0,0 +1,10 @@
SubDir HAIKU_TOP src add-ons translators shared ;
SetSubDirSupportedPlatformsBeOSCompatible ;
StaticLibrary libtranslatorsutils.a :
BaseTranslator.cpp
StreamBuffer.cpp
TranslatorSettings.cpp
TranslatorWindow.cpp
;
src/add-ons/translators/stxt/Jamfile
+2 -10
View File
@@ -6,21 +6,13 @@ UsePrivateHeaders textencoding ;
UseHeaders [ FDirName $(HAIKU_TOP) src servers registrar ] ; UseHeaders [ FDirName $(HAIKU_TOP) src servers registrar ] ;
# for the text identification # for the text identification
# Include BaseTranslator code from shared directory SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators shared ] ;
Translator STXTTranslator : Translator STXTTranslator :
# shared classes
BaseTranslator.cpp
TranslatorSettings.cpp
TranslatorWindow.cpp
# STXTTranslator classes
STXTMain.cpp STXTMain.cpp
STXTTranslator.cpp STXTTranslator.cpp
STXTView.cpp STXTView.cpp
: be translation libtextencoding.so libtranslatorsutils.a
: be translation libtextencoding.so
: true : true
; ;
src/add-ons/translators/tga/Jamfile
+2 -11
View File
@@ -2,22 +2,13 @@ SubDir HAIKU_TOP src add-ons translators tga ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
# Include BaseTranslator code from shared directory SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators shared ] ;
Translator TGATranslator : Translator TGATranslator :
# shared classes
BaseTranslator.cpp
TranslatorSettings.cpp
TranslatorWindow.cpp
StreamBuffer.cpp
# TGATranslator classes
TGAMain.cpp TGAMain.cpp
TGATranslator.cpp TGATranslator.cpp
TGAView.cpp TGAView.cpp
: be translation libtranslatorsutils.a
: be translation
: true : true
; ;
src/add-ons/translators/tiff/Jamfile
+2 -8
View File
@@ -4,8 +4,7 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
UseLibraryHeaders zlib ; UseLibraryHeaders zlib ;
# Include BaseTranslator code from shared directory SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators shared ] ;
local tiff_files = local tiff_files =
# libtiff # libtiff
@@ -50,17 +49,12 @@ ObjectCcFlags [ FGristFiles $(tiff_files:S=$(SUFOBJ)) ] : -w ;
Translator TIFFTranslator : Translator TIFFTranslator :
[ FGristFiles $(tiff_files:S=$(SUFOBJ)) ] [ FGristFiles $(tiff_files:S=$(SUFOBJ)) ]
# shared classes
BaseTranslator.cpp
TranslatorSettings.cpp
TranslatorWindow.cpp
# TIFFTranslator classes # TIFFTranslator classes
TIFFMain.cpp TIFFMain.cpp
TIFFTranslator.cpp TIFFTranslator.cpp
TIFFView.cpp TIFFView.cpp
: be translation z : be translation z libtranslatorsutils.a
: true : true
; ;
src/add-ons/translators/wonderbrush/Jamfile
+2 -10
View File
@@ -2,21 +2,13 @@ SubDir HAIKU_TOP src add-ons translators wonderbrush ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
# Include BaseTranslator code from shared directory
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators shared ] ;
# Include support sub folder # Include support sub folder
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators wonderbrush support ] ; SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons translators wonderbrush support ] ;
UseLibraryHeaders zlib ; UseLibraryHeaders zlib ;
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
Translator WonderBrushTranslator : Translator WonderBrushTranslator :
# shared classes
BaseTranslator.cpp
TranslatorSettings.cpp
TranslatorWindow.cpp
# WonderBrushTranslator classes
Canvas.cpp Canvas.cpp
Layer.cpp Layer.cpp
WonderBrushImage.cpp WonderBrushImage.cpp
@@ -29,7 +21,7 @@ Translator WonderBrushTranslator :
blending.cpp blending.cpp
lab_convert.cpp lab_convert.cpp
: be translation z : be translation z libtranslatorsutils.a
: true : true
; ;