hide intermediate distro targets

There are pseudo-distro targets that are useful to combine the needed bits and pieces for a few more different end-user images but that are useless themselves (e.g. desktop-base wouldn't even start X session before someone would have installed a window manager). Let's just hide these under the hood so that `make help', `make everything' and potential frontends don't bother.

hide intermediate distro targets
a07959e2 · Michael Shigorin · af6b9940 · a07959e2 · a07959e2
Commit a07959e2 authored Mar 12, 2012 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

desktop.mk conf.d/desktop.mk +4 -4

server.mk conf.d/server.mk +2 -2

No files found.
--- a/conf.d/desktop.mk
+++ b/conf.d/desktop.mk
 # desktop distributions
 ifeq (distro,$(IMAGE_CLASS))

-distro/desktop-base: distro/.installer \
+distro/.desktop-base: distro/.installer \
 	use/syslinux/ui-vesamenu use/x11/xorg
 	@$(call set,INSTALLER,desktop)

-distro/desktop-mini: distro/desktop-base \
+distro/.desktop-mini: distro/.desktop-base \
 	use/lowmem use/x11/xdm use/power/acpi/button \
 	use/cleanup/alterator

-distro/icewm: distro/desktop-mini
+distro/icewm: distro/.desktop-mini
 	@$(call add,BASE_LISTS,$(call tags,icewm desktop))

-distro/tde: distro/desktop-mini use/x11/kdm
+distro/tde: distro/.desktop-mini use/x11/kdm
 	@$(call add,BASE_LISTS, \
 		$(call tags,(base || desktop) && (network || tde)))


--- a/conf.d/server.mk
+++ b/conf.d/server.mk
 # server distributions
 ifeq (distro,$(IMAGE_CLASS))

-distro/server-base: distro/.installer use/syslinux/ui-menu use/memtest
+distro/.server-base: distro/.installer use/syslinux/ui-menu use/memtest
 	@$(call add,BASE_LISTS,server-base)

-distro/server-mini: distro/server-base use/cleanup/x11-alterator
+distro/server-mini: distro/.server-base use/cleanup/x11-alterator
 	@$(call set,KFLAVOURS,el-smp)
 	@$(call add,THE_KMODULES,e1000e igb)
 	@$(call add,STAGE1_KMODULES,e1000e igb)