X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=onelab.mk;h=5ea3fffa6eea9dda588e23b818928178e8ebc869;hb=0fde40e1c4e611499ac0feef2b9605cb12f35ddd;hp=7c8110b77b1c8508beeab034f219e223708c1589;hpb=9aec93f48071046b373c65789207c5d7ebed008c;p=build.git diff --git a/onelab.mk b/onelab.mk index 7c8110b7..5ea3fffa 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 # @@ -583,3 +563,34 @@ release-MODULES := myplc 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 + +############################## +# don't build these by default, we have separate builds for that +myslice-MODULES := myslice +myslice-SPEC := myslice.spec +#ALL += myslice + +manifold-MODULES := manifold +manifold-SPEC := manifold.spec +#ALL += manifold