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

1 files changed, 57 insertions, 58 deletions

diff --git a/blfs/QT5.Makefile b/blfs/QT5.Makefile
index 01df24e..51df39a 100644
--- a/blfs/QT5.Makefile
+++ b/blfs/QT5.Makefile
@@ -11,22 +11,22 @@ qt5 = qt-everywhere Avahi-qt CMake-qt gst-plugins-base-qt \
 	  gst-plugins-good-qt v4l-utils-qt wpa_supplicant-qt
 
 
-all: $(qt5)
+all: Systemd-Extras $(qt5)
 
 qt-everywhere : Alsa Cups gst-plugins-good JasPer libmng libtiff-libwebp \
 	ibus MariaDB pciutils PostgreSQL Python2 PulseAudio SDL2 unixODBC \
-	#Xorg-Libs make-ca GLib HarfBuzz ICU libjpeg-turbo libpng libtiff \
-	libxkbcommon Mesa MIT_Kerberos mtdev PCRE2 SQLite Wayland xcb-util-image \
+	Xorg-Libs make-ca GLib HarfBuzz ICU libjpeg-turbo libpng libtiff \
+	libxkbcommon Mesa MIT_Kerberos mtdev PCRE2 sqlite3 Wayland xcb-util-image \
 	xcb-util-keysyms xcb-util-renderutil xcb-util-wm BlueZ libinput
 	@echo $@
 
-AAlib : GPM slang # Xorg-Libs
+AAlib : GPM slang Xorg-Libs
 	@echo $@
 
 Alsa : alsa-lib alsa-plugins alsa-utils alsa-oss
 	@echo $@
 
-alsa-lib : Python2 #Doxygen
+alsa-lib : Python2 Doxygen
 	@echo $@
 
 alsa-oss : alsa-lib
@@ -35,11 +35,11 @@ alsa-oss : alsa-lib
 alsa-plugins : alsa-lib libsamplerate PulseAudio Speex
 	@echo $@
 
-alsa-utils : alsa-lib fftw libsamplerate # docutils xmlto
+alsa-utils : alsa-lib fftw libsamplerate docutils xmlto
 	@echo $@
 
 Avahi : libdaemon libglade DBus-Python PyGTK \
-	# GLib gobject-retrospection GTK2 GTK3 libevent Doxygen
+	GLib gobject-introspection GTK2 GTK3 libevent Doxygen
 	@echo $@
 
 Avahi-qt : qt-everywhere
@@ -48,7 +48,7 @@ Avahi-qt : qt-everywhere
 bash-completion :
 	@echo $@ "https://github.com/scop/bash-completion"
 
-Boost : # which ICU
+Boost : which ICU
 	@echo $@
 
 CDParanoia-III :
@@ -57,41 +57,40 @@ CDParanoia-III :
 CMake-qt : qt-everywhere
 	@echo $@
 
-colord: LCMS2 libgusb SANE #Polkit SQLite gobject-introspection libgudev Vala
+colord: LCMS2 libgusb SANE Polkit sqlite3 gobject-introspection libgudev Vala
 	@echo $@
 
-Cups : Avahi colord libpaper Python2 xdg-utils #dbus libusb Linux-PAM \
-	java
+Cups : Avahi colord libpaper Python2 xdg-utils libusb Linux-PAM java # dbus
 	@echo $@
 
-dbus-glib : # dbus GLib GTK-Doc
+dbus-glib : GLib GTK-Doc # dbus
 	@echo $@
 
-DBus-Python : Python2 PyGObject # dbus docutils GLib
+DBus-Python : Python2 PyGObject docutils GLib # dbus
 	@echo $@
 
-DConf : bash-completion # dbus GLib GTK3 libxml2 libxslt Vala GTK-Doc
+DConf : bash-completion GLib GTK3 libxml2 libxslt Vala GTK-Doc # dbus
 	@echo $@
 
 fftw :
 	@echo $@
 
-FLAC : libogg # NASM Docbook-utils Doxygen Valgrind
+FLAC : libogg NASM DocBook-Utils Doxygen Valgrind
 	@echo $@
 
-GConf : dbus-glib # libxml2 gobject-introspection GTK3 Polkit OpenLDAP
+GConf : dbus-glib libxml2 gobject-introspection GTK3 Polkit OpenLDAP
 	@echo $@
 
 giflib : # xmlto
 	@echo $@
 
