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

1 files changed, 53 insertions, 51 deletions

diff --git a/blfs/Utils.Makefile b/blfs/Utils.Makefile
index 885b958..dec08ad 100644
--- a/blfs/Utils.Makefile
+++ b/blfs/Utils.Makefile
@@ -10,7 +10,7 @@ utiltargets = $(security) $(filesystems) $(genlibs) $(uefiboot) $(editors) \
 			  $(sysutils) $(programming) $(netprogs) $(netutils) $(netlibs) \
 			  $(textbrowsers) $(mail_newsclients) $(servers)
 
-all : $(utiltargets)
+all : Systemd-Extras $(utiltargets)
 
 editors = Bluefish Ed Emacs Joe Nano Vim # Gedit Mousepad
 
@@ -67,10 +67,10 @@ all: $(utiltargets)
 haveged :
 	@echo $@
 
-liboauth : #cURL NSS Doxygen
+liboauth : cURL nss Doxygen
 	@echo $@
 
-ssh-askpass : # GTK2 Sudo Xorg-Libs
+ssh-askpass : GTK2 sudo Xorg-Libs
 	@echo $@
 
 ### Filesystems ###
@@ -78,7 +78,7 @@ ssh-askpass : # GTK2 Sudo Xorg-Libs
 jfsutils :
 	@echo $@
 
-sshfs : # Fuse GLib docutils
+sshfs : Fuse GLib docutils
 	@echo $@
 
 ### UEFI Boot ###
@@ -90,13 +90,13 @@ sshfs : # Fuse GLib docutils
 Bluefish : enchant Gucharmap # Jing
 	@echo $@
 
-Ed : # libarchive
+Ed : libarchive
 	@echo $@
 
-Emacs : # HarfBuzz giflib GnuTLS jansson libtiff Xorg-Libs \
-	alsa-lib Cairo dbus GConf gobject-introspection gsettings-desktop-schemas \
+Emacs : HarfBuzz giflib GnuTLS jansson libtiff Xorg-Libs \
+	alsa-lib Cairo GConf gobject-introspection gsettings-desktop-schemas \
 	GPM GTK2 GTK3 ImageMagick LCMS2 libjpeg-turbo libpng librsvg libxml2 \
-	MIT_Kerberos Valgrind
+	MIT_Kerberos Valgrind # dbus
 	@echo $@
 
 Joe :
@@ -105,33 +105,33 @@ Joe :
 Nano :
 	@echo $@
 
-Vim : Lua54 # Xorg-Libs GTK3 GPM rsync Ruby
+Vim : Lua54 Xorg-Libs GTK3 GPM rsync Ruby
 	@echo $@
 
 ### General Libraries ###
 
-Double-conversion : # CMake
+Double-conversion : CMake
 	@echo $@
 
-enchant : # GLib Aspell dbus-glib Doxygen Hspell Hunspell 
+enchant : GLib Aspell dbus-glib Doxygen Hspell Hunspell 
 	@echo $@
 
 liblinear :
 	@echo $@
 
-Talloc : # docbook-xml docbook-xsl libxslt GDB git libnsl libitrpc Valgrind \
+Talloc : docbook-xml docbook-xsl libxslt GDB git libnsl libtirpc Valgrind \
 	xfsprogs
 	@echo $@
 
-telepathy-glib : # dbus-glib GTK-Doc libxslt gobject-introspection Vala
+telepathy-glib : dbus-glib GTK-Doc libxslt gobject-introspection Vala # dbus
 	@echo $@
 
 ### Graphics and Font Libraries ###
 
-babl : # gobject-introspection librsvg LCMS2 Vala
+babl : gobject-introspection librsvg LCMS2 Vala
 	@echo $@
 
-gegl : babl gexiv2 libspiro # JSON-GLib libjpeg-turbo libpng \
+gegl : babl gexiv2 libspiro JSON-GLib libjpeg-turbo libpng \
 	gobject-introspection Graphviz Pygments PyGObject asciidoc Cairo \
 	Exiv2 ffmpeg gdk-pixbuf GTK-Doc JasPer LCMS2 librsvg libtiff \
 	libwebp Pango Ruby SDL2 v4l-utils Vala OpenEXR
@@ -140,7 +140,7 @@ gegl : babl gexiv2 libspiro # JSON-GLib libjpeg-turbo libpng \
 GLM :
 	@echo $@
 
-libmypaint : # json-c GLib gobject-introspection Doxygen
+libmypaint : json-c GLib gobject-introspection Doxygen
 	@echo $@
 
 libspiro :
@@ -149,49 +149,49 @@ libspiro :
 mypaint-brushes : libmypaint
 	@echo $@
 
-Potrace : # LLVM
+Potrace : LLVM
 	@echo $@
 
-Qpdf : # libjpeg-turbo fop GnuTLS libxslt
+Qpdf : libjpeg-turbo fop GnuTLS libxslt
 	@echo $@
 
-woff2 : # Brotli CMake
+woff2 : Brotli CMake
 	@echo $@
 
 ### General Utilities ###
 
-Bogofilter : # Berkeley_DB Gsl libxml2 lmdb sqlite3 xmlto
+Bogofilter : Berkeley_DB Gsl libxml2 lmdb sqlite3 xmlto
 	@echo $@
 
 Compface :
 	@echo $@
 
-Hd2u : # popt
+Hd2u : popt
 	@echo $@
 
-Highlight : Lua54 # Boost qt-everywhere
+Highlight : Lua54 Boost qt-everywhere
 	@echo $@
 
-lsof : # libtirpc
+lsof : libtirpc
 	@echo $@
 
-Rarian : # libxslt docbook-xml
+Rarian : libxslt docbook-xml
 	@echo $@
 
