Updated makefile.

1 files changed, 41 insertions, 123 deletions

diff --git a/blfs/Makefile b/blfs/Makefile
index 62e7070..dd1fcc3 100644
--- a/blfs/Makefile
+++ b/blfs/Makefile
@@ -1,6 +1,5 @@
-targets = bind-utils-extra 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)
 
@@ -13,18 +12,12 @@ Apr :
 Apr-Util : Apr
 	@echo "Apr-Util"
 
-Apr-Util-Extra : MariaDB PostgreSQL unixODBC
+Apr-Util-Extra : Apr Berkeley_DB MariaDB OpenLDAP PostgreSQL SQLite unixODBC
 	@echo "Apr-Util-Extra"
 
-Apr-Util-Serf : Serf
-	@echo "Apr-Util-Serf"
-
 asciidoc : docbook-xsl fop libxslt Lynx
 	@echo "asciidoc"
 
-autoconf2.13 :
-	@echo "autoconf2.13"
-
 Berkeley_DB : java Sharutils
 	@echo "Berkeley_DB"
 
@@ -47,7 +40,7 @@ CrackLib :
 	@echo "CrackLib"
 
 cryptsetup: json-c libpwquality LVM2 popt
-	@echo "cryptsetup"
+	@echo "make cryptsetup"
 
 cURL : make-ca MIT_Kerberos-keyutils nghttp2 OpenLDAP
 	@echo "cURL"
@@ -61,9 +54,6 @@ Cyrus-SASL : Berkeley_DB java sqlite3
 Cyrus-SASL-Extras : Linux-PAM MariaDB MIT_Kerberos-keyutils OpenLDAP PostgreSQL
 	@echo "Cyrus-SASL-Extra"
 
-DBus-Python : GLib #Python2
-	@echo "DBus-Python"
-
 desktop-file-utils : GLib
 	@echo "desktop-file-utils"
 
@@ -88,24 +78,18 @@ docbook-xsl :
 Doxygen : CMake git
 	@echo "Doxygen"
 
-Doxygen-Extras : CMake git Graphviz ghostscript LLVM Qt5 xapian
-	@echo "Doxygen-Extras"
-
-Fontconfig : DocBook-Utils FreeType-HarfBuzz json-c libxml2
+Fontconfig : FreeType-HarfBuzz json-c DocBook-Utils libxml2
 	@echo "Fontconfig"
 
 fop : apache-ant
 	@echo "fop"
 
-FreeType : Brotli libpng which
+FreeType :
 	@echo "FreeType"
 
-FreeType-HarfBuzz : HarfBuzz
+FreeType-HarfBuzz : Brotli FreeType Graphite-HarfBuzz libpng which
 	@echo "FreeType-HarfBuzz"
 
-HarfBuzz : FreeType GLib ICU-LLVM
-	@echo "HarfBuzz"
-
 GC : libatomic_ops
 	@echo "GC"
 
@@ -119,21 +103,15 @@ GLib : docbook-xml docbook-xsl GDB GTK-Doc libxslt PCRE \
 	#gobject-introspection shared-mime-info desktop-file-utils
 	@echo "GLib"
 
-GnuPG : libassuan libgcrypt libksba libusb npth OpenLDAP pinentry sqlite3
-	@echo "GnuPG"
-
-GnuPG-Extra : Fuse ImageMagick libusb
-	@echo "GnuPG-Extra"
-
-GnuTLS : Nettle make-ca libunistring libseccomp libtasn1 p11-kit
+GnuTLS : Nettle make-ca libunistring libtasn1 p11-kit
 	@echo "GnuTLS"
 
-GnuTLS-Extra : Doxygen GTK-Doc Guile libidn2 Unbound Valgrind
-	@echo "GnuTLS-Extra"
-
-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"
 
@@ -143,16 +121,19 @@ 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"
 
-ICU-LLVM : LLVM
-	@echo "ICU-LLVM"
-
-inih : ICU-LLVM
+inih : ICU
 	@echo "inih"
 
-iptables : libpcap nfacct libnetfilter_queue
+iptables :
 	@echo "iptables"
 
 IO-Socket-SSL : Net-SSLeay URI
@@ -164,9 +145,6 @@ itstool : docbook-xml
 java : # Runtime Deps - alsa-lib cups giflib xorg-lib
 	@echo "java"
 
-js78 : autoconf2.13 rustc
-	@echo "js78"
-
 json-c : CMake
 	@echo "json-c"
 
@@ -179,9 +157,6 @@ libaio :
 libarchive : libxml2 LZO Nettle
 	@echo "libarchive"
 
-libassuan : libgpg-error
-	@echo "libassuan"
-
 libatomic_ops :
 	@echo "libatomic_ops"
 
@@ -191,7 +166,7 @@ libcap-pam : Linux-PAM
 libedit :
 	@echo "libedit"
 
-libevent :
+libevent : Doxygen
 	@echo "libevent"
 
 libgcrypt : libgpg-error
@@ -206,58 +181,22 @@ libidn : GTK-Doc java Valgrind
 libidn2 : git GTK-Doc libunistring
 	@echo "libidn2"
 
-libksba : libgpg-error Valgrind
-	@echo "libksba"
-
 libmicrohttpd :
 	@echo "libmicrohttpd"
 
