diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-06-29 19:32:13 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-06-29 19:32:13 +0000 |
| commit | 51eb5e0d2722f0cf1033ac158d2fdbcd82b6e800 (patch) | |
| tree | 3b763ebf105fc1136ebcac13b7d4dafca114be68 /converter/pbm | |
| parent | 1610a1f6aa54ad1d97926c1d8605720933059df7 (diff) | |
| download | netpbm-mirror-51eb5e0d2722f0cf1033ac158d2fdbcd82b6e800.tar.gz netpbm-mirror-51eb5e0d2722f0cf1033ac158d2fdbcd82b6e800.tar.xz netpbm-mirror-51eb5e0d2722f0cf1033ac158d2fdbcd82b6e800.zip | |
Reverse messed up commit
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2222 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/pbm')
| -rw-r--r-- | converter/pbm/cmuwmtopbm.c | 8 | ||||
| -rw-r--r-- | converter/pbm/pbmtoppa/Makefile | 17 |
2 files changed, 12 insertions, 13 deletions
diff --git a/converter/pbm/cmuwmtopbm.c b/converter/pbm/cmuwmtopbm.c index ccf8cfc9..1f2d21f1 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("%s", initReadError); + pm_error(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("%s", initReadError); + pm_error(initReadError); *colsP = l; rc = pm_readbiglong(ifP, &l); if (rc == -1 ) - pm_error("%s", initReadError); + pm_error(initReadError); *rowsP = l; rc = pm_readbigshort(ifP, &s); if (rc == -1) - pm_error("%s", initReadError); + pm_error(initReadError); *depthP = s; } diff --git a/converter/pbm/pbmtoppa/Makefile b/converter/pbm/pbmtoppa/Makefile index cf31ded6..5f205230 100644 --- a/converter/pbm/pbmtoppa/Makefile +++ b/converter/pbm/pbmtoppa/Makefile @@ -9,18 +9,17 @@ include $(BUILDDIR)/config.mk all: pbmtoppa -PORTBINARIES = pbmtoppa - -BINARIES = $(PORTBINARIES) +BINARIES = pbmtoppa MERGEBINARIES = $(BINARIES) -ADDL_OBJECTS = ppa.o pbm.o cutswath.o - -OBJECTS = pbmtoppa.o $(ADDL_OBJECTS) - -MERGE_OBJECTS = pbmtoppa.o2 $(ADDL_OBJECTS) +OBJECTS = pbmtoppa.o ppa.o pbm.o cutswath.o +MERGE_OBJECTS = pbmtoppa.o2 ppa.o pbm.o cutswath.o include $(SRCDIR)/common.mk -pbmtoppa: $(OBJECTS) +pbmtoppa: $(OBJECTS) $(NETPBMLIB) $(LIBOPT) + $(LD) -o pbmtoppa $(OBJECTS) \ + -lm $(shell $(LIBOPT) $(NETPBMLIB)) $(LDFLAGS) $(LDLIBS) \ + $(RPATH) $(LADD) + |