-Rep-gtk : librep # GTK2
+Rep-gtk : librep GTK2
 	@echo $@
 
-Screen : # Linux-PAM
+Screen : Linux-PAM
 	@echo $@
 
-telepathy-logger : telepathy-glib # Python2 sqlite3
+telepathy-logger : telepathy-glib Python2 sqlite3
 	@echo $@
 
-telepathy-mission-control : telepathy-glib # DBus-Python NetworkManager \
-	GTK-Doc Upower
+telepathy-mission-control : telepathy-glib DBus-Python NetworkManager \
+	GTK-Doc UPower
 	@echo $@
 
-tidy-html5 : # CMake libxslt
+tidy-html5 : CMake libxslt
 	@echo $@
 
 Time :
@@ -211,14 +211,14 @@ acpid :
 at :
 	@echo $@
 
-autofs : nfs-utils # libtirpc rpcsvc-proto libnsl libxml2 MIT_Kerberos \
+autofs : nfs-utils libtirpc rpcsvc-proto libnsl libxml2 MIT_Kerberos \
 	OpenLDAP Cyrus-SASL
 	@echo $@
 
 cups-pk-helper :
 	@echo $@
 
-Fcron : Vim # Linux-PAM DocBook-utils
+Fcron : Vim Linux-PAM DocBook-Utils
 	@echo $@
 
 Hdparm :
@@ -227,16 +227,16 @@ Hdparm :
 LSB-Tools :
 	@echo $@
 
-Logrotate : # popt
+Logrotate : popt
 	@echo $@
 
-MC : # GLib PCRE slang Doxygen GPM libssh2 Ruby Samba unzip Xorg-Libs Zip
+MC : GLib PCRE slang Doxygen GPM libssh2 Ruby Samba unzip Xorg-Libs Zip
 	@echo $@
 
 Pax :
 	@echo $@
 
-pm-utils : # xmlto Hdparm
+pm-utils : xmlto Hdparm
 	@echo $@
 
 sg3_utils :
@@ -247,12 +247,12 @@ Sysstat :
 
 ### Gnome Libraries and Desktop ###
 
-gexiv2 : # Exiv2 Vala GTK-Doc Python2
+gexiv2 : Exiv2 Vala GTK-Doc Python2
 	@echo $@
 
 ### Gnome Apps ###
 
-Gucharmap : # desktop-file-utils GTK3 itstool unzip wget \
+Gucharmap : desktop-file-utils GTK3 itstool unzip wget \
 	gobject-introspection Vala GTK-Doc
 	@echo $@
 
@@ -275,7 +275,7 @@ librep :
 Lua54 :
 	@echo $@
 
-Mercurial : # docutils git GnuPG2 OpenSSH Pygments rustc Subversion
+Mercurial : docutils git GnuPG2 OpenSSH Pygments rustc Subversion
 	@echo $@
 
 ### Networking Programs ###
@@ -283,20 +283,20 @@ Mercurial : # docutils git GnuPG2 OpenSSH Pygments rustc Subversion
 bridge-utils :
 	@echo $@
 
-cifs-utils : Talloc # keyutils Linux-PAM MIT_Kerberos Samba libcap-pam
+cifs-utils : Talloc keyutils Linux-PAM MIT_Kerberos Samba libcap-pam
 	@echo $@
 
-iw : # libnl
+iw : libnl
 	@echo $@
 
-NcFTP : # LLVM
+NcFTP : LLVM
 	@echo $@
 
-nfs-utils : rpcbind # libtirpc rpcsvc-proto Cyrus-SASL LVM2 libnsl OpenLDAP \
+nfs-utils : rpcbind libtirpc rpcsvc-proto Cyrus-SASL LVM2 libnsl OpenLDAP \
 	sqlite3 MIT_Kerberos libcap-pam
 	@echo $@
 
-rpcbind : # libtirpc
+rpcbind : libtirpc
 	@echo $@
 
 Wireless_tools :
@@ -304,39 +304,41 @@ Wireless_tools :
 
 ### Networking Utilities ###
 
-Nmap : liblinear Lua54 # libpcap PCRE PyGTK Python2 libssh2
+Nmap : liblinear Lua54 libpcap PCRE PyGTK Python2 libssh2
 	@echo $@
 
 Traceroute :
 	@echo $@
 
-Whois : # libidn or libidn2
+Whois : libidn2
 	@echo $@
 
-Wireshark : # CMake GLib libgcrypt qt-everywhere libpcap Brotli c-ares \
+Wireshark : CMake GLib libgcrypt qt-everywhere libpcap Brotli c-ares \
 	Doxygen git GnuTLS libnl libxslt libxml2 Lua MIT_Kerberos nghttp2 \
 	SBC Speex
 	@echo $@
 
 ### Networking Libraries ###
 
+Serf : Apr-Util SCons MIT_Kerberos
+	@echo $@
 
 ### Text Web Browsers ###
 
-Links : # libevent GPM Xorg-Libs libpng libjpeg-turbo librsvg libtiff
+Links : libevent GPM Xorg-Libs libpng libjpeg-turbo librsvg libtiff
 	@echo $@
 
 ### Mail / News Clients ###
 
-Fetchmail : Procmail # MIT_Kerberos
+Fetchmail : Procmail MIT_Kerberos
 	@echo $@
 
-mailx : # NSS MIT_Kerberos
+mailx : nss MIT_Kerberos
 	@echo $@
 
-Mutt : Links # Lynx Aspell Cyrus-SASL GDB GnuPG2 GPGME libidn MIT_Kerberos \
+Mutt : Links Lynx Aspell Cyrus-SASL GDB GnuPG2 GPGME libidn MIT_Kerberos \
 	slang sqlite3
 	@echo $@
 
-Procmail : # libnsl
+Procmail : libnsl
 	@echo $@