-glib-networking : gsettings-desktop-schemas # GLib GnuTLS make-ca
+glib-networking : gsettings-desktop-schemas GLib GnuTLS make-ca
 	@echo $@
 
 GPM :
 	@echo $@
 
-gsettings-desktop-schemas : # GLib gobject-introspection
+gsettings-desktop-schemas : GLib gobject-introspection
 	@echo $@
 
 Gsl :
@@ -101,8 +100,8 @@ graphene :
 	@echo $@
 
 gst-plugins-base : alsa-lib CDParanoia-III graphene gstreamer libogg libtheora \
-	libvorbis Opus SDL2 #Valgrind gobject-introspection ISO-Codes \
-	libgudev Mesa wayland-protocols Xorg-Libs
+	libvorbis Opus SDL2 Valgrind gobject-introspection ISO-Codes \
+	libgudev Mesa Wayland-Protocols Xorg-Libs
 	@echo $@
 
 gst-plugins-base-qt : qt-everywhere
@@ -110,58 +109,58 @@ gst-plugins-base-qt : qt-everywhere
 
 gst-plugins-good : AAlib alsa-oss FLAC gst-plugins-base LAME libcaca \
 	libdv libsoup libvpx mpg123 PulseAudio Speex taglib v4l-utils \
-	# Cairo GTK3 libgudev libjpeg-turbo libpng Mesa Wayland Valgrind \
+	Cairo GTK3 libgudev libjpeg-turbo libpng Mesa Wayland Valgrind \
 	NASM Xorg-Libs
 	@echo $@
 
 gst-plugins-good-qt : qt-everywhere
 	@echo $@
 
-gstreamer : Gsl # GLib gobject introspection GTK3 Valgrind
+gstreamer : Gsl GLib gobject-introspection GTK3 Valgrind
 	@echo $@
 
 ibus : DConf libnotify DBus-Python PyGObject PyXDG \
-	# ISO-Codes Vala gobject-introspection GTK2 GTK-Doc libxkbcommon \
+	ISO-Codes Vala gobject-introspection GTK2 GTK-Doc libxkbcommon \
 	Wayland
 	@echo $@
 
-Imlib2 : giflib libid3tag # Xorg-Libs libpng libjpeg-turbo libtiff-webp
+Imlib2 : giflib libid3tag Xorg-Libs libpng libjpeg-turbo libtiff-webp
 	@echo $@
 
-JasPer : # CMake libjpeg-turbo freeglut
+JasPer : CMake libjpeg-turbo freeglut
 	@echo $@
 
-LAME : libsndfile # NASM
+LAME : libsndfile NASM
 	@echo $@
 
-LCMS2 : # libjpeg-turbo libtiff
+LCMS2 : libjpeg-turbo libtiff
 	@echo $@
 
-libcaca : Imlib2 slang # Xorg-Libs
+libcaca : Imlib2 slang Xorg-Libs
 	@echo $@
 
-libdaemon : # Doxygen Lynx
+libdaemon : Doxygen Lynx
 	@echo $@
 
-libdazzle : # GTK3 Vala
+libdazzle : GTK3 Vala
 	@echo $@
 
-libdv : # popt Xorg-Libs
+libdv : popt Xorg-Libs
 	@echo $@
 
-libglade : Python2 #libxml2 GTK2 GTK-Doc
+libglade : Python2 libxml2 GTK2 GTK-Doc
 	@echo $@
 
-libgusb : usbutils # libusb #GTK-Doc gobject-introspection Vala
+libgusb : usbutils libusb GTK-Doc gobject-introspection Vala
 	@echo $@
 
 libid3tag :
 	@echo $@
 
-libmng : LCMS2 # libjpeg-turbo
+libmng : LCMS2 libjpeg-turbo
 	@echo $@
 
-libnotify : # GTK3 gobject-introspection GTK-Doc xmlto
+libnotify : GTK3 gobject-introspection GTK-Doc xmlto
 	@echo $@
 
 libogg :
@@ -170,16 +169,16 @@ libogg :
 libpaper :
 	@echo $@
 
-libpsl : # libidn2 GTK-Doc Valgrind
+libpsl : libidn2 GTK-Doc Valgrind
 	@echo $@
 
 libsamplerate : alsa-lib libsndfile fftw
 	@echo $@
 
-libsndfile : alsa-lib FLAC libvorbis Opus Speex # SQLite
+libsndfile : alsa-lib FLAC libvorbis Opus Speex sqlite3
 	@echo $@
 
