diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2017-03-08 10:59:36 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2017-03-08 10:59:36 +0100 |
| commit | d3d48f198ee71b4421d9fe7b2c66341db9ef2eff (patch) | |
| tree | dcdf7647db217dc2830e91599c3610ecd30bb63a | |
| parent | 6f915fba4c1f8193adb248ee8b83781c950f5535 (diff) | |
| download | fbida-d3d48f198ee71b4421d9fe7b2c66341db9ef2eff.tar.gz | |
zap HAVE_LIBTIFF, tiff is a hard dependency now
| -rw-r--r-- | GNUmakefile | 18 | ||||
| -rw-r--r-- | selections.c | 2 |
2 files changed, 6 insertions, 14 deletions
diff --git a/GNUmakefile b/GNUmakefile index a1dc034..7e392eb 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -12,8 +12,8 @@ CFLAGS += -Wno-pointer-sign # hard build deps PKG_CONFIG = pkg-config -PKGS_IDA := libexif libpng -PKGS_FBI := freetype2 fontconfig libdrm libexif libpng +PKGS_IDA := libexif libpng libtiff-4 +PKGS_FBI := freetype2 fontconfig libdrm libexif libpng libtiff-4 PKGS_FBPDF := libdrm poppler-glib gbm epoxy cairo-gl HAVE_DEPS := $(shell $(PKG_CONFIG) $(PKGS_FBI) $(PKGS_FBPDF) && echo yes) @@ -72,7 +72,6 @@ HAVE_GLIBC := $(call ac_func,fopencookie) HAVE_STRSIGNAL := $(call ac_func,strsignal) HAVE_LIBPCD := $(call ac_lib,pcd_open,pcd) HAVE_LIBGIF := $(call ac_lib,DGifOpenFileName,gif) -HAVE_LIBTIFF := $(call ac_pkg_config,libtiff-4) HAVE_LIBWEBP := $(call ac_pkg_config,libwebp) HAVE_LIBSANE := $(call ac_lib,sane_init,sane) HAVE_LIBCURL := $(call ac_lib,curl_easy_init,curl) @@ -98,10 +97,6 @@ endif ######################################################################## # conditional stuff -ifeq ($(HAVE_LIBTIFF),yes) - PKGS_IDA += libtiff-4 - PKGS_FBI += libtiff-4 -endif ifeq ($(HAVE_LIBWEBP),yes) PKGS_IDA += libwebp PKGS_FBI += libwebp @@ -109,8 +104,8 @@ endif includes = ENDIAN_H STRSIGNAL NEW_EXIF libraries = PCD GIF CURL SANE LIRC -ida_libs = PCD GIF TIFF WEBP CURL SANE -fbi_libs = PCD GIF TIFF WEBP CURL LIRC +ida_libs = PCD GIF WEBP CURL SANE +fbi_libs = PCD GIF WEBP CURL LIRC PCD_LDLIBS := -lpcd GIF_LDLIBS := -lgif @@ -118,7 +113,6 @@ SANE_LDLIBS := -lsane CURL_LDLIBS := -lcurl LIRC_LDLIBS := -llirc_client -TIFF_OBJS := rd/read-tiff.o wr/write-tiff.o WEBP_OBJS := rd/read-webp.o PCD_OBJS := rd/read-pcd.o GIF_OBJS := rd/read-gif.o @@ -128,9 +122,9 @@ LIRC_OBJS := lirc.o # common objs OBJS_READER := readers.o rd/read-ppm.o rd/read-bmp.o rd/read-jpeg.o \ - rd/read-png.o + rd/read-png.o rd/read-tiff.o OBJS_WRITER := writers.o wr/write-ppm.o wr/write-ps.o wr/write-jpeg.o \ - wr/write-png.o + wr/write-png.o wr/write-tiff.o # update various flags depending on HAVE_* CFLAGS += $(call ac_inc_cflags,$(includes)) diff --git a/selections.c b/selections.c index 35a5132..d09507b 100644 --- a/selections.c +++ b/selections.c @@ -610,9 +610,7 @@ void ipc_init() targets[ntargets++] = MIME_IMAGE_GIF; #endif targets[ntargets++] = MIME_IMAGE_PNG; -#ifdef HAVE_LIBTIFF targets[ntargets++] = MIME_IMAGE_TIFF; -#endif targets[ntargets++] = XA_PIXMAP; targets[ntargets++] = XA_STRING; |