diff options
-rw-r--r-- | rules/other/Toplevel.make | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/rules/other/Toplevel.make b/rules/other/Toplevel.make index 710f344da..3e4500d27 100644 --- a/rules/other/Toplevel.make +++ b/rules/other/Toplevel.make @@ -24,6 +24,7 @@ include $(PTXDIST_PLATFORMCONFIG) # might be non existent ifneq ($(wildcard $(PTXDIST_COLLECTIONCONFIG)),) include $(PTXDIST_COLLECTIONCONFIG) +PTX_COLLECTION := y endif # ---------------------------------------------------------------------------- @@ -54,19 +55,31 @@ PACKAGES-y += $(PACKAGES-y-y) PACKAGES-m += $(PACKAGES-y-m) PACKAGES- += $(PACKAGES-y-) $(PACKAGES--y) $(PACKAGES--m) $(PACKAGES--) -PACKAGES := $(PACKAGES-y) -CROSS_PACKAGES := $(CROSS_PACKAGES-y) $(CROSS_PACKAGES-y-y) -HOST_PACKAGES := $(HOST_PACKAGES-y) $(HOST_PACKAGES-y-y) +HOST_PACKAGES-y += $(HOST_PACKAGES-y-y) +HOST_PACKAGES-m += $(HOST_PACKAGES-y-m) +HOST_PACKAGES- += $(HOST_PACKAGES-y-) $(HOST_PACKAGES--y) $(HOST_PACKAGES--m) $(HOST_PACKAGES--) -#ALL_PACKAGES := \ -# $(PACKAGES-) $(PACKAGES-y) $(PACKAGES-m) \ -# $(CROSS_PACKAGES-) $(CROSS_PACKAGES-y) \ -# $(HOST_PACKAGES-) $(HOST_PACKAGES-y) +CROSS_PACKAGES-y+= $(CROSS_PACKAGES-y-y) +CROSS_PACKAGES-m+= $(CROSS_PACKAGES-y-m) +CROSS_PACKAGES- += $(CROSS_PACKAGES-y-) $(CROSS_PACKAGES--y) $(CROSS_PACKAGES--m) $(CROSS_PACKAGES--) + +PACKAGES := $(PACKAGES-y) +CROSS_PACKAGES := $(CROSS_PACKAGES-y) +HOST_PACKAGES := $(HOST_PACKAGES-y) + +# +# build everything if no collection is active +# +ifndef PTX_COLLECTION +PACKAGES += $(PACKAGES-m) +CROSS_PACKAGES += $(CROSS_PACKAGES-m) +HOST_PACKAGES += $(HOST_PACKAGES-m) +endif PTX_PACKAGES_SELECTED := \ - $(PACKAGES-y) \ - $(CROSS_PACKAGES-y) \ - $(HOST_PACKAGES-y) + $(PACKAGES) \ + $(CROSS_PACKAGES) \ + $(HOST_PACKAGES) ifneq ($(wildcard $(POSTRULESDIR)/*.make),) include $(wildcard $(POSTRULESDIR)/*.make) |