X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=onelab.mk;h=edac14f4dcc450bbae9c924079ac212e33cf0168;hb=61908f1c343871575276cc196ce9cab0b2ffedde;hp=4e681adc728d68d5a202cc0e5e22a3167235a637;hpb=639fc24297791926bbc1d032db70c34744267920;p=build.git diff --git a/onelab.mk b/onelab.mk index 4e681adc..edac14f4 100644 --- a/onelab.mk +++ b/onelab.mk @@ -1,5 +1,3 @@ -# $Id$ -# $URL$ # # declare the packages to be built and their dependencies # initial version from Mark Huang @@ -286,9 +284,10 @@ ALL += vsys-scripts # # plcapi # -plcapi-MODULES := PLCAPI +plcapi-MODULES := plcapi plcapi-SPEC := PLCAPI.spec ALL += plcapi +IN_MYPLC += plcapi # # drupal @@ -297,13 +296,15 @@ 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-MODULES := plewww plewww-SPEC := plewww.spec ALL += plewww +IN_MYPLC += plewww # # www-register-wizard @@ -311,6 +312,7 @@ ALL += plewww 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 @@ -387,6 +389,7 @@ endif nodeconfig-MODULES := nodeconfig nodeconfig-SPEC := nodeconfig.spec ALL += nodeconfig +IN_MYPLC += nodeconfig # # bootmanager @@ -394,6 +397,7 @@ ALL += nodeconfig bootmanager-MODULES := BootManager bootmanager-SPEC := bootmanager.spec ALL += bootmanager +IN_MYPLC += bootmanager # # pypcilib : used in bootcd @@ -410,6 +414,7 @@ pyplnet-MODULES := pyplnet pyplnet-SPEC := pyplnet.spec ALL += pyplnet IN_BOOTSTRAPFS += pyplnet +IN_MYPLC += pyplnet IN_BOOTCD += pyplnet # @@ -437,6 +442,7 @@ bootcd-DEPEND-PACKAGES := $(IN_BOOTCD) bootcd-DEPEND-FILES := RPMS/yumgroups.xml bootcd-RPMDATE := yes ALL += bootcd +IN_MYPLC += bootcd # # vserver : reference image for slices @@ -459,6 +465,7 @@ bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml bootstrapfs-RPMDATE := yes ALL += bootstrapfs +IN_MYPLC += bootstrapfs # # noderepo @@ -479,6 +486,7 @@ noderepo-DEPEND-FILES := RPMS/yumgroups.xml noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS) noderepo-RPMDATE := yes ALL += noderepo +IN_MYPLC += noderepo # # slicerepo @@ -511,7 +519,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 Monitor +myplc-docs-MODULES := MyPLC plcapi NodeManager Monitor myplc-docs-SPEC := myplc-docs.spec ALL += myplc-docs