JPEGTranslator Jamfile: Fix build feature dependencies

Move jpeg build feature references into the architecture loop. While
they have the same name, these actually are different build features
(using different packages).
This commit is contained in:
Ingo Weinhold 2013-12-05 21:09:49 +01:00
parent 1604cdaef8
commit fdfd52743b

View File

@ -8,17 +8,13 @@ SubDirSysHdrs [ FDirName $(SUBDIR) $(DOTDOT) raw ] ;
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
#for BaseTranslator.h and friends #for BaseTranslator.h and friends
UseBuildFeatureHeaders jpeg ;
AddResources JPEGTranslator : JPEGTranslator.rdef ; AddResources JPEGTranslator : JPEGTranslator.rdef ;
Includes [ FGristFiles be_jdatadst.cpp be_jdatasrc.cpp be_jerror.cpp
JPEGTranslator.cpp ]
: [ BuildFeatureAttribute jpeg : headers ] ;
local architectureObject ; local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup ] { for architectureObject in [ MultiArchSubDirSetup ] {
on $(architectureObject) { on $(architectureObject) {
UseBuildFeatureHeaders jpeg ;
Translator [ MultiArchDefaultGristFiles JPEGTranslator ] : Translator [ MultiArchDefaultGristFiles JPEGTranslator ] :
be_jdatadst.cpp be_jdatadst.cpp
be_jdatasrc.cpp be_jdatasrc.cpp
@ -30,7 +26,11 @@ for architectureObject in [ MultiArchSubDirSetup ] {
[ BuildFeatureAttribute jpeg : library ] [ BuildFeatureAttribute jpeg : library ]
$(TARGET_LIBSTDC++) localestub $(TARGET_LIBSTDC++) localestub
: true : true
; ;
Includes [ FGristFiles be_jdatadst.cpp be_jdatasrc.cpp be_jerror.cpp
JPEGTranslator.cpp ]
: [ BuildFeatureAttribute jpeg : headers ] ;
} }
} }