Remove conflicts.HEADmaster

1 files changed, 0 insertions, 522 deletions

diff --git a/blfs/Makefile b/blfs/Makefile
index d00e9c7..bb7b8b1 100644
--- a/blfs/Makefile
+++ b/blfs/Makefile
@@ -533,525 +533,3 @@ zsh : libcap-pam PCRE Valgrind
 include Xorg.Makefile

 include QT5.Makefile

 include KDE.Makefile

-=======
-targets = wpa_supplicant wget desktop-file-utils \
-		  libpwquality OpenSSH shared-mime-info Systemd-Extras
-
-all   : $(targets) $(xorg) $(qt5) $(kde) $(utils) $(extratargets)
-
-apache-ant : GLib java
-	@echo $@
-
-Apr :
-	@echo $@
-
-Apr-Util : Apr
-	@echo $@
-
-Apr-Util-Extra : Apr Berkeley_DB MariaDB OpenLDAP PostgreSQL SQLite unixODBC
-	@echo $@
-
-asciidoc : docbook-xsl fop libxslt Lynx
-	@echo $@
-
-Autoconf213 :
-	@echo $@
-
-Berkeley_DB : java Sharutils
-	@echo $@
-
-bind-utils : libuv libxml2 PLY
-	@echo $@
-
-bind-utils-extra : json-c libcap-pam libxml2
-	@echo $@
-
-BlueZ : GLib libical
-	@echo $@
-
-Brotli : CMake
-	@echo $@
-
-btrfs-progs : asciidoc LZO xmlto
-	@echo $@
-
-CMake : cURL libuv libarchive nghttp2
-	@echo $@
-
-CrackLib :
-	@echo $@
-
-cryptsetup: json-c libpwquality LVM2 popt
-	@echo $@
-
-cURL : make-ca MIT_Kerberos-keyutils nghttp2 OpenLDAP
-	@echo $@
-
-cURL-extra : Brotli c-ares GnuTLS libidn2 libpsl libssh2 Samba
-	@echo $@
-
-Cyrus-SASL : Berkeley_DB java sqlite3
-	@echo $@
-
-dbus-xorglibs : Xorg-Libs
-	@echo $@
-
-desktop-file-utils : GLib
-	@echo $@
-
-dhcpcd : ntp
-	@echo $@
-
-docbook-dsssl :
-	@echo $@
-
-docbook-dtd : sgml-common unzip
-	@echo $@
-
-DocBook-Utils : docbook-dsssl docbook-dtd OpenJade
-	@echo $@
-
-docbook-xml : libxml2 sgml-common unzip
-	@echo $@
-
-docbook-xsl :
-	@echo $@
-
-Doxygen : CMake git Graphviz
-	@echo $@
-
-Fontconfig : FreeType-HarfBuzz json-c DocBook-Utils libxml2
-	@echo $@
-
-fop : apache-ant
-	@echo $@
-
-FreeType :
-	@echo $@
-
-FreeType-HarfBuzz : Brotli FreeType Graphite-HarfBuzz libpng which
-	@echo $@
-
-GC : libatomic_ops
-	@echo $@
-
-GDB : Guile six # Valgrind-llvm
-	@echo $@
-
-git : asciidoc cURL PCRE2 Subversion Tk xmlto # Valgrind
-	@echo $@
-
-GLib : docbook-xml docbook-xsl GDB GTK-Doc libxslt PCRE \
-	# gobject-introspection shared-mime-info desktop-file-utils
-	@echo $@
-
-GnuTLS : libseccomp libidn2 libtasn1 libunistring make-ca Nettle p11-kit
-	@echo $@
-
-gobject-introspection : GLib GTK-Doc Mako Markdown
-	@echo $@
-
-Graphite : CMake
-	@echo $@
-
-Graphviz :
-	@echo $@
-
-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 $@
-
-GTK-Doc : docbook-xml docbook-xsl itstool libxslt lxml Pygments
-	@echo $@
-
-GTK-Doc-fop : GTK-Doc fop
-	@echo $@
-
-Guile : GC libunistring # Runtime GDB Emacs
-	@echo $@
-
-HarfBuzz : GLib gobject-introspection ICU
-	@echo $@
-
-Graphite-HarfBuzz : Graphite HarfBuzz
-	@echo $@
-
-ICU :
-	@echo $@
-
-inih : ICU
-	@echo $@
-
-iptables : libnetfilter_acct libnetfilter_conntrack libnetfilter_cttimeout \
-	libnetfilter_cthelper libnetfilter_queue libnfnetlink libpcap nfacct
-	@echo $@
-
-IO-Socket-SSL : Net-SSLeay URI
-	@echo $@
-
-itstool : docbook-xml
-	@echo $@
-
-java : # Runtime Deps - alsa-lib cups giflib xorg-lib
-	@echo $@
-
-js78 : Autoconf213 ICU rustc which
-	@echo $@
-
-json-c : CMake
-	@echo $@
-
-keyutils : MIT_Kerberos
-	@echo $@
-
-libaio :
-	@echo $@
-
-libarchive : libxml2 LZO Nettle
-	@echo $@
-
-libatomic_ops :
-	@echo $@
-
-libcap-pam : Linux-PAM
-	@echo $@
-
-libedit :
-	@echo $@
-
-libevent : Doxygen
-	@echo $@
-
-libgcrypt : libgpg-error
-	@echo $@
-
-libgpg-error :
-	@echo $@
-
-libical : Berkeley_DB Doxygen gobject-introspection ICU Vala 
-	@echo $@
-
-libidn2 : git GTK-Doc libunistring
-	@echo $@
-
-libmicrohttpd :
-	@echo $@
-
-libmnl :
-	@echo $@
-
-libnetfilter_acct : libmnl
-	@echo $@
-
-libnetfilter_conntrack : libnfnetlink libmnl
-	@echo $@
-
-libnetfilter_cthelper : libmnl
-	@echo $@
-
-libnetfilter_cttimeout : libmnl
-	@echo $@
-
-libnetfilter_queue : libnfnetlink libmnl
-	@echo $@
-
-libnfnetlink :
-	@echo $@
-
-libnftnl :
-	@echo $@
-
-libnl :
-	@echo $@
-
-libnsl : libtirpc rpcsvc-proto
-	@echo $@
-
-libpcap : BlueZ libnl libusb
-	@echo $@
-
-libpng :
-	@echo $@
-
-libpsl : libidn2 GTK-Doc # Valgrind
-	@echo $@
-
-libpwquality : CrackLib Linux-PAM
-	@echo $@
-
-libseccomp : # Valgrind
-	@echo $@
-
-libssh2 :
-	@echo $@
-
-libtasn1 : GTK-Doc # Valgrind
-	@echo $@
-
-libtirpc : MIT_Kerberos-keyutils
-	@echo $@
-
-libunistring :
-	@echo $@
-
-libusb : Doxygen
-	@echo $@
-
-libuv :
-	@echo $@
-
-libXau : xorgproto
-	@echo $@
-
-libxcb : libXau libXdmcp xcb-proto
-	@echo $@
-
-libXdmcp : fop xorgproto
-	@echo $@
-
-libxkbcommon : Doxygen libxcb Wayland-Protocols xkeyboard-config
-	@echo $@
-
-libxml2 : ICU
-	@echo $@
-
-libxslt : docbook-xml docbook-xsl libgcrypt libxml2
-	@echo $@
-
-libyaml :
-	@echo $@
-
-Linux-PAM : Berkeley_DB docbook-xml docbook-xsl fop libnsl libtirpc libxslt \
-	Lynx
-	@echo $@
-
-qrencode : Doxygen
-	@echo $@
-
-lxml : libxslt
-	@echo $@
-
-LVM2 : libaio mdadm reiserfsprogs which xfsprogs # Valgrind
-	@echo $@
-
-LLVM : CMake libxml2 Pygments PyYAML Zip # Valgrind
-	@echo $@
-
-Lynx : Sharutils Zip unzip
-	@echo $@
-
-LZO :
-	@echo $@
-
-lz4 :
-	@echo $@
-
-make-ca : p11-kit
-	@echo $@
-
-Mako : MarkupSafe
-	@echo $@
-
-Markdown :
-	@echo $@
-
-MarkupSafe :
-	@echo $@
-
-mdadm :
-	@echo $@
-
-MIT_Kerberos :
-	@echo $@
-
-MIT_Kerberos-keyutils : bind-utils keyutils libedit OpenLDAP yasm
-	@echo $@
-
-Net-SSLeay :
-	@echo $@
-
-Nettle :
-	@echo $@
-
-nfacct : libmnl libnetfilter_acct
-	@echo $@
-
-nftables : iptables libmnl libnftnl
-	@echo $@
-
-nghttp2 : libxml2
-	@echo $@
-
-nghttp2-extra : Boost c-ares jansson libevent
-	@echo nghttp2-extra
-
-nss : nspr sqlite3
-	@echo $@
-
-nspr :
-	@echo $@
-
-# optional with a Systemd install
-ntp : IO-Socket-SSL libcap-pam libedit libevent
-	@echo $@
-
-OpenJade : OpenSP SGMLSpm Lynx
-	@echo $@
-
-OpenLDAP : Berkeley_DB Cyrus-SASL
-	@echo $@
-
-OpenSP : sgml-common xmlto
-	@echo $@
-
-OpenSSH : libedit
-	@echo $@
-
-p11-kit : libtasn1 libxslt nss
-	@echo $@
-
-PCRE : libedit # Valgrind
-	@echo $@
-
-PCRE2 : libedit # Valgrind
-	@echo $@
-
-Polkit : GLib gobject-introspection js78 Linux-PAM
-	@echo $@
-
-popt : Doxygen
-	@echo $@
-
-PLY :
-	@echo $@
-
-Pygments :
-	@echo $@
-
-PyYAML : libyaml
-	@echo $@
-
-reiserfsprogs :
-	@echo $@
-
-rpcsvc-proto :
-	@echo $@
-
-rsync : Doxygen lz4 popt
-	@echo $@
-
-rustc : CMake cURL libssh2 LLVM
-	@echo $@
-
-SCons : docbook-xsl libxslt
-	@echo $@
-
-sgml-common :
-	@echo $@
-
-SGMLSpm :
-	@echo $@
-
-shadow-pam : Linux-PAM
-	@echo $@
-
-shared-mime-info : GLib itstool libxml2 xmlto
-	@echo $@
-
-Sharutils :
-	@echo $@
-
-six :
-	@echo $@
-
-sqlite3 : libedit unzip
-	@echo $@
-
-Subversion : Apr-Util sqlite3
-	@echo $@
-
-sudo : bind-utils Linux-PAM MIT_Kerberos-keyutils OpenLDAP
-	@echo $@
-
-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 \
-	zsh # Valgrind gnu-efi kexec-tools libfido2 quota-tools Sphinx
-	@echo $@
-
-Tk : Xorg-Libs
-	@echo $@
-
-unzip :
-	@echo $@
-
-URI :
-	@echo $@
-
-util-macros : Xorg-Build-Environment
-	@echo $@
-
-Vala : GLib libxslt
-	@echo $@
-
-Valgrind : GTK-Doc
-	@echo $@
-
-Valgrind-llvm : LLVM
-	@echo $@
-
-Wayland : Doxygen libxml2
-	@echo $@
-
-Wayland-Protocols : Wayland
-	@echo $@
-
-wget : libidn2 libpsl make-ca PCRE2
-	@echo $@
-
-which :
-	@echo $@
-
-whois : libidn2
-	@echo $@
-
-wpa_supplicant : # QT5, For Network-Manager: libnl libxml2
-	@echo $@
-
-xcb-proto :
-	@echo $@
-
-xfsprogs : inih ICU
-	@echo $@
-
-xkeyboard-config : Xorg-Libs
-	@echo $@
-
-xmlto: docbook-xml docbook-xsl fop libxslt Lynx
-	@echo $@
-
-Xorg-Libs : Fontconfig libxcb xmlto fop Lynx
-	@echo $@
-
-Xorg-Build-Environment : sudo
-	@echo $@
-
-xorgproto : asciidoc util-macros
-	@echo $@
-
-yasm :
-	@echo $@
-
-Zip :
-	@echo $@
-
-zsh : libcap-pam PCRE # Valgrind
-	@echo $@
-
-
-include Xorg.Makefile
-include QT5.Makefile
-include KDE.Makefile
-include Utils.Makefile
-include Extras.Makefile