From 56a7ca0c712c4332037a8d0fd922864a71f537db Mon Sep 17 00:00:00 2001 From: giraffedata Date: Thu, 23 Jul 2009 01:41:44 +0000 Subject: Fix failure of a merge build on a system that doesn't have the PNG library (don't try to build pngtxt.o) git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@954 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- converter/other/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'converter/other') diff --git a/converter/other/Makefile b/converter/other/Makefile index 61272ab0..db171517 100644 --- a/converter/other/Makefile +++ b/converter/other/Makefile @@ -117,7 +117,10 @@ endif MERGEBINARIES = $(BINARIES) -EXTRA_OBJECTS = exif.o rast.o pngtxt.o bmepsoe.o +EXTRA_OBJECTS = exif.o rast.o bmepsoe.o +ifeq ($(HAVE_PNGLIB),Y) + EXTRA_OBJECTS += pngtxt.o +endif ifneq ($(JPEGLIB),NONE) EXTRA_OBJECTS += jpegdatasource.o endif -- cgit 1.4.1