diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2008-12-28 19:13:20 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2008-12-28 19:13:20 +0000 |
| commit | 86f29c0eb54d03d4a5c8703cf8386ee5cb7a95c5 (patch) | |
| tree | 3b30fd23aa36e1c8d7b55bf6663ceeaf5c6b5c8f /converter/pbm | |
| parent | a2f8752d2bd1379f7bbe422027c041925802f029 (diff) | |
| download | netpbm-mirror-86f29c0eb54d03d4a5c8703cf8386ee5cb7a95c5.tar.gz netpbm-mirror-86f29c0eb54d03d4a5c8703cf8386ee5cb7a95c5.tar.xz netpbm-mirror-86f29c0eb54d03d4a5c8703cf8386ee5cb7a95c5.zip | |
Release 10.45.0 - rebase to current trunk
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@801 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/pbm')
| -rw-r--r-- | converter/pbm/Makefile | 4 | ||||
| -rw-r--r-- | converter/pbm/g3topbm.c | 4 | ||||
| -rw-r--r-- | converter/pbm/pbmtoppa/Makefile | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/converter/pbm/Makefile b/converter/pbm/Makefile index f1533ab2..c859b105 100644 --- a/converter/pbm/Makefile +++ b/converter/pbm/Makefile @@ -5,7 +5,7 @@ endif SUBDIR = converter/pbm VPATH=.:$(SRCDIR)/$(SUBDIR) -include $(BUILDDIR)/Makefile.config +include $(BUILDDIR)/config.mk PORTBINARIES = atktopbm brushtopbm cmuwmtopbm ddbugtopbm g3topbm escp2topbm \ icontopbm macptopbm mdatopbm mgrtopbm mrftopbm \ @@ -41,7 +41,7 @@ SUBDIRS=pbmtoppa .PHONY: all all: $(BINARIES) $(SUBDIRS:%=%/all) -include $(SRCDIR)/Makefile.common +include $(SRCDIR)/common.mk ifneq ($(LEX)x,x) thinkjettopbm.c1:%.c1:%.l diff --git a/converter/pbm/g3topbm.c b/converter/pbm/g3topbm.c index 2d2c6a42..3858dc7a 100644 --- a/converter/pbm/g3topbm.c +++ b/converter/pbm/g3topbm.c @@ -656,8 +656,8 @@ analyzeLineSize(lineSizeAnalyzer * const analyzerP, /* An empty line means EOF. An ancient comment in the code said there - is supposed to 6 EOL marks in a row to indicate EOF, but the code - checked for 3 and considered 2 in row just to mean a zero length + is supposed to be 6 EOL marks in a row to indicate EOF, but the code + checked for 3 and considered 2 in a row just to mean a zero length line. Starting in Netpbm 10.24 (August 2004), we assume there is no valid reason to have an empty line and recognize EOF as any empty line. Alternatively, we could read off and ignore two empty diff --git a/converter/pbm/pbmtoppa/Makefile b/converter/pbm/pbmtoppa/Makefile index ba15adaa..5f205230 100644 --- a/converter/pbm/pbmtoppa/Makefile +++ b/converter/pbm/pbmtoppa/Makefile @@ -5,7 +5,7 @@ endif SUBDIR = converter/pbm/pbmtoppa VPATH=.:$(SRCDIR)/$(SUBDIR) -include $(BUILDDIR)/Makefile.config +include $(BUILDDIR)/config.mk all: pbmtoppa @@ -16,7 +16,7 @@ MERGEBINARIES = $(BINARIES) OBJECTS = pbmtoppa.o ppa.o pbm.o cutswath.o MERGE_OBJECTS = pbmtoppa.o2 ppa.o pbm.o cutswath.o -include $(SRCDIR)/Makefile.common +include $(SRCDIR)/common.mk pbmtoppa: $(OBJECTS) $(NETPBMLIB) $(LIBOPT) $(LD) -o pbmtoppa $(OBJECTS) \ |