diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2017-03-08 10:56:58 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2017-03-08 10:56:58 +0100 |
| commit | 6f915fba4c1f8193adb248ee8b83781c950f5535 (patch) | |
| tree | 53927cf251423924690e80fc4135396902a1eccc | |
| parent | ff611dad45be219c36b0ea0f856512eab6eaf82b (diff) | |
| download | fbida-6f915fba4c1f8193adb248ee8b83781c950f5535.tar.gz | |
zap HAVE_LIBPNG, png is a hard dependency now
| -rw-r--r-- | GNUmakefile | 20 | ||||
| -rw-r--r-- | selections.c | 2 |
2 files changed, 8 insertions, 14 deletions
diff --git a/GNUmakefile b/GNUmakefile index 7fab077..a1dc034 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -12,8 +12,8 @@ CFLAGS += -Wno-pointer-sign # hard build deps PKG_CONFIG = pkg-config -PKGS_IDA := libexif -PKGS_FBI := freetype2 fontconfig libdrm libexif +PKGS_IDA := libexif libpng +PKGS_FBI := freetype2 fontconfig libdrm libexif libpng 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_LIBPNG := $(call ac_pkg_config,libpng) HAVE_LIBTIFF := $(call ac_pkg_config,libtiff-4) HAVE_LIBWEBP := $(call ac_pkg_config,libwebp) HAVE_LIBSANE := $(call ac_lib,sane_init,sane) @@ -99,10 +98,6 @@ endif ######################################################################## # conditional stuff -ifeq ($(HAVE_LIBPNG),yes) - PKGS_IDA += libpng - PKGS_FBI += libpng -endif ifeq ($(HAVE_LIBTIFF),yes) PKGS_IDA += libtiff-4 PKGS_FBI += libtiff-4 @@ -114,8 +109,8 @@ endif includes = ENDIAN_H STRSIGNAL NEW_EXIF libraries = PCD GIF CURL SANE LIRC -ida_libs = PCD GIF PNG TIFF WEBP CURL SANE -fbi_libs = PCD GIF PNG TIFF WEBP CURL LIRC +ida_libs = PCD GIF TIFF WEBP CURL SANE +fbi_libs = PCD GIF TIFF WEBP CURL LIRC PCD_LDLIBS := -lpcd GIF_LDLIBS := -lgif @@ -123,7 +118,6 @@ SANE_LDLIBS := -lsane CURL_LDLIBS := -lcurl LIRC_LDLIBS := -llirc_client -PNG_OBJS := rd/read-png.o wr/write-png.o TIFF_OBJS := rd/read-tiff.o wr/write-tiff.o WEBP_OBJS := rd/read-webp.o PCD_OBJS := rd/read-pcd.o @@ -133,8 +127,10 @@ CURL_OBJS := curl.o LIRC_OBJS := lirc.o # common objs -OBJS_READER := readers.o rd/read-ppm.o rd/read-bmp.o rd/read-jpeg.o -OBJS_WRITER := writers.o wr/write-ppm.o wr/write-ps.o wr/write-jpeg.o +OBJS_READER := readers.o rd/read-ppm.o rd/read-bmp.o rd/read-jpeg.o \ + rd/read-png.o +OBJS_WRITER := writers.o wr/write-ppm.o wr/write-ps.o wr/write-jpeg.o \ + wr/write-png.o # update various flags depending on HAVE_* CFLAGS += $(call ac_inc_cflags,$(includes)) diff --git a/selections.c b/selections.c index 4803994..35a5132 100644 --- a/selections.c +++ b/selections.c @@ -609,9 +609,7 @@ void ipc_init() #ifdef HAVE_LIBGIF targets[ntargets++] = MIME_IMAGE_GIF; #endif -#ifdef HAVE_LIBPNG targets[ntargets++] = MIME_IMAGE_PNG; -#endif #ifdef HAVE_LIBTIFF targets[ntargets++] = MIME_IMAGE_TIFF; #endif |