Sync Makefile with master.

1 files changed, 94 insertions, 13 deletions

diff --git a/blfs/Makefile b/blfs/Makefile
index dd1fcc3..b8bbebc 100644
--- a/blfs/Makefile
+++ b/blfs/Makefile
@@ -1,7 +1,10 @@
-targets = wpa_supplicant wget which desktop-file-utils dhcpcd \
-		  libpwquality Linux-PAM OpenSSH shared-mime-info sudo systemd-extras
+targets = wpa_supplicant wget desktop-file-utils \
+		  libpwquality OpenSSH shared-mime-info systemd-extras
 
-all : $(targets)
+all : LFS $(targets)
+
+LFS :
+	@echo "LFS"
 
 apache-ant : GLib java
 	@echo "apache-ant"
@@ -18,6 +21,9 @@ Apr-Util-Extra : Apr Berkeley_DB MariaDB OpenLDAP PostgreSQL SQLite unixODBC
 asciidoc : docbook-xsl fop libxslt Lynx
 	@echo "asciidoc"
 
+Autoconf213 :
+	@echo "Autoconf213"
+
 Berkeley_DB : java Sharutils
 	@echo "Berkeley_DB"
 
@@ -27,6 +33,9 @@ bind-utils : libuv libxml2 PLY
 bind-utils-extra : json-c libcap-pam libxml2
 	@echo "bind-utils-extra"
 
+BlueZ : GLib libical
+	@echo "BlueZ"
+
 Brotli : CMake
 	@echo "Brotli"
 
@@ -40,7 +49,7 @@ CrackLib :
 	@echo "CrackLib"
 
 cryptsetup: json-c libpwquality LVM2 popt
-	@echo "make cryptsetup"
+	@echo "cryptsetup"
 
 cURL : make-ca MIT_Kerberos-keyutils nghttp2 OpenLDAP
 	@echo "cURL"
@@ -54,6 +63,9 @@ Cyrus-SASL : Berkeley_DB java sqlite3
 Cyrus-SASL-Extras : Linux-PAM MariaDB MIT_Kerberos-keyutils OpenLDAP PostgreSQL
 	@echo "Cyrus-SASL-Extra"
 
+dbus-xorglibs : Xorg-Libs
+	@echo "dbus-xorglib"
+
 desktop-file-utils : GLib
 	@echo "desktop-file-utils"
 
@@ -75,7 +87,7 @@ docbook-xml : libxml2 sgml-common unzip
 docbook-xsl :
 	@echo "docbook-xsl"
 
-Doxygen : CMake git
+Doxygen : CMake git Graphviz
 	@echo "Doxygen"
 
 Fontconfig : FreeType-HarfBuzz json-c DocBook-Utils libxml2
@@ -103,7 +115,7 @@ GLib : docbook-xml docbook-xsl GDB GTK-Doc libxslt PCRE \
 	#gobject-introspection shared-mime-info desktop-file-utils
 	@echo "GLib"
 
-GnuTLS : Nettle make-ca libunistring libtasn1 p11-kit
+GnuTLS : libseccomp libidn2 libtasn1 libunistring make-ca Nettle p11-kit
 	@echo "GnuTLS"
 
 gobject-introspection : GLib GTK-Doc Mako Markdown
@@ -112,6 +124,14 @@ gobject-introspection : GLib GTK-Doc Mako Markdown
 Graphite :
 	@echo "Graphite"
 
+Graphviz :
+	@echo "Graphviz"
+
+Graphviz-Extra : Cairo Fontconfig GTK+-2 libjpeg-turbo libpng Pango Xorg-Libs \
+	GD libwebp ghostscript librsvg Poppler Freeglut libglade Qt SWIG Guile \
+	java Lua PHP Ruby Tk
+	@echo "Graphvix-Extra"
+
 GTK-Doc : docbook-xml docbook-xsl itstool libxslt lxml Pygments
 	@echo "GTK-Doc"
 
@@ -133,7 +153,8 @@ ICU :
 inih : ICU
 	@echo "inih"
 
-iptables :
+iptables : libnetfilter_acct libnetfilter_conntrack libnetfilter_cttimeout \
+	libnetfilter_cthelper libnetfilter_queue libnfnetlink libpcap nfacct
 	@echo "iptables"
 
 IO-Socket-SSL : Net-SSLeay URI
@@ -145,6 +166,9 @@ itstool : docbook-xml
 java : # Runtime Deps - alsa-lib cups giflib xorg-lib
 	@echo "java"
 
+js78 : Autoconf213 ICU rustc which
+	@echo "js78"
+
 json-c : CMake
 	@echo "json-c"
 
@@ -175,6 +199,9 @@ libgcrypt : libgpg-error
 libgpg-error :
 	@echo "libgpg-error"
 
+libical : Berkeley_DB Doxygen gobject-introspection ICU Vala 
+	@echo "libical"
+
 libidn : GTK-Doc java Valgrind
 	@echo "libidn"
 
