aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Harrington <kb0iic@berzerkula.org>2021-05-28 18:55:25 -0500
committerWilliam Harrington <kb0iic@berzerkula.org>2021-05-28 19:02:53 -0500
commitcfa35224a753a51c76c46f152d191f1cf76bae9a (patch)
tree3475322a1b99a1801d0f9f369b034c37aeb0b1b2
parent49568e0647ebb9bda667bcb1b93810a1d2ef657d (diff)
Sync with master Makefile changes.
-rw-r--r--blfs/Extras.Makefile29
-rw-r--r--blfs/Utils.Makefile3
2 files changed, 26 insertions, 6 deletions
diff --git a/blfs/Extras.Makefile b/blfs/Extras.Makefile
index 08dcd28..dea44af 100644
--- a/blfs/Extras.Makefile
+++ b/blfs/Extras.Makefile
@@ -1,10 +1,11 @@
-extratargets = Cups-Extras Cups-filters Cyrus-SASL-Extras GTK3-Extras \
- Gutenprint ImageMagick-Extras Kuserfeedback-Extras \
+extratargets = Cups-Extras Cups-filters Cyrus-SASL-Extras GTK-Engines \
+ GTK3-Extras Gutenprint ImageMagick-Extras Kuserfeedback-Extras \
OpenLDAP-Extras PHP Pixman-Extras Subversion-Extras
all : $(extratargets)
-Cups-Extras :
+Cups-Extras : GnuTLS colord libusb Linux-PAM xdg-utils Avahi libpaper LLVM \
+ MIT_Kerberos java PHP Python2 Gutenprint hplip
@echo $@
Cups-filters : ghostscript mupdf PHP Cups GLib LCMS2 Poppler Qpdf \
@@ -15,13 +16,23 @@ Cyrus-SASL-Extras : Linux-PAM MariaDB MIT_Kerberos-keyutils OpenLDAP \
PostgreSQL
@echo $@
+GD : libjpeg-turbo libpng libtiff libwebp FreeType Fontconfig \
+ # libavif libheif libXpm libraqm libimagequant
+ @echo $@
+
+GTK-Engines : GTK2 Lua54 which
+ @echo $@
+
GTK3-Extras : adwaita-icon-theme colord Cups rest # PyAtSpi2
@echo $@
+hplip : qt-everywhere
+ @echo $@ " - WIP: External from BLFS"
+
ImageMagick-Extras : Enscript Gimp Inkscape
@echo $@
-Kuserfeedback-Extras : PHP # PhpUnit "http://phpunit.de"
+Kuserfeedback-Extras : PHP PHPUnit # "http://phpunit.de"
@echo $@
OpenLDAP-Extras : GnuTLS MariaDB PostgreSQL unixODBC # Pth
@@ -31,8 +42,14 @@ Pixman-Extras : GTK2 libpng # both for tests and demos
@echo $@
# libsoup graphviz cups cups-filters can use PHP
-PHP :
- @echo $@ "- WIP: Many dependencies"
+PHP : Apache libxml2 Aspell enchant libxslt PCRE FreeType libexif \
+ libjpeg-turbo libpng libtiff libwebp Xorg-Libs cURL tidy-html5 \
+ Berkeley_DB libiodbc lmdb MariaDB OpenLDAP PostgreSQL sqlite3 \
+ unixODBC Cyrus-SASL MIT_Kerberos GD
+ @echo $@
+
+PHPUnit : PHP
+ @echo $@ "https://phar.phpunit.de/phpunit-8.phar"
Subversion-Extras : Apache apache-ant Boost Cyrus-SASL Doxygen \
java Ruby Serf SWIG # gnome-keyring libsecret LZ4 UTF8proc dbus
diff --git a/blfs/Utils.Makefile b/blfs/Utils.Makefile
index dec08ad..2200d59 100644
--- a/blfs/Utils.Makefile
+++ b/blfs/Utils.Makefile
@@ -116,6 +116,9 @@ Double-conversion : CMake
enchant : GLib Aspell dbus-glib Doxygen Hspell Hunspell
@echo $@
+libiodbc :
+ @echo $@
+
liblinear :
@echo $@