X-Git-Url: http://git.onelab.eu/?p=wextoolbox.git;a=blobdiff_plain;f=gnuradio.mk;h=fae014a8f09fd6761157e06c901d299107489bc9;hp=8c80a3dcfcf0a3059188bdf9ea20bdc4edfa8285;hb=0fe43a9d6d3c46dd2e9f54f0b697adb12e7d1e1f;hpb=2878288ca5d570c2059509323acb5e7333f586c8

diff --git a/gnuradio.mk b/gnuradio.mk
index 8c80a3d..fae014a 100644
--- a/gnuradio.mk
+++ b/gnuradio.mk
@@ -5,7 +5,7 @@
 # Copyright (C) 2003-2006 The Trustees of Princeton University
 # rewritten by Thierry Parmentelat - INRIA Sophia Antipolis
 #
-# $Id: onelab.mk 12446 2009-03-12 00:09:58Z thierry $
+# $Id$
 #
 # see doc in Makefile  
 #
@@ -25,19 +25,18 @@ kernel-RPMFLAGS:= --target i686
 else
 kernel-RPMFLAGS:= --target $(HOSTARCH)
 endif
-kernel-SPECVARS := iwlwifi=1
-KERNELS += kernel
+### # 2.6.27 not yet ready for this
+#kernel-SPECVARS := iwlwifi=1
+### tmp
+kernel-RPMDATE := yes
+ALL += kernel
 
-kernels: $(KERNELS)
-kernels-clean: $(foreach package,$(KERNELS),$(package)-clean)
-
-ALL += $(KERNELS)
 # this is to mark on which image a given rpm is supposed to go
-IN_BOOTCD += $(KERNELS)
-IN_VSERVER += $(KERNELS)
-IN_BOOTSTRAPFS += $(KERNELS)
+IN_BOOTCD += kernel
+IN_VSERVER += kernel
+IN_BOOTSTRAPFS += kernel
 # turns out myplc installs kernel-vserver
-IN_MYPLC += $(KERNELS)
+IN_MYPLC += kernel
 
 #
 # madwifi
@@ -52,25 +51,26 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
 
-# 
-# nozomi
-# 
-nozomi-MODULES := nozomi
-nozomi-SPEC := nozomi.spec
-nozomi-DEPEND-DEVEL-RPMS := kernel-devel
-nozomi-SPECVARS = kernel_version=$(kernel.rpm-version) \
-	kernel_release=$(kernel.rpm-release) \
-	kernel_arch=$(kernel.rpm-arch)
-IN_BOOTSTRAPFS += nozomi
-ALL += nozomi
-
-#
-# comgt
-# 
-comgt-MODULES := comgt
-comgt-SPEC := comgt.spec
-IN_BOOTSTRAPFS += comgt
-ALL += comgt
+### # 2.6.27 not yet ready for this
+### # 
+### # nozomi
+### # 
+### nozomi-MODULES := nozomi
+### nozomi-SPEC := nozomi.spec
+### nozomi-DEPEND-DEVEL-RPMS := kernel-devel
+### nozomi-SPECVARS = kernel_version=$(kernel.rpm-version) \
+### 	kernel_release=$(kernel.rpm-release) \
+### 	kernel_arch=$(kernel.rpm-arch)
+### IN_BOOTSTRAPFS += nozomi
+### ALL += nozomi
+### 
+### #
+### # comgt
+### # 
+### comgt-MODULES := comgt
+### comgt-SPEC := comgt.spec
+### IN_BOOTSTRAPFS += comgt
+### ALL += comgt
 
 #
 # util-vserver
@@ -224,14 +224,6 @@ endif
 IN_BOOTSTRAPFS += vsys
 ALL += vsys
 
-#
-# dummynet_image
-# 
-dummynet_image-MODULES := dummynet_image
-dummynet_image-SPEC := dummynet_image.spec
-IN_MYPLC += dummynet_image
-ALL += dummynet_image
-
 #
 # PLCAPI
 #
@@ -265,21 +257,21 @@ www-register-wizard-SPEC := www-register-wizard.spec
 ALL += www-register-wizard
 IN_MYPLC += www-register-wizard
 
-#
-# monitor
-#
-monitor-MODULES := Monitor
-monitor-SPEC := Monitor.spec
-ALL += monitor
-IN_BOOTSTRAPFS += monitor
-
-#
-# zabbix
-#
-zabbix-MODULES := Monitor
-zabbix-SPEC := zabbix.spec
-zabbix-BUILD-FROM-SRPM := yes
-ALL += zabbix
+### #
+### # monitor
+### #
+### monitor-MODULES := Monitor
+### monitor-SPEC := Monitor.spec
+### ALL += monitor
+### IN_BOOTSTRAPFS += monitor
+### 
+### #
+### # zabbix
+### #
+### zabbix-MODULES := Monitor
+### zabbix-SPEC := zabbix.spec
+### zabbix-BUILD-FROM-SRPM := yes
+### ALL += zabbix
 
 #
 # nodeconfig
@@ -382,7 +374,7 @@ ALL += myplc
 # myplc-docs only contains docs for PLCAPI and NMAPI, but
 # we still need to pull MyPLC, as it is where the specfile lies, 
 # together with the utility script docbook2drupal.sh
-myplc-docs-MODULES := MyPLC PLCAPI NodeManager
+myplc-docs-MODULES := MyPLC PLCAPI NodeManager Monitor
 myplc-docs-SPEC := myplc-docs.spec
 ALL += myplc-docs