X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=onelab.mk;h=29a2e45973a7cc38a3125997284a16e04e5ee368;hb=6e3b86e56dd2c16974877da9196e620fe565c3a8;hp=88562d5e98b005bf0bbef98ffbaba12980f1752f;hpb=ec40dfe668bf865a84b0168dde534f1845bbbf0f;p=build.git

diff --git a/onelab.mk b/onelab.mk
index 88562d5e..29a2e459 100644
--- a/onelab.mk
+++ b/onelab.mk
@@ -56,9 +56,6 @@ ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \
         kernel_arch=$(kernel.rpm-arch)
 ALL += ipfwslice
 
-# this doesn't build on f12 - weird all right - I suspect gcc to be smarter but that needs investigation
-# is madwifi still current anyway ? should we move to ath5k instead ?
-#ifneq "$(DISTRONAME)" "f12"
 #
 # madwifi
 #
@@ -71,7 +68,6 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
 	kernel_arch=$(kernel.rpm-arch)
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
-#endif
 
 # 
 # nozomi
@@ -366,7 +362,11 @@ ALL += pyaspects
 ejabberd-MODULES := ejabberd
 ejabberd-SPEC := ejabberd.spec
 ejabberd-BUILD-FROM-SRPM := yes
+# not needed anymore on f12 and above, that come with 2.1.5, and we had 2.1.3
+# so, this is relevant on f8 and centos5 only
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
 ALL += ejabberd
+endif
 
 # sfa now uses the with statement that's not supported on python-2.4 - not even through __future__
 build_sfa=true
@@ -383,6 +383,10 @@ sfa-SPEC := sfa.spec
 ALL += sfa
 endif
 
+sface-MODULES := sface
+sface-SPEC := sface.spec
+ALL += sface
+
 #
 # nodeconfig
 #