diff options
| author | Wenjie Zhou <zhouwenjie@google.com> | 2019-12-28 01:32:26 +0000 |
|---|---|---|
| committer | Wenjie Zhou <zhouwenjie@google.com> | 2019-12-28 01:38:45 +0000 |
| commit | 321c3aad9f897c6e6041d3b8fa5b3a2efc930445 (patch) | |
| tree | 26a0cc77bb00efc51979bb5303d0b906c628a2ee /coders/Makefile.am | |
| parent | 1a0c68c49b36e245a43a4505fc032ce87ca19000 (diff) | |
| download | ImageMagick-321c3aad9f897c6e6041d3b8fa5b3a2efc930445.tar.gz | |
Revert "Upgrade ImageMagick to '00c6fca4eccc3377114cc17346a77a096d00c9db'"
This reverts commit 1a0c68c49b36e245a43a4505fc032ce87ca19000.
Reason for revert: Causing build failure
Bug: 146941771
Change-Id: Ibaa2d6926c7a41f336618a1126b94d10f7c99a97
Diffstat (limited to 'coders/Makefile.am')
| -rw-r--r-- | coders/Makefile.am | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/coders/Makefile.am b/coders/Makefile.am index 67a891cde..4970ee3df 100644 --- a/coders/Makefile.am +++ b/coders/Makefile.am @@ -1,4 +1,4 @@ -# Copyright 1999-2020 ImageMagick Studio LLC, a non-profit organization +# Copyright 1999-2019 ImageMagick Studio LLC, a non-profit organization # dedicated to making software imaging solutions freely available. # # You may not use this file except in compliance with the License. You may @@ -57,11 +57,6 @@ MAGICKCORE_JPEG_MODULES = coders/jpeg.la MAGICKCORE_JPEG_SRCS = coders/jpeg.c endif -if JXL_DELEGATE -MAGICKCORE_JXL_MODULES = coders/jxl.la -MAGICKCORE_JXL_SRCS = coders/jxl.c -endif - if LIBOPENJP2_DELEGATE MAGICKCORE_JP2_MODULES = coders/jp2.la MAGICKCORE_JP2_SRCS = coders/jp2.c @@ -193,7 +188,6 @@ MAGICKCORE_CODER_SRCS = \ coders/jpeg.h \ coders/json.c \ coders/json.h \ - coders/jxl.h \ coders/label.c \ coders/label.h \ coders/mac.c \ @@ -362,7 +356,6 @@ MAGICKCORE_CODER_SRCS = \ $(MAGICKCORE_JBIG_SRCS) \ $(MAGICKCORE_JPEG_SRCS) \ $(MAGICKCORE_JP2_SRCS) \ - $(MAGICKCORE_JXL_SRCS) \ $(MAGICKCORE_PNG_SRCS) \ $(MAGICKCORE_TIFF_SRCS) \ $(MAGICKCORE_WEBP_SRCS) \ @@ -424,7 +417,6 @@ CODERS_NOINST_HDRS = \ coders/jp2.h \ coders/jpeg.h \ coders/json.h \ - coders/jxl.h \ coders/label.h \ coders/mac.h \ coders/magick.h \ @@ -631,7 +623,6 @@ coders_LTLIBRARIES = \ $(MAGICKCORE_JBIG_MODULES) \ $(MAGICKCORE_JPEG_MODULES) \ $(MAGICKCORE_JP2_MODULES) \ - $(MAGICKCORE_JXL_MODULES) \ $(MAGICKCORE_PNG_MODULES) \ $(MAGICKCORE_TIFF_MODULES) \ $(MAGICKCORE_WEBP_MODULES) \ @@ -935,12 +926,6 @@ coders_json_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) coders_json_la_LDFLAGS = $(MODULECOMMONFLAGS) coders_json_la_LIBADD = $(MAGICKCORE_LIBS) -# JXL coder module -coders_jxl_la_SOURCES = coders/jxl.c -coders_jxl_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) -coders_jxl_la_LDFLAGS = $(MODULECOMMONFLAGS) -coders_jxl_la_LIBADD = $(MAGICKCORE_LIBS) $(JXL_LIBS) - # LABEL coder module coders_label_la_SOURCES = coders/label.c coders_label_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS) |