[haiku-commits] haiku: hrev46495 - src/add-ons/translators/jpeg

From: ingo_weinhold@xxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Thu, 5 Dec 2013 21:11:38 +0100 (CET)
hrev46495 adds 1 changeset to branch 'master'
old head: 1604cdaef8112a6039e7564c5da90b64d97d70dc
new head: fdfd52743b04a2f8e75ef595d65103d52685ce1c
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=fdfd527+%5E1604cda

----------------------------------------------------------------------------

fdfd527: 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).

                                    [ Ingo Weinhold <ingo_weinhold@xxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev46495
Commit:      fdfd52743b04a2f8e75ef595d65103d52685ce1c
URL:         http://cgit.haiku-os.org/haiku/commit/?id=fdfd527
Author:      Ingo Weinhold <ingo_weinhold@xxxxxx>
Date:        Thu Dec  5 20:09:49 2013 UTC

----------------------------------------------------------------------------

1 file changed, 7 insertions(+), 7 deletions(-)
src/add-ons/translators/jpeg/Jamfile | 14 +++++++-------

----------------------------------------------------------------------------

diff --git a/src/add-ons/translators/jpeg/Jamfile 
b/src/add-ons/translators/jpeg/Jamfile
index 4b7f374..0591cc9 100644
--- a/src/add-ons/translators/jpeg/Jamfile
+++ b/src/add-ons/translators/jpeg/Jamfile
@@ -8,17 +8,13 @@ SubDirSysHdrs [ FDirName $(SUBDIR) $(DOTDOT) raw ] ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
        #for BaseTranslator.h and friends
 
-UseBuildFeatureHeaders jpeg ;
-
 AddResources JPEGTranslator : JPEGTranslator.rdef ;
 
-Includes [ FGristFiles be_jdatadst.cpp be_jdatasrc.cpp be_jerror.cpp
-               JPEGTranslator.cpp ]
-       : [ BuildFeatureAttribute jpeg : headers ] ;
-
 local architectureObject ;
 for architectureObject in [ MultiArchSubDirSetup ] {
        on $(architectureObject) {
+               UseBuildFeatureHeaders jpeg ;
+
                Translator [ MultiArchDefaultGristFiles JPEGTranslator ] :
                        be_jdatadst.cpp
                        be_jdatasrc.cpp
@@ -30,7 +26,11 @@ for architectureObject in [ MultiArchSubDirSetup ] {
                        [ BuildFeatureAttribute jpeg : library ]
                        $(TARGET_LIBSTDC++) localestub
                        : true
-               ;
+                       ;
+
+               Includes [ FGristFiles be_jdatadst.cpp be_jdatasrc.cpp 
be_jerror.cpp
+                               JPEGTranslator.cpp ]
+                       : [ BuildFeatureAttribute jpeg : headers ] ;
        }
 }
[haiku-commits] haiku: hrev46495 - src/add-ons/translators/jpeg

Other related posts:
