X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab.mk;h=7238dbba6f88731da3208f329310a6a2d9d632ab;hb=refs%2Fheads%2Fnm-one-spec;hp=9e21653321fde2e6713df24594dad32716d24f81;hpb=bdae0da152e4740e6665a7a65a4383e653172d95;p=build.git

diff --git a/planetlab.mk b/planetlab.mk
index 9e216533..7238dbba 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -1,135 +1,184 @@
 #
-# PlanetLab standard components list
-#
+# declare the packages to be built and their dependencies
+# initial version from Mark Huang
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2006 The Trustees of Princeton University
-#
-# $Id$
+# rewritten by Thierry Parmentelat - INRIA Sophia Antipolis
 #
 # see doc in Makefile  
 #
+
+# mkinitrd
+#
+ifeq "$(PLDISTROTAGS)" "planetlab-k32-tags.mk"
+ifeq "$(DISTRONAME)" "centos5"
+mkinitrd-MODULES := mkinitrd
+mkinitrd-SPEC := mkinitrd.spec
+mkinitrd-BUILD-FROM-SRPM := yes
+mkinitrd-STOCK-DEVEL-RPMS += parted-devel glib2-devel libdhcp4client-devel libdhcp6client-devel libdhcp-devel 
+mkinitrd-STOCK-DEVEL-RPMS += device-mapper libselinux-devel libsepol-devel libnl-devel
+ALL += mkinitrd
+IN_BOOTCD += mkinitrd
+IN_SLICEIMAGE += mkinitrd 
+IN_NODEIMAGE += mkinitrd
+IN_MYPLC += mkinitrd
+endif
+endif
 #
 # kernel
 #
-# until we are able to build the new kernel layout:
-# use the old exploded-tree, 2.6.20-based, version on fc4, 6 & 7
-# and the new one on f8 - that requires the build-id patch
-
-# 
 # use a package name with srpm in it:
-# in this case the srpm is created by running make srpm in the codebase
+# so the source rpm is created by running make srpm in the codebase
 #
 
-srpm-kernel-$(HOSTARCH)-MODULES := linux-patches
-srpm-kernel-$(HOSTARCH)-SPEC := kernel-2.6-planetlab.spec
-ifeq ($(HOSTARCH),i386)
-srpm-kernel-$(HOSTARCH)-RPMFLAGS:= --target i686
+kernel-MODULES := linux-2.6
+kernel-SPEC := kernel-2.6.spec
+kernel-BUILD-FROM-SRPM := yes
+ifeq "$(HOSTARCH)" "i386"
+kernel-RPMFLAGS:= --target i686
 else
-srpm-kernel-$(HOSTARCH)-RPMFLAGS:= --target $(HOSTARCH)
+kernel-RPMFLAGS:= --target $(HOSTARCH)
 endif
-KERNELS += srpm-kernel-$(HOSTARCH)
-
-#else
-#kernel-$(HOSTARCH)-MODULES := linux-tree
-#kernel-$(HOSTARCH)-SPEC := scripts/kernel-2.6-planetlab.spec
-#ifeq ($(HOSTARCH),i386)
-#kernel-$(HOSTARCH)-RPMFLAGS:= --target i686
-#else
-#kernel-$(HOSTARCH)-RPMFLAGS:= --target $(HOSTARCH)
-#endif
-#KERNELS += kernel-$(HOSTARCH)
-#endif
+kernel-SPECVARS += kernelconfig=planetlab
+KERNELS += kernel
 
-kernel: $(KERNELS)
-kernel-clean: $(foreach package,$(KERNELS),$(package)-clean)
+kernels: $(KERNELS)
+kernels-clean: $(foreach package,$(KERNELS),$(package)-clean)
 
 ALL += $(KERNELS)
-
-# the first kernel package defined here
-kernel_package := $(word 1,$(KERNELS))
+# this is to mark on which image a given rpm is supposed to go
+IN_BOOTCD += $(KERNELS)
+IN_SLICEIMAGE += $(KERNELS)
+IN_NODEIMAGE += $(KERNELS)
+
+#
+# madwifi
+#
+# skip this with k32/f8
+ifneq "" "$(findstring k32,$(PLDISTROTAGS))"
+ifneq "$(DISTRONAME)" "f8"
+madwifi-MODULES := madwifi
+madwifi-SPEC := madwifi.spec
+madwifi-BUILD-FROM-SRPM := yes
+madwifi-LOCAL-DEVEL-RPMS += kernel-devel
+madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
+	kernel_release=$(kernel.rpm-release) \
+	kernel_arch=$(kernel.rpm-arch)
+ALL += madwifi
+IN_NODEIMAGE += madwifi
+endif
+endif
 
 #
-# libnl
+# iptables
 #
-# [daniel]    wait for latest Fedora release 
-# (03:29:46 PM) daniel_hozac: interfacing with the kernel directly when dealing with netlink was fugly, so... i had to find something nicer.
-# (03:29:53 PM) daniel_hozac: the one in Fedora is lacking certain APIs i need.
+iptables-MODULES := iptables
+iptables-SPEC := iptables.spec
+iptables-BUILD-FROM-SRPM := yes	
+iptables-LOCAL-DEVEL-RPMS += kernel-devel kernel-headers
+ALL += iptables
+IN_NODEIMAGE += iptables
+
 #
-libnl-MODULES := libnl
-libnl-SPEC := libnl.spec
-ALL += libnl
+# iproute
+#
+iproute-MODULES := iproute2
+iproute-SPEC := iproute.spec
+iproute-BUILD-FROM-SRPM := yes	
+ALL += iproute
+IN_NODEIMAGE += iproute
+IN_SLICEIMAGE += iproute
+IN_BOOTCD += iproute
 
 #
 # util-vserver
 #
 util-vserver-MODULES := util-vserver
 util-vserver-SPEC := util-vserver.spec
-util-vserver-RPMFLAGS:= --without dietlibc
-util-vserver-DEPENDDEVELS := libnl
+# starting with 0.4
+util-vserver-BUILD-FROM-SRPM := yes
+util-vserver-RPMFLAGS:= --without dietlibc --without doc
 ALL += util-vserver
+IN_NODEIMAGE += util-vserver
 
 #
-# NodeUpdate
+# libnl - local import
+# we need either 1.1 or at least 1.0.pre6
+# rebuild this on centos5 - see yumexclude
 #
-NodeUpdate-MODULES := NodeUpdate
-NodeUpdate-SPEC := NodeUpdate.spec
-ALL += NodeUpdate
+local_libnl=false
+ifeq "$(DISTRONAME)" "centos5"
+local_libnl=true
+endif
+
+ifeq "$(local_libnl)" "true"
+libnl-MODULES := libnl
+libnl-SPEC := libnl.spec
+libnl-BUILD-FROM-SRPM := yes
+# this sounds like the thing to do, but in fact linux/if_vlan.h comes with kernel-headers
+libnl-LOCAL-DEVEL-RPMS += kernel-devel kernel-headers
+ALL += libnl
+IN_NODEIMAGE += libnl
+endif
 
 #
-# ipod
+# util-vserver-pl
 #
-PingOfDeath-MODULES := PingOfDeath
-PingOfDeath-SPEC := ipod.spec
-ALL += PingOfDeath
+util-vserver-pl-MODULES := util-vserver-pl
+util-vserver-pl-SPEC := util-vserver-pl.spec
+util-vserver-pl-LOCAL-DEVEL-RPMS += util-vserver-lib util-vserver-devel util-vserver-core 
+ifeq "$(local_libnl)" "true"
+util-vserver-pl-LOCAL-DEVEL-RPMS += libnl libnl-devel
+endif
+ALL += util-vserver-pl
+IN_NODEIMAGE += util-vserver-pl
 
 #
-# NodeManager
+# NodeUpdate
 #
-NodeManager-MODULES := NodeManager
-NodeManager-SPEC := NodeManager.spec
-ALL += NodeManager
+nodeupdate-MODULES := nodeupdate
+nodeupdate-SPEC := NodeUpdate.spec
+ALL += nodeupdate
+IN_NODEIMAGE += nodeupdate
 
 #
-# pl_sshd
+# ipod
 #
-pl_sshd-MODULES := pl_sshd
-pl_sshd-SPEC := pl_sshd.spec
-ALL += pl_sshd
+ipod-MODULES := PingOfDeath
+ipod-SPEC := ipod.spec
+ALL += ipod
+IN_NODEIMAGE += ipod
 
 #
-# libhttpd++: 
-#
-# Deprecate when vsys takes over [sapan].
-# keep in build for proper.
+# plnode-utils
+# 
+plnode-utils-MODULES := plnode-utils
+plnode-utils-SPEC := plnode-utils-vs.spec
+ALL += plnode-utils
+IN_NODEIMAGE += plnode-utils
+
+# nodemanager
 #
-libhttpd++-MODULES := libhttpd++
-libhttpd++-SPEC := libhttpd++.spec
-ALL += libhttpd++
+nodemanager-MODULES := nodemanager
+nodemanager-SPEC := nodemanager.spec
+ALL += nodemanager
+IN_NODEIMAGE += nodemanager
 
 #
-# proper: Privileged Operations Service
+# pl_sshd
 #
-proper-MODULES := proper
-proper-SPEC := proper.spec
-#proper-RPMBUILD := sudo bash ./rpmbuild.sh
-proper-DEPENDDEVELS := libhttpd++
-ALL += proper
+sshd-MODULES := pl_sshd
+sshd-SPEC := pl_sshd.spec
+ALL += sshd
+IN_NODEIMAGE += sshd
 
 #
 # codemux: Port 80 demux
 #
-codemux-MODULES := CoDemux
+codemux-MODULES := codemux
 codemux-SPEC   := codemux.spec
-codemux-RPMBUILD := sudo bash ./rpmbuild.sh
 ALL += codemux
-
-#
-# ulogd
-#
-ulogd-MODULES := ulogd
-ulogd-SPEC := ulogd.spec
-ulogd-DEPENDDEVELS := $(kernel_package) proper
-ALL += ulogd
+IN_NODEIMAGE += codemux
 
 #
 # fprobe-ulog
@@ -137,78 +186,203 @@ ALL += ulogd
 fprobe-ulog-MODULES := fprobe-ulog
 fprobe-ulog-SPEC := fprobe-ulog.spec
 ALL += fprobe-ulog
+IN_NODEIMAGE += fprobe-ulog
 
 #
-# netflow
+# DistributedRateLimiting
 #
-netflow-MODULES := PlanetFlow
-netflow-SPEC := netflow.spec
-ALL += netflow
+DistributedRateLimiting-MODULES := DistributedRateLimiting
+DistributedRateLimiting-SPEC := DistributedRateLimiting.spec
+ALL += DistributedRateLimiting
+IN_NODEREPO += DistributedRateLimiting
 
 #
-# PlanetLab Mom: Cleans up your mess
+# pf2slice
 #
-pl_mom-MODULES := Mom
-pl_mom-SPEC := pl_mom.spec
-ALL += pl_mom
+pf2slice-MODULES := pf2slice
+pf2slice-SPEC := pf2slice.spec
+ALL += pf2slice
 
 #
-# iptables
+# PlanetLab Mom: Cleans up your mess
 #
-iptables-MODULES := iptables
-iptables-SPEC := iptables.spec
-iptables-DEPENDDEVELS := $(kernel_package)
-ALL += iptables
+mom-MODULES := mom
+mom-SPEC := pl_mom.spec
+ALL += mom
+IN_NODEIMAGE += mom
 
 #
-# iproute
+# inotify-tools - local import
+# rebuild this on centos5 (not found) - see yumexclude
 #
-iproute-MODULES := iproute2
-iproute-SPEC := iproute.spec
-ALL += iproute
+local_inotify_tools=false
+ifeq "$(DISTRONAME)" "centos5"
+local_inotify_tools=true
+endif
+
+ifeq "$(DISTRONAME)" "sl6"
+local_inotify_tools=true
+endif
+
+ifeq "$(local_inotify_tools)" "true"
+inotify-tools-MODULES := inotify-tools
+inotify-tools-SPEC := inotify-tools.spec
+inotify-tools-BUILD-FROM-SRPM := yes
+IN_NODEIMAGE += inotify-tools
+ALL += inotify-tools
+endif
 
 #
-# util-python
-#
-# [marc]    deprecate with proper
+# openvswitch
 #
-#util-python-MODULES := util-python
-#util-python-SPEC := util-python.spec
-#ALL += util-python
+openvswitch-MODULES := openvswitch
+openvswitch-SPEC := openvswitch.spec
+openvswitch-LOCAL-DEVEL-RPMS += kernel-devel
+
+#ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14 f15 f16)"
+#IN_NODEIMAGE += openvswitch
+#ALL += openvswitch
+#endif
 
 #
 # vsys
 #
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
-ifeq ($(DISTRO),"Fedora")
-ifeq ($(RELEASE),7)
+# ocaml-docs is not needed anymore but keep it on a tmp basis as some tags may still have it
+vsys-STOCK-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
+ifeq "$(local_inotify_tools)" "true"
+vsys-LOCAL-DEVEL-RPMS += inotify-tools inotify-tools-devel
+endif
+IN_NODEIMAGE += vsys
 ALL += vsys
+
+#
+# vsyssh : installed in slivers
+#
+vsyssh-MODULES := vsys
+vsyssh-SPEC := vsyssh.spec
+IN_SLICEIMAGE += vsyssh
+ALL += vsyssh
+
+#
+# vsys-scripts
+#
+vsys-scripts-MODULES := vsys-scripts
+vsys-scripts-SPEC := root-context/vsys-scripts.spec
+IN_NODEIMAGE += vsys-scripts
+ALL += vsys-scripts
+
+#
+# plcapi
+#
+plcapi-MODULES := plcapi
+plcapi-SPEC := PLCAPI.spec
+ALL += plcapi
+IN_MYPLC += plcapi
+
+#
+# drupal
+# 
+drupal-MODULES := drupal
+drupal-SPEC := drupal.spec
+drupal-BUILD-FROM-SRPM := yes
+ALL += drupal
+IN_MYPLC += drupal
+
+#
+# use the plewww module instead
+#
+plewww-MODULES := plewww
+plewww-SPEC := plewww.spec
+ALL += plewww
+IN_MYPLC += plewww
+
+#
+# www-register-wizard
+#
+www-register-wizard-MODULES := www-register-wizard
+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
+#
+monitor-MODULES := monitor
+monitor-SPEC := Monitor.spec
+monitor-STOCK-DEVEL-RPMS += net-snmp net-snmp-devel
+ALL += monitor
+IN_NODEIMAGE += monitor
+
+#
+# PLC RT
+#
+plcrt-MODULES := PLCRT
+plcrt-SPEC := plcrt.spec
+ALL += plcrt
+
+# f12 has 0.9-1 already
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
+#
+# pyopenssl
+#
+pyopenssl-MODULES := pyopenssl
+pyopenssl-SPEC := pyOpenSSL.spec
+pyopenssl-BUILD-FROM-SRPM := yes
+ALL += pyopenssl
 endif
+
+#
+# pyaspects
+#
+pyaspects-MODULES := pyaspects
+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"
 #
-# PLCAPI
+# sfa - Slice Facility Architecture
 #
-PLCAPI-MODULES := PLCAPI
-PLCAPI-SPEC := PLCAPI.spec
-ALL += PLCAPI
+sfa-MODULES := sfa
+sfa-SPEC := sfa.spec
+ALL += sfa
+
+sface-MODULES := sface
+sface-SPEC := sface.spec
+ALL += sface
+endif
 
 #
-# PLCWWW
+# nodeconfig
 #
-PLCWWW-MODULES := WWW
-PLCWWW-SPEC := PLCWWW.spec
-ALL += PLCWWW
+nodeconfig-MODULES := nodeconfig
+nodeconfig-SPEC := nodeconfig.spec
+ALL += nodeconfig
+IN_MYPLC += nodeconfig
 
 #
 # bootmanager
 #
-bootmanager-MODULES := BootManager build
+bootmanager-MODULES := bootmanager
 bootmanager-SPEC := bootmanager.spec
-# Package must be built as root
-bootmanager-RPMBUILD := sudo bash ./rpmbuild.sh
 ALL += bootmanager
+IN_MYPLC += bootmanager
 
 #
 # pypcilib : used in bootcd
@@ -216,80 +390,131 @@ ALL += bootmanager
 pypcilib-MODULES := pypcilib
 pypcilib-SPEC := pypcilib.spec
 ALL += pypcilib
-
-# copy the current list, so as to keep image-building rpms out
-ALL-REGULARS := $(ALL)
+IN_BOOTCD += pypcilib
 
 #
-# vserver : reference image for slices
+# pyplnet
 #
-vserver-MODULES := VserverReference build
-vserver-SPEC := vserver-reference.spec
-# Package must be built as root
-vserver-RPMBUILD := sudo bash ./rpmbuild.sh
-# package requires all regular packages
-vserver-DEPENDS := $(ALL-REGULARS)
-vserver-DEPENDFILES := RPMS/yumgroups.xml
-ALL += vserver
+pyplnet-MODULES := pyplnet
+pyplnet-SPEC := pyplnet.spec
+ALL += pyplnet
+IN_NODEIMAGE += pyplnet
+IN_MYPLC += pyplnet
+IN_BOOTCD += pyplnet
 
 #
-# bootcd
+# OMF resource controller
 #
-bootcd-MODULES := BootCD BootManager build
-bootcd-SPEC := bootcd.spec
-bootcd-RPMBUILD := sudo bash ./rpmbuild.sh
-# package has *some* dependencies, at least these ones
-bootcd-DEPENDS := $(ALL-REGULARS)
-bootcd-DEPENDFILES := RPMS/yumgroups.xml
-ALL += bootcd
+omf-resctl-MODULES := omf
+omf-resctl-SPEC := omf-resctl.spec
+ALL += omf-resctl
+IN_SLICEIMAGE += omf-resctl
 
 #
-# bootstrapfs
+# OMF exp controller
 #
-bootstrapfs-MODULES := BootstrapFS build
-bootstrapfs-SPEC := bootstrapfs.spec
-bootstrapfs-RPMBUILD := sudo bash ./rpmbuild.sh
-# package requires all regular packages
-bootstrapfs-DEPENDS := $(ALL-REGULARS)
-bootstrapfs-DEPENDFILES := RPMS/yumgroups.xml
-ALL += bootstrapfs
+omf-expctl-MODULES := omf
+omf-expctl-SPEC := omf-expctl.spec
+ALL += omf-expctl
 
 #
-# myplc : initial, chroot-based packaging
+# bootcd
 #
-myplc-MODULES := MyPLC build
-myplc-SPEC := myplc.spec
-# Package must be built as root
-myplc-RPMBUILD := sudo bash ./rpmbuild.sh
-# myplc may require all packages
-myplc-DEPENDS := $(filter-out vserver,$(ALL))
-myplc-DEPENDFILES := RPMS/yumgroups.xml
-ALL += myplc
+bootcd-MODULES := bootcd build
+bootcd-SPEC := bootcd.spec
+bootcd-DEPEND-PACKAGES := $(IN_BOOTCD)
+bootcd-DEPEND-FILES := RPMS/yumgroups.xml
+bootcd-RPMDATE := yes
+ALL += bootcd
+IN_MYPLC += bootcd
 
 #
-# MyPLC native : lightweight packaging, dependencies are yum-installed in a vserver
+# images for slices
 #