-libmnl :
-	@echo "libmnl"
-
-libnetfilter_acct : libnetfilter_conntrack
-	@echo "libnetfilter_acct"
-
-libnetfilter_conntrack : libnfnetlink
-	@echo "libnetfilter_conntrack"
-
-libnetfilter_cthelper : libnetfilter_cttimeout
-	@echo "libnetfilter_cthelper"
-
-libnetfilter_cttimeout : libnetfilter_acct
-	@echo "libnetfilter_cttimeout"
-
-libnetfilter_queue : libnetfilter_cthelper
-	@echo "libnetfilter_queue"
-
-libnfnetlink : libnftnl
-	@echo "libnfnetlink"
-
-libnftnl : libmnl
-	@echo "libnftnl"
-
 libnl :
 	@echo "libnl"
 
 libnsl : libtirpc rpcsvc-proto
 	@echo "libnsl"
 
-libpcap :
-	@echo "libpcap"
-
 libpng :
 	@echo "libpng"
 
 libpwquality : CrackLib Linux-PAM
 	@echo "libpwquality"
 
-libseccomp :
-	@echo "libseccomp"
-
-libssh2 : GnuPG libgcrypt OpenSSH
-	@echo "libssh2"
-
-libtasn1 : Valgrind
+libtasn1 : GTK-Doc Valgrind
 	@echo "libtasn1"
 
 libtirpc : MIT_Kerberos-keyutils
@@ -266,9 +205,6 @@ libtirpc : MIT_Kerberos-keyutils
 libunistring :
 	@echo "libunistring"
 
-libusb :
-	@echo "libusb"
-
 libuv :
 	@echo "libuv"
 
@@ -281,7 +217,7 @@ libxcb : libXau libXdmcp xcb-proto
 libXdmcp : fop xorgproto
 	@echo "libXdmcp"
 
-libxkbcommon : xkeyboard-config libxcb Wayland Wayland-Protocols
+libxkbcommon : Doxygen libxcb Wayland xkeyboard-config
 	@echo "libxkbcommon"
 
 libxml2 : ICU
@@ -297,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
@@ -324,13 +260,16 @@ make-ca : p11-kit
 Mako : MarkupSafe
 	@echo "Mako"
 
+Markdown :
+	@echo "Markdown"
+
 MarkupSafe :
 	@echo "MarkupSafe"
 
 mdadm :
 	@echo "mdadm"
 
-MIT_Kerberos : yasm
+MIT_Kerberos :
 	@echo "MIT_Kerberos"
 
 MIT_Kerberos-keyutils : bind-utils keyutils libedit OpenLDAP yasm
@@ -345,21 +284,12 @@ Net-SSLeay :
 Nettle :
 	@echo "Nettle"
 
-nfacct : libmnl libnetfilter_acct
-	@echo "nfacct"
-
-nftables : iptables
-	@echo "nftables"
-
 nghttp2 : libxml2
 	@echo "nghttp2"
 
 nghttp2-extra : Boost c-ares jansson libevent
 	@echo nghttp2-extra
 
-npth :
-	@echo "npth"
-
 nss : nspr sqlite3
 	@echo "nss"
 
@@ -382,7 +312,7 @@ OpenLDAP-Extras : GnuTLS MariaDB PostgreSQL Pth unixODBC
 OpenSP : sgml-common xmlto
 	@echo "OpenSP"
 
-OpenSSH : libedit #Xorg-Libs
+OpenSSH : libedit
 	@echo "OpenSSH"
 
 p11-kit : libtasn1 libxslt nss
@@ -391,18 +321,9 @@ p11-kit : libtasn1 libxslt nss
 PCRE : libedit Valgrind
 	@echo "PCRE"
 
-PCRE2 :
+PCRE2 : libedit Valgrind
 	@echo "PCRE2"
 
-pinentry : libassuan libgpg-error
-	@echo "pinentry"
-
-pinentry-extra : Emacs FLTK Gcr GTK+2 GTK+3 libsecret Qt5 efi
-	@echo "pinentry-extra"
-
-Polkit : DBus-Python GLib js78 Linux-PAM
-	@echo "Polkit"
-
 popt : Doxygen
 	@echo "popt"
 
@@ -421,12 +342,9 @@ reiserfsprogs :
 rpcsvc-proto :
 	@echo "rpcsvc-proto"
 
-rsync : popt lz4
+rsync : Doxygen lz4 popt
 	@echo "rsync"
 
-rustc : cURL CMake GDB libssh2 LLVM
-	@echo "rustc"
-
 SCons : docbook-xsl libxslt
 	@echo "SCons"
 
@@ -451,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 \
@@ -462,9 +380,9 @@ sudo : bind-utils Linux-PAM MIT_Kerberos-keyutils OpenLDAP
 	@echo "sudo"
 
 systemd-extras : btrfs-progs cURL cryptsetup git GnuTLS iptables libcap-pam \
-	libgcrypt libidn2 libmicrohttpd libpwquality libseccomp libxkbcommon lxml \
-	lz4 make-ca Polkit PCRE2 qrencode rsync Valgrind zsh \
-	#gnu-efi kexec-tools libfido2 libmicrohttpd quota-tools Sphinx
+	libgcrypt libidn2 libmicrohttpd libpwquality libxkbcommon lxml lz4 \
+	make-ca p11-kit PCRE2 qrencode rsync Valgrind zsh #gnu-efi kexec-tools \
+	libfido2 libmicrohttpd quota-tools Sphinx
 	@echo "systemd-extras"
 
 Tk : Xorg-Libs
@@ -479,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 :
@@ -500,13 +418,13 @@ which :
 whois : libidn2
 	@echo "whois"
 
-wpa_supplicant : libnl
+wpa_supplicant : #QT5, For Network-Manager: libnl libxml2
 	@echo "WPA Supplicant"
 
 xcb-proto :
 	@echo "xcb-proto"
 
-xfsprogs : inih ICU-LLVM
+xfsprogs : inih ICU
 	@echo "xfsprogs"
 
 xkeyboard-config : Xorg-Libs
@@ -518,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