summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-03-07 10:18:35 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-03-09 21:27:02 (GMT)
commit30c695ef01340855cb74a35bb465fb7408c0fb7e (patch)
tree2e86cc55263edc899081e24eb7225e285b5dd21e
parent917315ac5563fc654ad0f86583234be18c7db89a (diff)
downloadbuildroot-30c695ef01340855cb74a35bb465fb7408c0fb7e.tar.gz
buildroot-30c695ef01340855cb74a35bb465fb7408c0fb7e.tar.bz2
jpeg: convert to a real package
jpeg is a virtual package, but since it is listed in the dependencies of other packages, it should obey to all the normal make rules for packages. Notably, the jpeg-show-depends target is mandatory for the graph-depends script to work. Instead to implement such a make target manually, make jpeg a normal generic-package, except that it doesn't have any source. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/jpeg/jpeg.mk22
1 files changed, 18 insertions, 4 deletions
diff --git a/package/jpeg/jpeg.mk b/package/jpeg/jpeg.mk
index 3caacaa..962908d 100644
--- a/package/jpeg/jpeg.mk
+++ b/package/jpeg/jpeg.mk
@@ -1,10 +1,24 @@
#############################################################
#
-# jpeg
+# Virtual jpeg package
#
#############################################################
-jpeg: $(if $(BR2_PACKAGE_JPEG_TURBO),jpeg-turbo,libjpeg)
+JPEG_SOURCE =
-host-jpeg: host-libjpeg
-host-jpeg-source: host-libjpeg-source
+ifeq ($(BR2_PACKAGE_JPEG_TURBO),y)
+JPEG_DEPENDENCIES += jpeg-turbo
+endif
+
+ifeq ($(BR2_PACKAGE_LIBJPEG),y)
+JPEG_DEPENDENCIES += libjpeg
+endif
+
+ifeq ($(JPEG_DEPENDENCIES),)
+define JPEG_CONFIGURE_CMDS
+ echo "No JPEG implementation defined. Configuration error"
+ exit 1
+endef
+endif
+
+$(eval $(generic-package))