summaryrefslogtreecommitdiff
path: root/make/rules.mk
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-09 05:17:00 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-09 05:17:00 +0200
commit044a45920bf1e5c509bd924e2e35ee7e1b9f23f8 (patch)
treecf0723f70f994a3533088e1792bbef4d389e79cf /make/rules.mk
parentcf73eeb407dc71c8747913eed9dbf77b80fe07ab (diff)
parente651d76ecad4d55295a1b4805a6113dbae8cda4d (diff)
Merge branch 'master' into scs
Conflicts (manually resolved): Makefile
Diffstat (limited to 'make/rules.mk')
-rw-r--r--make/rules.mk14
1 files changed, 9 insertions, 5 deletions
diff --git a/make/rules.mk b/make/rules.mk
index 5369cd0..8da5f97 100644
--- a/make/rules.mk
+++ b/make/rules.mk
@@ -15,18 +15,18 @@ $(foreach source,$(SOURCES),$(eval $(call SOURCE_template,$(source),$($(source)_
# * Clone master branches from remote origin
# * Clone each non-master from local master
-# 1:moduledir 2:locale 3:mastermodule 4:source
+# 1:moduledir 2:locale 3:mastermodule 4:source 5:flavor
define MODULE_template
-$(3)_BRANCHES += $$(subst -LOCALE,$(2:%=-$(2)),$$($(4)_BRANCH))
+$(3)_BRANCHES += $$(subst -FLAVOR,$(5:%=-$(5)),$$(subst -LOCALE,$(2:%=-$(2)),$$($(4)_BRANCH)))
$(4): $(1)
ifneq ($(2),)
$(1): $$(subst module,$(3),$$(masterdir))
endif
-$(1): origin = $$(if $(2),$(3),$$(subst MODULE,$(3),$$($(4)_ORIGIN)))
-$(1): master = $$(subst -LOCALE,$(2:%=-$(2)),$$($(4)_BRANCH))
-$(1): branches = $$(if $(2),,$$(filter-out $$(master),$$($(3)_BRANCHES)))
+$(1): origin = $$(if $(2)$(5),$(3),$$(subst MODULE,$(3),$$($(4)_ORIGIN)))
+$(1): master = $$(subst -FLAVOR,$(5:%=-$(5)),$$(subst -LOCALE,$(2:%=-$(2)),$$($(4)_BRANCH)))
+$(1): branches = $$(if $(2)$(5),,$$(filter-out $$(master),$$($(3)_BRANCHES)))
$(1):
@[ -d "$$(dir $$@)" ] || ( echo mkdir -p "$$(dir $$@)" && mkdir -p "$$(dir $$@)" )
@[ -d "$$@" ] || ( echo git clone -o "$(4)" "$$(origin)" "$$@" && git clone -o "$(4)" "$$(origin)" "$$@" )
@@ -43,6 +43,10 @@ endif
endef
$(foreach source,$(SOURCES),$(foreach module,$($(source)_MODULES),$(eval $(call MODULE_template,$(masterdir),,$(module),$(source)))))
$(foreach source,$(SOURCES),$(foreach module,$($(source)_MODULES),$(foreach locale,$($(source)_LOCALES),$(eval $(call MODULE_template,$(l10ndir),$(locale),$(module),$(source))))))
+#$(foreach source,$(SOURCES),$(foreach module,$($(source)_MODULES),$(foreach flavor,$(patsubst $(module)-%,%,$($(source)_MODULEFLAVORS)),$(eval $(call MODULE_template,$(flavordir),,$(module),$(source),$(flavor))))))
+#$(foreach source,$(SOURCES),$(foreach module,$($(source)_MODULES),$(foreach flavor,$(patsubst $(module)-%,%,$($(source)_MODULEFLAVORS)),$(foreach locale,$($(source)_LOCALES),$(eval $(call MODULE_template,$(flavorl10ndir),$(locale),$(module),$(source),$(flavor)))))))
+$(foreach source,$(SOURCES),$(foreach module,$($(source)_MODULES),$(foreach flavor,$($(source)_$(module)_FLAVORS),$(eval $(call MODULE_template,$(flavordir),,$(module),$(source),$(flavor))))))
+$(foreach source,$(SOURCES),$(foreach module,$($(source)_MODULES),$(foreach flavor,$($(source)_$(module)_FLAVORS),$(foreach locale,$($(source)_LOCALES),$(eval $(call MODULE_template,$(flavorl10ndir),$(locale),$(module),$(source),$(flavor)))))))