X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=onelab.mk;h=6b8ab5d2e3c233592195eb344b2cfa24271d2648;hb=d3763ac1b2a4c239bc63c3f479a9c36af7ae8ae7;hp=7364dd56dfd2bac5c05ee9a83284970034936cf9;hpb=acd2d273cb97ce57f6c6600d7b7550f6f4d64200;p=build.git diff --git a/onelab.mk b/onelab.mk index 7364dd56..6b8ab5d2 100644 --- a/onelab.mk +++ b/onelab.mk @@ -405,26 +405,6 @@ pyaspects-SPEC := pyaspects.spec pyaspects-BUILD-FROM-SRPM := yes ALL += pyaspects -# sfa now uses the with statement that's not supported on python-2.4 - not even through __future__ -# In addition we now use sqlalchemy and 0.5 as per f12 is not compatible with our model -build_sfa=true -ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f12 centos5)" -build_sfa=false -endif - -ifeq "$(build_sfa)" "true" -# -# sfa - Slice Facility Architecture -# -sfa-MODULES := sfa -sfa-SPEC := sfa.spec -ALL += sfa - -sface-MODULES := sface -sface-SPEC := sface.spec -ALL += sface -endif - # # nodeconfig # @@ -584,6 +564,33 @@ release-SPEC := myplc-release.spec release-RPMDATE := yes ALL += release +############################## +# sfa now uses the with statement that's not supported on python-2.4 - not even through __future__ +# In addition we now use sqlalchemy and 0.5 as per f12 is not compatible with our model +build_sfa=true +ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f12 centos5)" +build_sfa=false +endif + +ifeq "$(build_sfa)" "true" +# +# sfa - Slice Facility Architecture +# +sfa-MODULES := sfa +sfa-SPEC := sfa.spec +ALL += sfa + +sface-MODULES := sface +sface-SPEC := sface.spec +ALL += sface +endif + +############################## myslice-MODULES := myslice myslice-SPEC := myslice.spec -#ALL += myslice +ALL += myslice + +manifold-MODULES := manifold +manifold-SPEC := manifold.spec +# not yet though +#ALL += manifold