X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=wextoolbox.mk;h=299ca33f8284768a15ac2e1c6174570ec0792c50;hb=60e4a1125ec0364e9334499eaef9f7a44875bec9;hp=3e6405c13643f64f4144dc68b927cbe435f0ea39;hpb=89d7694e7f4b9022573bef78068fd487e3248916;p=wextoolbox.git

diff --git a/wextoolbox.mk b/wextoolbox.mk
index 3e6405c..299ca33 100644
--- a/wextoolbox.mk
+++ b/wextoolbox.mk
@@ -22,6 +22,68 @@
 # see doc in Makefile  
 #
 
+#
+# boost
+# 
+# we rebuild this one only b/c f10 only has 1.34 and gnuradio needs >= 1.35
+# this build is based on the f11 rpm, i.e. boost-1.37
+#
+boost-MODULES := boost
+boost-SPEC := boost.spec
+boost-BUILD-FROM-SRPM := yes
+ALL += boost
+IN_BOOTSTRAPFS += boost
+
+#
+# gnuradio
+#
+gnuradio-MODULES := gnuradio
+gnuradio-SPEC := gnuradio.spec
+gnuradio-BUILD-FROM-SRPM := yes
+# boost-devel needs boost !
+gnuradio-DEPEND-DEVEL-RPMS := boost boost-devel
+ALL += gnuradio
+IN_BOOTSTRAPFS += gnuradio
+
+#
+# bbn
+#
+bbn-MODULES := bbn_80211
+bbn-SPEC := bbn_80211.spec
+bbn-BUILD-FROM-SRPM := yes
+bbn-DEPEND-DEVEL-RPMS := gnuradio gnuradio-devel boost boost-devel
+ALL += bbn
+IN_BOOTSTRAPFS += bbn
+
+#
+# crunchxml
+#
+crunchxml-MODULES := crunchxml
+crunchxml-SPEC := crunchxml.spec
+crunchxml-BUILD-FROM-SRPM := yes
+ALL += crunchxml
+IN_BOOTSTRAPFS += crunchxml
+
+#
+# spectools
+#
+spectools-MODULES := spectools
+spectools-SPEC := spectools.spec
+spectools-BUILD-FROM-SRPM := yes
+ALL += spectools
+IN_BOOTSTRAPFS += spectools
+
+#
+# sge
+#
+sge-MODULES := sge
+sge-SPEC := sge.spec
+sge-BUILD-FROM-SRPM := yes
+# turning this off - current focus is on deploying the sge box separately from myplc
+# packaging is still broken, and we're exploring a ready-t-o-use distro on centos
+# ALL += sge
+# IN_BOOTSTRAPFS += sge
+
 #
 # kernel
 #
@@ -67,25 +129,6 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
 
-#
-# boost
-#
-boost-MODULES := boost
-boost-SPEC := boost.spec
-boost-BUILD-FROM-SRPM := yes
-ALL += boost
-IN_BOOTSTRAPFS += boost
-
-#
-# gnuradio
-#
-gnuradio-MODULES := gnuradio
-gnuradio-SPEC := gnuradio.spec
-gnuradio-BUILD-FROM-SRPM := yes
-gnuradio-DEPEND-DEVEL-RPMS := boost-devel
-ALL += gnuradio
-IN_BOOTSTRAPFS += gnuradio
-
 #
 # util-vserver
 #
@@ -279,6 +322,13 @@ www-register-wizard-SPEC := www-register-wizard.spec
 ALL += www-register-wizard
 IN_MYPLC += www-register-wizard
 
+#
+# pcucontrol
+#
+pcucontrol-MODULES := pcucontrol
+pcucontrol-SPEC := pcucontrol.spec
+ALL += pcucontrol
+
 #
 # monitor
 #
@@ -321,7 +371,7 @@ ALL += sfa
 #
 # nodeconfig
 #
-nodeconfig-MODULES := nodeconfig build
+nodeconfig-MODULES := nodeconfig
 nodeconfig-SPEC := nodeconfig.spec
 ALL += nodeconfig
 IN_MYPLC += nodeconfig