X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=788205cd7543baf5fa507884a0e3dc18435b6f6e;hb=3dd56df08bf598fa8ac9d8bec8c6893d8faef214;hp=c9bd923cc0261ff323917ade99a2f6a2d3a6eb42;hpb=61908f1c343871575276cc196ce9cab0b2ffedde;p=build.git diff --git a/Makefile b/Makefile index c9bd923c..788205cd 100644 --- a/Makefile +++ b/Makefile @@ -293,8 +293,10 @@ ALL.modules:=$(sort $(ALL.modules)) define stage1_module_vars ifneq "$($(1)-SVNPATH)" "" $(1)-SVNPATH := $(strip $($(1)-SVNPATH)) +$(1)-SCMPATH := $(strip $($(1)-SVNPATH)) else $(1)-GITPATH := $$(strip $$($(1)-GITPATH)) +$(1)-SCMPATH := $$(strip $$($(1)-GITPATH)) $(1).gitrepo := $$(firstword $$(subst @, ,$$($(1)-GITPATH))) $(1).gittag := $$(word 2,$$(subst @, ,$$($(1)-GITPATH))) $(1).gittag := $$(if $$($(1).gittag),$$($(1).gittag),master) @@ -342,6 +344,7 @@ define target_spec $($(1).specpath): header.spec $($(1).codespec) mkdir -p SPECS cat header.spec > $($(1).specpath) + echo "%define SCMURL $($($(1).module)-SCMPATH)" >> $($(1).specpath) $(if $($(1).has-date),echo "%define date $(shell date +%Y.%m.%d)" >> $($(1).specpath),) $(if $($(1)-SPECVARS), \ $(foreach line,$($(1)-SPECVARS), \ @@ -781,6 +784,9 @@ info: info-packages info-modules info-branches .PHONY: info info-packages info-modules info-branches module-tools +show-multi-modules: + @$(foreach package,$(ALL),$(if $(subst x1,,x$(words $($(package)-MODULES))), echo p=$(package) mods=$($(package)-MODULES) ;)) +.PHONY: show-multi-modules #################### help: @echo "********** Run make in two stages:"