diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2009-07-23 01:41:44 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2009-07-23 01:41:44 +0000 |
| commit | 56a7ca0c712c4332037a8d0fd922864a71f537db (patch) | |
| tree | a6cfae03999f6243e13759c4633783cbb2f3f3ae | |
| parent | 1845c823f6a0870a12768a6a415cc4897f34df01 (diff) | |
| download | netpbm-mirror-56a7ca0c712c4332037a8d0fd922864a71f537db.tar.gz netpbm-mirror-56a7ca0c712c4332037a8d0fd922864a71f537db.tar.xz netpbm-mirror-56a7ca0c712c4332037a8d0fd922864a71f537db.zip | |
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
| -rw-r--r-- | converter/other/Makefile | 5 | ||||
| -rw-r--r-- | doc/HISTORY | 3 |
2 files changed, 7 insertions, 1 deletions
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 diff --git a/doc/HISTORY b/doc/HISTORY index 8680adab..ad751b84 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -11,6 +11,9 @@ not yet BJH Release 10.48.00 Add pbmtocis, cistopbm. Thanks John Elliott <jce@seasip.demon.co.uk>. + Build: fix failure of a merge build on a system that doesn't + have the PNG library. + 09.06.27 BJH Release 10.47.00 Add pamsistoaglyph. Thanks Scott Pakin. |