@@ -184,18 +211,51 @@ libidn2 : git GTK-Doc libunistring
 libmicrohttpd :
 	@echo "libmicrohttpd"
 
+libmnl :
+	@echo "libmnl"
+
+libnetfilter_acct : libmnl
+	@echo "libnetfilter_acct"
+
+libnetfilter_conntrack : libnfnetlink libmnl
+	@echo "libnetfilter_conntrack"
+
+libnetfilter_cthelper : libmnl
+	@echo "libnetfilter_cthelper"
+
+libnetfilter_cttimeout : libmnl
+	@echo "libnetfilter_cttimeout"
+
+libnetfilter_queue : libnfnetlink libmnl
+	@echo "libnetfilter_queue"
+
+libnfnetlink :
+	@echo "libnfnetlink"
+
+libnftnl :
+	@echo "libnftnl"
+
 libnl :
 	@echo "libnl"
 
 libnsl : libtirpc rpcsvc-proto
 	@echo "libnsl"
 
+libpcap : BlueZ libnl libusb
+	@echo "libpcap"
+
 libpng :
 	@echo "libpng"
 
 libpwquality : CrackLib Linux-PAM
 	@echo "libpwquality"
 
+libseccomp : Valgrind
+	@echo "libseccomp"
+
+libssh2 :
+	@echo "libssh2"
+
 libtasn1 : GTK-Doc Valgrind
 	@echo "libtasn1"
 
@@ -205,6 +265,9 @@ libtirpc : MIT_Kerberos-keyutils
 libunistring :
 	@echo "libunistring"
 
+libusb : Doxygen
+	@echo "libusb"
+
 libuv :
 	@echo "libuv"
 
@@ -217,7 +280,7 @@ libxcb : libXau libXdmcp xcb-proto
 libXdmcp : fop xorgproto
 	@echo "libXdmcp"
 
-libxkbcommon : Doxygen libxcb Wayland xkeyboard-config
+libxkbcommon : Doxygen libxcb Wayland-Protocols xkeyboard-config
 	@echo "libxkbcommon"
 
 libxml2 : ICU
@@ -284,6 +347,12 @@ Net-SSLeay :
 Nettle :
 	@echo "Nettle"
 
+nfacct : libmnl libnetfilter_acct
+	@echo "nfacct"
+
+nftables : iptables libmnl libnftnl
+	@echo "nftables"
+
 nghttp2 : libxml2
 	@echo "nghttp2"
 
@@ -324,6 +393,9 @@ PCRE : libedit Valgrind
 PCRE2 : libedit Valgrind
 	@echo "PCRE2"
 
+Polkit : GLib gobject-introspection js78 Linux-PAM
+	@echo "Polkit"
+
 popt : Doxygen
 	@echo "popt"
 
@@ -345,6 +417,9 @@ rpcsvc-proto :
 rsync : Doxygen lz4 popt
 	@echo "rsync"
 
+rustc : CMake cURL libssh2 LLVM
+	@echo "rustc"
+
 SCons : docbook-xsl libxslt
 	@echo "SCons"
 
@@ -357,6 +432,9 @@ sgml-common :
 SGMLSpm :
 	@echo "SGMLSpm"
 
+shadow-pam : Linux-PAM
+	@echo "shadow-pam"
+
 shared-mime-info : GLib itstool libxml2 xmlto
 	@echo "shared-mime-info"
 
@@ -372,17 +450,17 @@ sqlite3 : libedit unzip
 Subversion : Apr-Util sqlite3
 	@echo "Subversion"
 
-Subversion-Extras : Apache apache-ant Boost Cyrus-SASL dbus Doxygen \
+Subversion-Extras : Apache apache-ant Boost Cyrus-SASL dbus-xorglib Doxygen \
 	gnome-keyring java libsecret Ruby SWIG LZ4 UTF8proc
 	@echo "Subversion-Extras"
 
 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 libxkbcommon lxml lz4 \
-	make-ca p11-kit PCRE2 qrencode rsync Valgrind zsh #gnu-efi kexec-tools \
-	libfido2 libmicrohttpd quota-tools Sphinx
+systemd-extras : btrfs-progs cURL cryptsetup dbus-xorglibs git GnuTLS iptables \
+	libcap-pam libgcrypt libidn2 libmicrohttpd libpwquality libxkbcommon lxml \
+	lz4 make-ca nftables p11-kit PCRE2 Polkit qrencode rsync shadow-pam \
+	Valgrind zsh #gnu-efi kexec-tools libfido2 quota-tools Sphinx
 	@echo "systemd-extras"
 
 Tk : Xorg-Libs
@@ -397,6 +475,9 @@ URI :
 util-macros : Xorg-Build-Environment
 	@echo "util-macros"
 
+Vala : GLib libxslt
+	@echo "Vala"
+
 Valgrind : GTK-Doc
 	@echo "Valgrind"