From 1610a1f6aa54ad1d97926c1d8605720933059df7 Mon Sep 17 00:00:00 2001 From: giraffedata Date: Sun, 29 Jun 2014 19:18:54 +0000 Subject: Update Advanced series to Release 10.67 git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2221 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- converter/pbm/cmuwmtopbm.c | 8 ++++---- converter/pbm/pbmtoppa/Makefile | 17 +++++++++-------- 2 files changed, 13 insertions(+), 12 deletions(-) (limited to 'converter/pbm') diff --git a/converter/pbm/cmuwmtopbm.c b/converter/pbm/cmuwmtopbm.c index 1f2d21f1..ccf8cfc9 100644 --- a/converter/pbm/cmuwmtopbm.c +++ b/converter/pbm/cmuwmtopbm.c @@ -48,20 +48,20 @@ readCmuwmHeader(FILE * const ifP, rc = pm_readbiglong(ifP, &l); if (rc == -1 ) - pm_error(initReadError); + pm_error("%s", initReadError); if ((uint32_t)l != cmuwmMagic) pm_error("bad magic number in CMU window manager file"); rc = pm_readbiglong(ifP, &l); if (rc == -1) - pm_error(initReadError); + pm_error("%s", initReadError); *colsP = l; rc = pm_readbiglong(ifP, &l); if (rc == -1 ) - pm_error(initReadError); + pm_error("%s", initReadError); *rowsP = l; rc = pm_readbigshort(ifP, &s); if (rc == -1) - pm_error(initReadError); + pm_error("%s", initReadError); *depthP = s; } diff --git a/converter/pbm/pbmtoppa/Makefile b/converter/pbm/pbmtoppa/Makefile index 5f205230..cf31ded6 100644 --- a/converter/pbm/pbmtoppa/Makefile +++ b/converter/pbm/pbmtoppa/Makefile @@ -9,17 +9,18 @@ include $(BUILDDIR)/config.mk all: pbmtoppa -BINARIES = pbmtoppa +PORTBINARIES = pbmtoppa + +BINARIES = $(PORTBINARIES) MERGEBINARIES = $(BINARIES) -OBJECTS = pbmtoppa.o ppa.o pbm.o cutswath.o -MERGE_OBJECTS = pbmtoppa.o2 ppa.o pbm.o cutswath.o +ADDL_OBJECTS = ppa.o pbm.o cutswath.o -include $(SRCDIR)/common.mk +OBJECTS = pbmtoppa.o $(ADDL_OBJECTS) -pbmtoppa: $(OBJECTS) $(NETPBMLIB) $(LIBOPT) - $(LD) -o pbmtoppa $(OBJECTS) \ - -lm $(shell $(LIBOPT) $(NETPBMLIB)) $(LDFLAGS) $(LDLIBS) \ - $(RPATH) $(LADD) +MERGE_OBJECTS = pbmtoppa.o2 $(ADDL_OBJECTS) + +include $(SRCDIR)/common.mk +pbmtoppa: $(OBJECTS) -- cgit 1.4.1