regular.mk: introduce mixin/regular-xfce

This holds the common bits, the whole commit should be a no-op.

regular.mk: introduce mixin/regular-xfce
b8878196 · Michael Shigorin · fbb2552d · b8878196
Commit b8878196 authored Dec 03, 2016 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 7 deletions

regular.mk conf.d/regular.mk +7 -7

No files found.
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -119,15 +119,15 @@ distro/regular-gnustep: distro/.regular-sysv \
 distro/regular-gnustep-systemd: distro/.regular-wm +systemd \
 	mixin/regular-wmaker mixin/regular-gnustep; @:

-distro/regular-xfce: distro/.regular-gtk \
-	use/x11/xfce/full use/domain-client/full use/browser/firefox/classic \
-	use/fonts/ttf/redhat use/x11/gtk/nm +nm
+mixin/regular-xfce: use/x11/xfce use/fonts/ttf/redhat use/x11/gtk/nm +nm; @:
+
+distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce \
+	use/x11/xfce/full use/domain-client/full use/browser/firefox/classic
 	@$(call set,KFLAVOURS,un-def)

-distro/regular-xfce-sysv: distro/.regular-sysv-gtk +nm \
-	use/x11/xfce use/init/sysv/polkit use/deflogin/sysv/nm \
-	use/fonts/ttf/redhat use/fonts/otf/adobe use/fonts/otf/mozilla
-	@$(call add,LIVE_LISTS,$(call tags,desktop nm))
+distro/regular-xfce-sysv: distro/.regular-sysv-gtk mixin/regular-xfce \
+	use/init/sysv/polkit use/deflogin/sysv/nm \
+	use/fonts/otf/adobe use/fonts/otf/mozilla
 	@$(call add,LIVE_PACKAGES,xfce4-mixer pm-utils elinks mpg123)

 distro/regular-lxde: distro/.regular-gtk use/x11/lxde use/fonts/infinality \