From 993796efd87175bd5a73fdf0bb0aaf03134827e7 Mon Sep 17 00:00:00 2001
From: William Harrington <kb0iic@berzerkula.org>
Date: Fri, 7 May 2021 21:01:49 -0500
Subject: Updated makefile.

---
 blfs/Makefile | 61 +++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 38 insertions(+), 23 deletions(-)

(limited to 'blfs/Makefile')

diff --git a/blfs/Makefile b/blfs/Makefile
index 7e1ee19..dd1fcc3 100644
--- a/blfs/Makefile
+++ b/blfs/Makefile
@@ -1,5 +1,5 @@
-targets = desktop-file-utils dhcpcd libpwquality Linux-PAM OpenSSH \
-          shared-mime-info sudo systemd-extras wget which wpa_supplicant
+targets = wpa_supplicant wget which desktop-file-utils dhcpcd \
+		  libpwquality Linux-PAM OpenSSH shared-mime-info sudo systemd-extras
 
 all : $(targets)
 
@@ -12,8 +12,8 @@ Apr :
 Apr-Util : Apr
 	@echo "Apr-Util"
 
-Apr-Util-Serf : Serf
-	@echo "Apru-Util-Serf"
+Apr-Util-Extra : Apr Berkeley_DB MariaDB OpenLDAP PostgreSQL SQLite unixODBC
+	@echo "Apr-Util-Extra"
 
 asciidoc : docbook-xsl fop libxslt Lynx
 	@echo "asciidoc"
@@ -27,6 +27,9 @@ bind-utils : libuv libxml2 PLY
 bind-utils-extra : json-c libcap-pam libxml2
 	@echo "bind-utils-extra"
 
+Brotli : CMake
+	@echo "Brotli"
+
 btrfs-progs : asciidoc LZO xmlto
 	@echo "btrfs-progs"
 
@@ -66,12 +69,15 @@ docbook-dtd : sgml-common unzip
 DocBook-Utils : docbook-dsssl docbook-dtd OpenJade
 	@echo "DocBook-Utils"
 
-docbook-xml : sgml-common unzip
+docbook-xml : libxml2 sgml-common unzip
 	@echo "docbook-xml"
 
 docbook-xsl :
 	@echo "docbook-xsl"
 
+Doxygen : CMake git
+	@echo "Doxygen"
+
 Fontconfig : FreeType-HarfBuzz json-c DocBook-Utils libxml2
 	@echo "Fontconfig"
 
@@ -81,12 +87,9 @@ fop : apache-ant
 FreeType :
 	@echo "FreeType"
 
-FreeType-HarfBuzz : libpng which
+FreeType-HarfBuzz : Brotli FreeType Graphite-HarfBuzz libpng which
 	@echo "FreeType-HarfBuzz"
 
-HarfBuzz : GLib ICU
-	@echo "HarfBuzz"
-
 GC : libatomic_ops
 	@echo "GC"
 
@@ -103,9 +106,12 @@ GLib : docbook-xml docbook-xsl GDB GTK-Doc libxslt PCRE \
 GnuTLS : Nettle make-ca libunistring libtasn1 p11-kit
 	@echo "GnuTLS"
 
-gobject-introspection : GLib GTK-Doc Mako
+gobject-introspection : GLib GTK-Doc Mako Markdown
 	@echo "gobject-introspection"
 
+Graphite :
+	@echo "Graphite"
+
 GTK-Doc : docbook-xml docbook-xsl itstool libxslt lxml Pygments
 	@echo "GTK-Doc"
 
@@ -115,6 +121,12 @@ GTK-Doc-fop : GTK-Doc fop
 Guile : GC libunistring #Runtime GDB Emacs
 	@echo "Guile"
 
+HarfBuzz : GLib gobject-introspection ICU
+	@echo "HarfBuzz"
+
+Graphite-HarfBuzz : Graphite HarfBuzz
+	@echo "Graphite-HarfBuzz"
+
 ICU :
 	@echo "ICU"
 
