Merge branch 'master' of ssh://git.onelab.eu/git/build

[build.git] / onelab.mk

diff --git a/onelab.mk b/onelab.mk
index 141ab28..bc2376f 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -110,9 +110,6 @@ ALL += umts-frontend
 #
 iptables-MODULES := iptables
 iptables-SPEC := iptables.spec
-ifeq "$(PLDISTROTAGS)" "onelab-k27-tags.mk"
-iptables-BUILD-FROM-SRPM := yes
-endif
 iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
 ALL += iptables
 IN_BOOTSTRAPFS += iptables
@@ -449,6 +446,14 @@ omf-expctl-MODULES := omf
 omf-expctl-SPEC := omf-expctl.spec
 ALL += omf-expctl
 
+#
+# OML measurement library
+#
+oml-MODULES := oml
+oml-DEVEL-RPMS += sqlite-devel libpcap-devel check
+oml-SPEC := liboml.spec
+ALL += oml
+
 #
 # bootcd
 #