-myplc-native-MODULES := MyPLC build 
-myplc-native-SPEC := myplc-native.spec
-# Package must be built as root
-myplc-native-RPMBUILD := sudo bash ./rpmbuild.sh
-# Thierry : don't depend on these at build-time
-#myplc-native-DEPENDS := $(MyPLC-DEPENDS)
-# Thierry : dunno about this one, let's stay safe
-myplc-native-DEPENDFILES := $(MyPLC-DEPENDFILES)
-#ALL += myplc-native
+sliceimage-MODULES := sliceimage build
+sliceimage-SPEC := sliceimage.spec
+sliceimage-DEPEND-PACKAGES := $(IN_SLICEIMAGE)
+sliceimage-DEPEND-FILES := RPMS/yumgroups.xml
+sliceimage-RPMDATE := yes
+ALL += sliceimage
+IN_NODEIMAGE += sliceimage
 
 #
-# MyPLC development environment : chroot-based 
-#
-myplc-devel-MODULES := MyPLC build 
-myplc-devel-SPEC := myplc-devel.spec
-myplc-devel-RPMBUILD := sudo bash ./rpmbuild.sh
-#ALL += myplc-devel
+# vserver-specific sliceimage initialization
+# 
+vserver-sliceimage-MODULES := sliceimage
+vserver-sliceimage-SPEC    := vserver-sliceimage.spec
+vserver-sliceimage-RPMDATE := yes
+ALL			   += vserver-sliceimage
+IN_NODEIMAGE		   += vserver-sliceimage
+
+#
+# nodeimage
+#
+nodeimage-MODULES := nodeimage build
+nodeimage-SPEC := nodeimage.spec
+nodeimage-DEPEND-PACKAGES := $(IN_NODEIMAGE)
+nodeimage-DEPEND-FILES := RPMS/yumgroups.xml
+nodeimage-RPMDATE := yes
+ALL += nodeimage
+IN_MYPLC += nodeimage
+
+#
+# noderepo
+#
+# all rpms resulting from packages marked as being in nodeimage and sliceimage
+NODEREPO_RPMS = $(foreach package,$(IN_NODEIMAGE) $(IN_NODEREPO) $(IN_SLICEIMAGE),$($(package).rpms))
+# replace space with +++ (specvars cannot deal with spaces)
+SPACE=$(subst x, ,x)
+NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS))
+
+noderepo-MODULES := nodeimage
+noderepo-SPEC := noderepo.spec
+# package requires all embedded packages
+noderepo-DEPEND-PACKAGES := $(IN_NODEIMAGE) $(IN_NODEREPO) $(IN_SLICEIMAGE)
+noderepo-DEPEND-FILES := RPMS/yumgroups.xml
+#export rpm list to the specfile
+noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS)
+noderepo-RPMDATE := yes
+ALL += noderepo
+IN_MYPLC += noderepo
+
+#
+# slicerepo
+#
+# all rpms resulting from packages marked as being in vserver
+SLICEREPO_RPMS = $(foreach package,$(IN_SLICEIMAGE),$($(package).rpms))
+# replace space with +++ (specvars cannot deal with spaces)
+SPACE=$(subst x, ,x)
+SLICEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(SLICEREPO_RPMS))
+
+slicerepo-MODULES := nodeimage
+slicerepo-SPEC := slicerepo.spec
+# package requires all embedded packages
+slicerepo-DEPEND-PACKAGES := $(IN_SLICEIMAGE)
+slicerepo-DEPEND-FILES := RPMS/yumgroups.xml
+#export rpm list to the specfile
+slicerepo-SPECVARS = slice_rpms_plus=$(SLICEREPO_RPMS_3PLUS)
+slicerepo-RPMDATE := yes
+ALL += slicerepo
+
+#
+# MyPLC : lightweight packaging, dependencies are yum-installed in a vserver
+#
+myplc-MODULES := myplc
+myplc-SPEC := myplc.spec
+myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
+ALL += myplc
 
-#
-# MyPLC native development environment
-#
-myplc-devel-native-MODULES := MyPLC
-myplc-devel-native-SPEC := myplc-devel-native.spec
-#ALL += myplc-devel-native
+# 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 monitor
+myplc-docs-SPEC := myplc-docs.spec
+ALL += myplc-docs
+
+# using some other name than myplc-release, as this is a make target already
+release-MODULES := myplc
+release-SPEC := myplc-release.spec
+release-RPMDATE := yes
+ALL += release