@@ -154,7 +166,7 @@ libcap-pam : Linux-PAM
 libedit :
 	@echo "libedit"
 
-libevent :
+libevent : Doxygen
 	@echo "libevent"
 
 libgcrypt : libgpg-error
@@ -184,7 +196,7 @@ libpng :
 libpwquality : CrackLib Linux-PAM
 	@echo "libpwquality"
 
-libtasn1 :
+libtasn1 : GTK-Doc Valgrind
 	@echo "libtasn1"
 
 libtirpc : MIT_Kerberos-keyutils
@@ -205,7 +217,7 @@ libxcb : libXau libXdmcp xcb-proto
 libXdmcp : fop xorgproto
 	@echo "libXdmcp"
 
-libxkbcommon : xkeyboard-config libxcb Wayland
+libxkbcommon : Doxygen libxcb Wayland xkeyboard-config
 	@echo "libxkbcommon"
 
 libxml2 : ICU
@@ -221,7 +233,7 @@ Linux-PAM : Berkeley_DB docbook-xml docbook-xsl fop libnsl libtirpc libxslt \
 	Lynx
 	@echo "Linux-PAM"
 
-qrencode :
+qrencode : Doxygen
 	@echo "qrencode"
 
 lxml : libxslt
@@ -248,6 +260,9 @@ make-ca : p11-kit
 Mako : MarkupSafe
 	@echo "Mako"
 
+Markdown :
+	@echo "Markdown"
+
 MarkupSafe :
 	@echo "MarkupSafe"
 
@@ -306,10 +321,10 @@ p11-kit : libtasn1 libxslt nss
 PCRE : libedit Valgrind
 	@echo "PCRE"
 
-PCRE2 :
+PCRE2 : libedit Valgrind
 	@echo "PCRE2"
 
-popt :
+popt : Doxygen
 	@echo "popt"
 
 PLY :
@@ -327,7 +342,7 @@ reiserfsprogs :
 rpcsvc-proto :
 	@echo "rpcsvc-proto"
 
-rsync : popt lz4
+rsync : Doxygen lz4 popt
 	@echo "rsync"
 
 SCons : docbook-xsl libxslt
@@ -354,7 +369,7 @@ six :
 sqlite3 : libedit unzip
 	@echo "sqlite3"
 
-Subversion : Apr-Util-Serf sqlite3
+Subversion : Apr-Util sqlite3
 	@echo "Subversion"
 
 Subversion-Extras : Apache apache-ant Boost Cyrus-SASL dbus Doxygen \
@@ -382,19 +397,19 @@ URI :
 util-macros : Xorg-Build-Environment
 	@echo "util-macros"
 
-Valgrind :
+Valgrind : GTK-Doc
 	@echo "Valgrind"
 
 Valgrind-llvm : LLVM
 	@echo "Valgrind-llvm"
 
-Wayland : libxml2
+Wayland : Doxygen libxml2
 	@echo "Wayland"
 
 Wayland-Protocols : Wayland
 	@echo "Wayland-Protocols"
 
-wget : make-ca
+wget : make-ca PCRE2
 	@echo "wget"
 
 which :
@@ -403,7 +418,7 @@ which :
 whois : libidn2
 	@echo "whois"
 
-wpa_supplicant : libnl
+wpa_supplicant : #QT5, For Network-Manager: libnl libxml2
 	@echo "WPA Supplicant"
 
 xcb-proto :
@@ -421,7 +436,7 @@ xmlto: docbook-xml docbook-xsl fop libxslt Lynx
 Xorg-Libs : Fontconfig libxcb xmlto fop Lynx
 	@echo "Xorg-Libs"
 
-Xorg-Build-Environment :
+Xorg-Build-Environment : sudo
 	@echo "Xorg-Build-Environment"
 
 xorgproto : asciidoc util-macros
-- 
cgit v1.2.3-54-g00ecf