-libsoup : glib-networking libpsl sysprof # libxml2 SQLite \
+libsoup : glib-networking libpsl sysprof libxml2 sqlite3 \
 	gobject-introspection Vala
 	@echo $@
 
@@ -192,17 +191,17 @@ libtheora-qt : qt-everywhere
 libvorbis : libogg
 	@echo $@
 
-libvpx : # yasm NASM which cURL Doxygen
+libvpx : yasm NASM which cURL Doxygen
 	@echo $@
 
-libwebp : giflib # libjpeg-turbo libpng libtiff
+libwebp : giflib libjpeg-turbo libpng libtiff
 	@echo $@
 
 libtiff-libwebp : libwebp
 	@echo $@
 
 MariaDB : Boost Ruby unixODBC \
-	# CMake libevent libaio libxml2 Linux-PAM MIT_Kerberos PCRE Valgrind
+	CMake libevent libaio libxml2 Linux-PAM MIT_Kerberos PCRE Valgrind
 	@echo $@
 
 mpg123 : alsa-lib Boost PulseAudio
@@ -211,33 +210,33 @@ mpg123 : alsa-lib Boost PulseAudio
 Opus :
 	@echo $@
 
-pciutils : # cURL Wget Lynx
+pciutils : cURL wget Lynx
 	@echo $@
 
-PostgreSQL : Python2 # ICU libxml2 OpenLDAP Linux-PAM MIT_Kerberos \
-	fop docbook-dtd docbook-dsssl DocBook-utils OpenJade SGSMLSpm
+PostgreSQL : Python2 ICU libxml2 OpenLDAP Linux-PAM MIT_Kerberos \
+	fop docbook-dtd docbook-dsssl DocBook-Utils OpenJade SGMLSpm
 	@echo $@
 
 PulseAudio : libsndfile alsa-lib Speex Avahi fftw GConf libsamplerate SBC \
-	# dbus GLib libcap-pam Xorg-Libs BlueZ Doxygen GTK3 Valgrind
+	GLib libcap-pam Xorg-Libs BlueZ Doxygen GTK3 Valgrind # dbus
 	@echo $@
 
-PyCairo : Python2 # Cairo
+PyCairo : Python2 Cairo
 	@echo $@
 
 PyGObject : PyCairo Python2
 	@echo $@
 
-PyGTK : libglade PyCairo PyGObject Python2 # ATK GTK2 libxslt Pango
+PyGTK : libglade PyCairo PyGObject Python2 ATK GTK2 libxslt Pango
 	@echo $@
 
-Python2 : # BlueZ Valgrind SQLite Tk
+Python2 : BlueZ Valgrind sqlite3 Tk
 	@echo $@
 
 PyXDG : Python2
 	@echo $@
 
-Ruby : # Berkeley_DB Doxygen Graphviz Tk Valgrind
+Ruby : Berkeley_DB Doxygen Graphviz Tk Valgrind
 	@echo $@
 
 SANE : Avahi v4l-utils
@@ -246,23 +245,23 @@ SANE : Avahi v4l-utils
 SBC : libsndfile
 	@echo $@
 
-SDL2 : Alsa ibus PulseAudio libsamplerate # libxkbcommon \
-	wayland-protocols Xorg-Libs Doxygen NASM
+SDL2 : Alsa ibus PulseAudio libsamplerate \
+   	libxkbcommon Wayland-Protocols Xorg-Libs Doxygen NASM
 	@echo $@
 
-slang : # libpng PCRE
+slang : libpng PCRE
 	@echo $@
 
-Speex : libogg # Valgrind
+Speex : libogg Valgrind
 	@echo $@
 
-sysprof : libdazzle # GTK3 Polkit
+sysprof : libdazzle GTK3 Polkit
 	@echo $@
 
-taglib : # CMake
+taglib : CMake
 	@echo $@
 
-v4l-utils : alsa-lib SDL2 # Doxygen GLU libjpeg-turbo
+v4l-utils : alsa-lib SDL2 Doxygen GLU libjpeg-turbo
 	@echo $@
 
 v4l-utils-qt : qt-everywhere
@@ -271,10 +270,10 @@ v4l-utils-qt : qt-everywhere
 unixODBC :
 	@echo $@
 
-usbutils : # libusb Wget
+usbutils : libusb wget
 	@echo $@
 
-xdg-utils : # xmlto Lynx Xorg-Apps dbus
+xdg-utils : xmlto Lynx Xorg-Apps # dbus
 	@echo $@
 
 wpa_supplicant-qt : qt-everywhere