Cleanup target spelling/capitalization mistakes and uncomment all optional deps not dealing with testing or external to BLFS.

1 files changed, 29 insertions, 28 deletions

diff --git a/blfs/Xorg.Makefile b/blfs/Xorg.Makefile
index 1c22432..55f28f5 100644
--- a/blfs/Xorg.Makefile
+++ b/blfs/Xorg.Makefile
@@ -1,6 +1,7 @@
 # Most deps like GLib, Xorg-Libs, gobject-introspection brought in from
 # Systemd-Extras in main Makefile and not listed here or commented in targets
-xorg = xcb-util xcb-util-image xcb-util-keysyms xcb-util-renderutil \
+xorg = Systemd-Extras \
+	   xcb-util xcb-util-image xcb-util-keysyms xcb-util-renderutil \
 	   xcb-util-wm xcb-util-cursor libva Mesa libva-Mesa xbitmaps Xorg-Apps \
 	   xcursor-themes Xorg-Fonts librsvg Xorg-Server Xorg-Drivers \
 	   twm xterm xclock xinit
@@ -10,13 +11,13 @@ all: $(xorg)
 at-spi2-atk : at-spi2-core ATK
 	@echo $@
 
-at-spi2-core : # dbus GLib Xorg-Libs gobject-introspection GTK-Doc
+at-spi2-core : GLib Xorg-Libs gobject-introspection GTK-Doc # dbus
 	@echo $@
 
-ATK : # GLib gobject-introspection GTK-Doc
+ATK : GLib gobject-introspection GTK-Doc
 	@echo $@
 
-Cairo : Pixman libdrm # Fontconfig GLib GTK-Doc libpng libxml2 LZO Valgrind \
+Cairo : Pixman libdrm Fontconfig GLib GTK-Doc libpng libxml2 LZO Valgrind \
 	Xorg-Libs
 	@echo $@
 
@@ -29,15 +30,15 @@ dejavu-fonts :
 docutils :
 	@echo $@
 
-freeglut : GLU #CMake
+freeglut : GLU CMake
 	@echo $@
 
 FriBidi :
 	@echo $@
 
 gdk-pixbuf : libjpeg-turbo libtiff \
-	# librsvg runtime \
-	 GLib libpng shared-mime-info gobject-introspection GTK-Doc
+	GLib libpng shared-mime-info gobject-introspection GTK-Doc \
+	# librsvg-runtime	
 	@echo $@
 
 GLU : Mesa
@@ -48,7 +49,7 @@ GTK2 : ATK gdk-pixbuf Pango hicolor-icon-theme
 
 GTK3 : at-spi2-atk gdk-pixbuf hicolor-icon-theme ISO-Codes \
 	JSON-GLib libepoxy Pango sassc \
-	# libxkbcommon Wayland wayland-protocols DocBook-utils GTK-Doc
+	libxkbcommon Wayland Wayland-Protocols DocBook-Utils GTK-Doc
 	@echo $@
 
 HarfBuzz-Cairo : Cairo
@@ -63,7 +64,7 @@ ISO-Codes :
 JBIG-KIT :
 	@echo $@
 
-JSON-GLib : # GLib gobject-introspection GTK-Doc
+JSON-GLib : GLib gobject-introspection GTK-Doc
 	@echo $@
 
 libdrm : docutils
@@ -75,19 +76,19 @@ libepoxy : Mesa
 libevdev :
 	@echo $@
 
-libgudev : # GLib gobject-introspection GTK-Doc
+libgudev : GLib gobject-introspection GTK-Doc
 	@echo $@
 
 libinput : GTK3 libevdev libwacom mtdev
 	@echo $@
 
-libjpeg-turbo : NASM # CMake yasm
+libjpeg-turbo : NASM CMake yasm
 	@echo $@
 
-librsvg : gdk-pixbuf Cairo Pango #rustc gobject-introspection Vala GTK-Doc
+librsvg : gdk-pixbuf Cairo Pango rustc gobject-introspection Vala GTK-Doc
 	@echo $@
 
-libtiff : Mesa freeglut JBIG-KIT # CMake
+libtiff : Mesa freeglut JBIG-KIT CMake
 	@echo $@
 
 libtiff-webp :
@@ -99,23 +100,23 @@ libva : libdrm
 libva-Mesa : Mesa
 	@echo $@
 
-libvdpau : # Xorg-Libs Graphviz
+libvdpau : Xorg-Libs Graphviz
 	@echo $@
 
 libwacom : libgudev
 	@echo $@
 
-Mesa : libdrm libva libvdpau # LLVM libgcrypt Nettle Valgrind
+Mesa : libdrm libva libvdpau LLVM libgcrypt Nettle Valgrind
 	@echo $@ https://gitlab.freedesktop.org/mesa/mesa.git
 
 mtdev :
 	@echo $@
 
-NASM : # asciidoc xmlto
+NASM : asciidoc xmlto
 	@echo $@
 
 Pango : HarfBuzz-Cairo FriBidi \
-	# Fontconfig GLib gobject-introspection Xorg-Libs GTK-Doc
+	Fontconfig GLib gobject-introspection Xorg-Libs GTK-Doc
 	@echo $@
 
 Pixman :
@@ -130,10 +131,10 @@ sassc :
 twm : Xorg-Legacy-Fonts Xorg-Server
 	@echo $@
 
-xbitmaps : # util-macros
+xbitmaps : util-macros
 	@echo $@
 
-xcb-util : # libxcb
+xcb-util : libxcb
 	@echo $@
 
 xcb-util-cursor : xcb-util
@@ -142,25 +143,25 @@ xcb-util-cursor : xcb-util
 xcb-util-image : xcb-util
 	@echo $@
 
-xcb-util-keysyms : # libxcb
+xcb-util-keysyms : libxcb
 	@echo $@
 
-xcb-util-renderutil : # libxcb
+xcb-util-renderutil : libxcb
 	@echo $@
 
-xcb-util-wm : # libxcb
+xcb-util-wm : libxcb
 	@echo $@
 
-xclock : # Xorg-Libs
+xclock : Xorg-Libs
 	@echo $@
 
 xcursor-themes : Xorg-Apps
 	@echo $@
 
-xinit : # Xorg-Libs
+xinit : Xorg-Libs
 	@echo $@
 
-Xorg-Apps : Mesa xbitmaps xcb-util # libpng Linux-PAM
+Xorg-Apps : Mesa xbitmaps xcb-util libpng Linux-PAM
 	@echo $@
 
 Xorg-Drivers : libevdev libinput mtdev Xorg-Server
@@ -173,9 +174,9 @@ Xorg-Legacy-Fonts : xcursor-themes
 	@echo $@
 
 Xorg-Server : libepoxy Pixman-GTK2 xcb-util-keysyms xcb-util-image \
-	xcb-util-renderutil xcb-util-wm Xorg-Fonts # xkeyboard-config Wayland \
-	wayland-protocols Nettle libgcrypt fop
+	xcb-util-renderutil xcb-util-wm Xorg-Fonts xkeyboard-config Wayland \
+	Wayland-Protocols Nettle libgcrypt fop
 	@echo $@
 
-xterm : dejavu-fonts Xorg-Apps # PCRE2 Valgrind
+xterm : dejavu-fonts Xorg-Apps PCRE2 Valgrind
 	@echo $@