Thu Jul 6 13:13:30 2017 UTC ()
Honor LDFLAGS. Fixes RELRO build.


(wiz)
diff -r1.6 -r1.7 pkgsrc/graphics/jbigkit/distinfo
diff -r1.4 -r1.5 pkgsrc/graphics/jbigkit/patches/patch-aa
diff -r1.5 -r1.6 pkgsrc/graphics/jbigkit/patches/patch-ab
cvs diff -r1.6 -r1.7 pkgsrc/graphics/jbigkit/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/jbigkit/distinfo 2015/11/03 21:34:04 1.6
+++ pkgsrc/graphics/jbigkit/distinfo 2017/07/06 13:13:30 1.7
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.6 2015/11/03 21:34:04 agc Exp $ 1$NetBSD: distinfo,v 1.7 2017/07/06 13:13:30 wiz Exp $
2 2
3SHA1 (jbigkit-2.1.tar.gz) = 4864646df004e8331d19f2fa103ed731fdb6c099 3SHA1 (jbigkit-2.1.tar.gz) = 4864646df004e8331d19f2fa103ed731fdb6c099
4RMD160 (jbigkit-2.1.tar.gz) = 71cc51fce3f65d8d9abf9ff52c29edf5469eb52f 4RMD160 (jbigkit-2.1.tar.gz) = 71cc51fce3f65d8d9abf9ff52c29edf5469eb52f
5SHA512 (jbigkit-2.1.tar.gz) = c4127480470ef90db1ef3bd2caa444df10b50ed8df0bc9997db7612cb48b49278baf44965028f1807a21028eb965d677e015466306b44683c4ec75a23e1922cf 5SHA512 (jbigkit-2.1.tar.gz) = c4127480470ef90db1ef3bd2caa444df10b50ed8df0bc9997db7612cb48b49278baf44965028f1807a21028eb965d677e015466306b44683c4ec75a23e1922cf
6Size (jbigkit-2.1.tar.gz) = 438710 bytes 6Size (jbigkit-2.1.tar.gz) = 438710 bytes
7SHA1 (patch-Makefile) = 3b5e5814be3f361b1ce5ffdd483e4078b94c4bf6 7SHA1 (patch-Makefile) = 3b5e5814be3f361b1ce5ffdd483e4078b94c4bf6
8SHA1 (patch-aa) = 2f9d98f7cfd2ab9065edc2c36905b4416b3970cd 8SHA1 (patch-aa) = 7786ab0be7e718549da37378588a8ba55ef8f187
9SHA1 (patch-ab) = 97550e42fdc1a358f5d3fb5b33e92ea2520b0f09 9SHA1 (patch-ab) = 893a3eeb636a92199d3759255b3ebef6d646d01e
cvs diff -r1.4 -r1.5 pkgsrc/graphics/jbigkit/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/graphics/jbigkit/patches/patch-aa 2014/04/10 12:04:16 1.4
+++ pkgsrc/graphics/jbigkit/patches/patch-aa 2017/07/06 13:13:30 1.5
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1$NetBSD: patch-aa,v 1.4 2014/04/10 12:04:16 obache Exp $ 1$NetBSD: patch-aa,v 1.5 2017/07/06 13:13:30 wiz Exp $
2 2
3* prevent to overwrite our CC/CFLAGS settings 3* prevent to overwrite our CC/CFLAGS settings
4* libtoolize 4* libtoolize
 5* honor LDFLAGS
5 6
6--- libjbig/Makefile.orig 2014-03-27 18:47:15.000000000 +0000 7--- libjbig/Makefile.orig 2014-03-27 18:47:15.000000000 +0000
7+++ libjbig/Makefile 8+++ libjbig/Makefile 2017-07-06 13:12:02.765268063 +0000
8@@ -1,34 +1,34 @@ 9@@ -1,34 +1,34 @@
9 # Unix makefile for the JBIG-KIT library 10 # Unix makefile for the JBIG-KIT library
10  11
11 # Select an ANSI/ISO C compiler here, GNU gcc is recommended 12 # Select an ANSI/ISO C compiler here, GNU gcc is recommended
12-CC = gcc 13-CC = gcc
13+CC ?= gcc 14+CC ?= gcc
14  15
15 # Options for the compiler: A high optimization level is suggested 16 # Options for the compiler: A high optimization level is suggested
16-CFLAGS = -g -O -W -Wall -ansi -pedantic # --coverage 17-CFLAGS = -g -O -W -Wall -ansi -pedantic # --coverage
17+CFLAGS += -W -Wall -ansi -pedantic # --coverage 18+CFLAGS += -W -Wall -ansi -pedantic # --coverage
18  19
19-all: libjbig.a libjbig85.a tstcodec tstcodec85 20-all: libjbig.a libjbig85.a tstcodec tstcodec85
20+.SUFFIXES: .lo 21+.SUFFIXES: .lo
@@ -34,46 +35,46 @@ $NetBSD: patch-aa,v 1.4 2014/04/10 12:04 @@ -34,46 +35,46 @@ $NetBSD: patch-aa,v 1.4 2014/04/10 12:04
34- -ranlib libjbig.a 35- -ranlib libjbig.a
35- 36-
36-libjbig85.a: jbig85.o jbig_ar.o 37-libjbig85.a: jbig85.o jbig_ar.o
37- rm -f libjbig85.a 38- rm -f libjbig85.a
38- ar rc libjbig85.a jbig85.o jbig_ar.o 39- ar rc libjbig85.a jbig85.o jbig_ar.o
39- -ranlib libjbig85.a 40- -ranlib libjbig85.a
40- 41-
41-jbig.o: jbig.c jbig.h jbig_ar.h 42-jbig.o: jbig.c jbig.h jbig_ar.h
42-jbig85.o: jbig85.c jbig85.h jbig_ar.h 43-jbig85.o: jbig85.c jbig85.h jbig_ar.h
43-jbig_ar.o: jbig_ar.c jbig_ar.h 44-jbig_ar.o: jbig_ar.c jbig_ar.h
44-tstcodec.o: tstcodec.c jbig.h 45-tstcodec.o: tstcodec.c jbig.h
45-tstcodec85.o: tstcodec85.c jbig85.h 46-tstcodec85.o: tstcodec85.c jbig85.h
46+tstcodec: tstcodec.lo jbig.lo jbig_ar.lo 47+tstcodec: tstcodec.lo jbig.lo jbig_ar.lo
47+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o tstcodec tstcodec.lo jbig.lo jbig_ar.lo 48+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o tstcodec tstcodec.lo jbig.lo jbig_ar.lo
48+ 49+
49+tstcodec85: tstcodec85.lo jbig85.lo jbig_ar.lo 50+tstcodec85: tstcodec85.lo jbig85.lo jbig_ar.lo
50+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o tstcodec85 tstcodec85.lo jbig85.lo jbig_ar.lo 51+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o tstcodec85 tstcodec85.lo jbig85.lo jbig_ar.lo
51+ 52+
52+libjbig.la: jbig.lo jbig_ar.lo 53+libjbig.la: jbig.lo jbig_ar.lo
53+ $(LIBTOOL) --mode=link $(CC) -o libjbig.la jbig.lo jbig_ar.lo -rpath ${PREFIX}/lib -version-info 2:1 54+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libjbig.la jbig.lo jbig_ar.lo -rpath ${PREFIX}/lib -version-info 2:1
54+ 55+
55+libjbig85.la: jbig85.lo jbig_ar.lo 56+libjbig85.la: jbig85.lo jbig_ar.lo
56+ $(LIBTOOL) --mode=link $(CC) -o libjbig85.la jbig85.lo jbig_ar.lo -rpath ${PREFIX}/lib -version-info 2:1 57+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libjbig85.la jbig85.lo jbig_ar.lo -rpath ${PREFIX}/lib -version-info 2:1
57+ 58+
58+jbig.lo: jbig.c jbig.h jbig_ar.h 59+jbig.lo: jbig.c jbig.h jbig_ar.h
59+jbig85.lo: jbig85.c jbig85.h jbig_ar.h 60+jbig85.lo: jbig85.c jbig85.h jbig_ar.h
60+jbig_ar.lo: jbig_ar.c jbig_ar.h 61+jbig_ar.lo: jbig_ar.c jbig_ar.h
61+tstcodec.lo: tstcodec.c jbig.h 62+tstcodec.lo: tstcodec.c jbig.h
62+tstcodec85.lo: tstcodec85.c jbig85.h 63+tstcodec85.lo: tstcodec85.c jbig85.h
63  64
64 update-po: jbig.c jbig85.c Makefile 65 update-po: jbig.c jbig85.c Makefile
65 xgettext -ojbig.pot -k_ \ 66 xgettext -ojbig.pot -k_ \
66@@ -43,11 +43,11 @@ analyze: 67@@ -43,11 +43,11 @@
67 clang --analyze *.c 68 clang --analyze *.c
68  69
69 test: tstcodec tstcodec85 70 test: tstcodec tstcodec85
70- ./tstcodec 71- ./tstcodec
71- ./tstcodec85 72- ./tstcodec85
72+ ${LIBTOOL} --mode=execute ./tstcodec 73+ ${LIBTOOL} --mode=execute ./tstcodec
73+ ${LIBTOOL} --mode=execute ./tstcodec85 74+ ${LIBTOOL} --mode=execute ./tstcodec85
74  75
75 t82test.pbm: tstcodec 76 t82test.pbm: tstcodec
76- ./tstcodec $@ 77- ./tstcodec $@
77+ ${LIBTOOL} --mode=execute ./tstcodec $@ 78+ ${LIBTOOL} --mode=execute ./tstcodec $@
78  79
79 clean: 80 clean:
cvs diff -r1.5 -r1.6 pkgsrc/graphics/jbigkit/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/graphics/jbigkit/patches/patch-ab 2014/04/10 12:04:16 1.5
+++ pkgsrc/graphics/jbigkit/patches/patch-ab 2017/07/06 13:13:30 1.6
@@ -1,137 +1,138 @@ @@ -1,137 +1,138 @@
1$NetBSD: patch-ab,v 1.5 2014/04/10 12:04:16 obache Exp $ 1$NetBSD: patch-ab,v 1.6 2017/07/06 13:13:30 wiz Exp $
2 2
3* prevent to overwrite our CC/CFLAGS settings 3* prevent to overwrite our CC/CFLAGS settings
4* libtoolize 4* libtoolize
 5* honor LDFLAGS
5 6
6--- pbmtools/Makefile.orig 2014-03-27 18:47:15.000000000 +0000 7--- pbmtools/Makefile.orig 2014-03-27 18:47:15.000000000 +0000
7+++ pbmtools/Makefile 8+++ pbmtools/Makefile 2017-07-06 13:10:32.065421108 +0000
8@@ -1,43 +1,46 @@ 9@@ -1,43 +1,46 @@
9 # Unix makefile for the JBIG-KIT PBM tools 10 # Unix makefile for the JBIG-KIT PBM tools
10  11
11 # Select an ANSI/ISO C compiler here, e.g. GNU gcc is recommended 12 # Select an ANSI/ISO C compiler here, e.g. GNU gcc is recommended
12-CC = gcc 13-CC = gcc
13+CC ?= gcc 14+CC ?= gcc
14  15
15 # Options for the compiler 16 # Options for the compiler
16-CFLAGS = -g -O -W -Wall -Wno-unused-result -ansi -pedantic # --coverage 17-CFLAGS = -g -O -W -Wall -Wno-unused-result -ansi -pedantic # --coverage
17+CFLAGS += -W -Wall -Wno-unused-result -ansi -pedantic # --coverage  18+CFLAGS += -W -Wall -Wno-unused-result -ansi -pedantic # --coverage
18 CPPFLAGS = -I../libjbig  19 CPPFLAGS = -I../libjbig
19  20
20-.SUFFIXES: .1 .5 .txt $(SUFFIXES) 21-.SUFFIXES: .1 .5 .txt $(SUFFIXES)
21+.SUFFIXES: .1 .5 .txt .lo $(SUFFIXES) 22+.SUFFIXES: .1 .5 .txt .lo $(SUFFIXES)
22 .PHONY: txt test test82 test85 clean 23 .PHONY: txt test test82 test85 clean
23  24
24+.c.lo: 25+.c.lo:
25+ ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -I../libjbig -o $@ -c $< 26+ ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -I../libjbig -o $@ -c $<
26+ 27+
27 all: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85 txt 28 all: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85 txt
28  29
29 txt: pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt 30 txt: pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
30  31
31-pbmtojbg: pbmtojbg.o ../libjbig/libjbig.a 32-pbmtojbg: pbmtojbg.o ../libjbig/libjbig.a
32- $(CC) $(CFLAGS) -o pbmtojbg pbmtojbg.o -L../libjbig -ljbig 33- $(CC) $(CFLAGS) -o pbmtojbg pbmtojbg.o -L../libjbig -ljbig
33+pbmtojbg: pbmtojbg.lo ../libjbig/libjbig.la 34+pbmtojbg: pbmtojbg.lo ../libjbig/libjbig.la
34+ ${LIBTOOL} --mode=link $(CC) $(CFLAGS) -o pbmtojbg pbmtojbg.lo ../libjbig/libjbig.la -R ${PREFIX}/lib 35+ ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o pbmtojbg pbmtojbg.lo ../libjbig/libjbig.la -R ${PREFIX}/lib
35  36
36-jbgtopbm: jbgtopbm.o ../libjbig/libjbig.a 37-jbgtopbm: jbgtopbm.o ../libjbig/libjbig.a
37- $(CC) $(CFLAGS) -o jbgtopbm jbgtopbm.o -L../libjbig -ljbig 38- $(CC) $(CFLAGS) -o jbgtopbm jbgtopbm.o -L../libjbig -ljbig
38+jbgtopbm: jbgtopbm.lo ../libjbig/libjbig.la 39+jbgtopbm: jbgtopbm.lo ../libjbig/libjbig.la
39+ ${LIBTOOL} --mode=link $(CC) $(CFLAGS) -o jbgtopbm jbgtopbm.lo ../libjbig/libjbig.la -R ${PREFIX}/lib 40+ ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o jbgtopbm jbgtopbm.lo ../libjbig/libjbig.la -R ${PREFIX}/lib
40  41
41-pbmtojbg85: pbmtojbg85.o ../libjbig/libjbig85.a 42-pbmtojbg85: pbmtojbg85.o ../libjbig/libjbig85.a
42- $(CC) $(CFLAGS) -o pbmtojbg85 pbmtojbg85.o -L../libjbig -ljbig85 43- $(CC) $(CFLAGS) -o pbmtojbg85 pbmtojbg85.o -L../libjbig -ljbig85
43+pbmtojbg85: pbmtojbg85.lo ../libjbig/libjbig85.la 44+pbmtojbg85: pbmtojbg85.lo ../libjbig/libjbig85.la
44+ ${LIBTOOL} --mode=link $(CC) $(CFLAGS) -o pbmtojbg85 pbmtojbg85.lo ../libjbig/libjbig85.la -R ${PREFIX}/lib 45+ ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o pbmtojbg85 pbmtojbg85.lo ../libjbig/libjbig85.la -R ${PREFIX}/lib
45  46
46-jbgtopbm85: jbgtopbm85.o ../libjbig/libjbig85.a 47-jbgtopbm85: jbgtopbm85.o ../libjbig/libjbig85.a
47- $(CC) $(CFLAGS) -o jbgtopbm85 jbgtopbm85.o -L../libjbig -ljbig85 48- $(CC) $(CFLAGS) -o jbgtopbm85 jbgtopbm85.o -L../libjbig -ljbig85
48+jbgtopbm85: jbgtopbm85.lo ../libjbig/libjbig85.la 49+jbgtopbm85: jbgtopbm85.lo ../libjbig/libjbig85.la
49+ ${LIBTOOL} --mode=link $(CC) $(CFLAGS) -o jbgtopbm85 jbgtopbm85.lo ../libjbig/libjbig85.la -R ${PREFIX}/lib 50+ ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o jbgtopbm85 jbgtopbm85.lo ../libjbig/libjbig85.la -R ${PREFIX}/lib
50  51
51-jbgtopbm.o: jbgtopbm.c ../libjbig/jbig.h 52-jbgtopbm.o: jbgtopbm.c ../libjbig/jbig.h
52-pbmtojbg.o: pbmtojbg.c ../libjbig/jbig.h 53-pbmtojbg.o: pbmtojbg.c ../libjbig/jbig.h
53-jbgtopbm85.o: jbgtopbm85.c ../libjbig/jbig85.h 54-jbgtopbm85.o: jbgtopbm85.c ../libjbig/jbig85.h
54-pbmtojbg85.o: pbmtojbg85.c ../libjbig/jbig85.h 55-pbmtojbg85.o: pbmtojbg85.c ../libjbig/jbig85.h
55+jbgtopbm.lo: jbgtopbm.c ../libjbig/jbig.h 56+jbgtopbm.lo: jbgtopbm.c ../libjbig/jbig.h
56+pbmtojbg.lo: pbmtojbg.c ../libjbig/jbig.h 57+pbmtojbg.lo: pbmtojbg.c ../libjbig/jbig.h
57+jbgtopbm85.lo: jbgtopbm85.c ../libjbig/jbig85.h 58+jbgtopbm85.lo: jbgtopbm85.c ../libjbig/jbig85.h
58+pbmtojbg85.lo: pbmtojbg85.c ../libjbig/jbig85.h 59+pbmtojbg85.lo: pbmtojbg85.c ../libjbig/jbig85.h
59  60
60-../libjbig/libjbig.a: ../libjbig/jbig.c ../libjbig/jbig.h \ 61-../libjbig/libjbig.a: ../libjbig/jbig.c ../libjbig/jbig.h \
61+../libjbig/libjbig.la: ../libjbig/jbig.c ../libjbig/jbig.h \ 62+../libjbig/libjbig.la: ../libjbig/jbig.c ../libjbig/jbig.h \
62 ../libjbig/jbig_ar.c ../libjbig/jbig_ar.h 63 ../libjbig/jbig_ar.c ../libjbig/jbig_ar.h
63- make -C ../libjbig libjbig.a 64- make -C ../libjbig libjbig.a
64+ make -C ../libjbig libjbig.la 65+ make -C ../libjbig libjbig.la
65  66
66-../libjbig/libjbig85.a: ../libjbig/jbig85.c ../libjbig/jbig85.h \ 67-../libjbig/libjbig85.a: ../libjbig/jbig85.c ../libjbig/jbig85.h \
67+../libjbig/libjbig85.la: ../libjbig/jbig85.c ../libjbig/jbig85.h \ 68+../libjbig/libjbig85.la: ../libjbig/jbig85.c ../libjbig/jbig85.h \
68 ../libjbig/jbig_ar.c ../libjbig/jbig_ar.h 69 ../libjbig/jbig_ar.c ../libjbig/jbig_ar.h
69- make -C ../libjbig libjbig85.a 70- make -C ../libjbig libjbig85.a
70+ make -C ../libjbig libjbig85.la 71+ make -C ../libjbig libjbig85.la
71  72
72 analyze: 73 analyze:
73 clang $(CPPFLAGS) --analyze *.c 74 clang $(CPPFLAGS) --analyze *.c
74@@ -62,18 +65,18 @@ test82: pbmtojbg jbgtopbm 75@@ -62,18 +65,18 @@
75 make IMG=mx "OPTIONSP=-q -Y -1" dotest2b 76 make IMG=mx "OPTIONSP=-q -Y -1" dotest2b
76 make IMG=mx "OPTIONSP=-Y -1" dotest2b 77 make IMG=mx "OPTIONSP=-Y -1" dotest2b
77 rm -f test-*.jbg test-*.pbm test-*.pgm 78 rm -f test-*.jbg test-*.pbm test-*.pgm
78- ./jbgtopbm ../examples/ccitt1.jbg | ./pbmtojbg > test-ccitt1.jbg 79- ./jbgtopbm ../examples/ccitt1.jbg | ./pbmtojbg > test-ccitt1.jbg
79+ ${LIBTOOL} --mode=execute ./jbgtopbm ../examples/ccitt1.jbg | ./pbmtojbg > test-ccitt1.jbg 80+ ${LIBTOOL} --mode=execute ./jbgtopbm ../examples/ccitt1.jbg | ./pbmtojbg > test-ccitt1.jbg
80 cmp ../examples/ccitt1.jbg test-ccitt1.jbg 81 cmp ../examples/ccitt1.jbg test-ccitt1.jbg
81 rm -f test-*.jbg test-*.pbm test-*.pgm 82 rm -f test-*.jbg test-*.pbm test-*.pgm
82- ./jbgtopbm < ../examples/ccitt1.jbg | ./pbmtojbg - test-ccitt1.jbg 83- ./jbgtopbm < ../examples/ccitt1.jbg | ./pbmtojbg - test-ccitt1.jbg
83+ ${LIBTOOL} --mode=execute ./jbgtopbm < ../examples/ccitt1.jbg | ./pbmtojbg - test-ccitt1.jbg 84+ ${LIBTOOL} --mode=execute ./jbgtopbm < ../examples/ccitt1.jbg | ./pbmtojbg - test-ccitt1.jbg
84 cmp ../examples/ccitt1.jbg test-ccitt1.jbg 85 cmp ../examples/ccitt1.jbg test-ccitt1.jbg
85 rm -f test-*.jbg test-*.pbm test-*.pgm 86 rm -f test-*.jbg test-*.pbm test-*.pgm
86- ./jbgtopbm < ../examples/ccitt1.jbg - test-ccitt1.pbm ; \ 87- ./jbgtopbm < ../examples/ccitt1.jbg - test-ccitt1.pbm ; \
87- ./pbmtojbg test-ccitt1.pbm test-ccitt1.jbg 88- ./pbmtojbg test-ccitt1.pbm test-ccitt1.jbg
88+ ${LIBTOOL} --mode=execute ./jbgtopbm < ../examples/ccitt1.jbg - test-ccitt1.pbm ; \ 89+ ${LIBTOOL} --mode=execute ./jbgtopbm < ../examples/ccitt1.jbg - test-ccitt1.pbm ; \
89+ ${LIBTOOL} --mode=execute ./pbmtojbg test-ccitt1.pbm test-ccitt1.jbg 90+ ${LIBTOOL} --mode=execute ./pbmtojbg test-ccitt1.pbm test-ccitt1.jbg
90 cmp ../examples/ccitt1.jbg test-ccitt1.jbg 91 cmp ../examples/ccitt1.jbg test-ccitt1.jbg
91 rm -f test-*.jbg test-*.pbm test-*.pgm 92 rm -f test-*.jbg test-*.pbm test-*.pgm
92- ./jbgtopbm ../examples/ccitt1.jbg test-ccitt1.pbm ; \ 93- ./jbgtopbm ../examples/ccitt1.jbg test-ccitt1.pbm ; \
93- ./pbmtojbg test-ccitt1.pbm >test-ccitt1.jbg 94- ./pbmtojbg test-ccitt1.pbm >test-ccitt1.jbg
94+ ${LIBTOOL} --mode=execute ./jbgtopbm ../examples/ccitt1.jbg test-ccitt1.pbm ; \ 95+ ${LIBTOOL} --mode=execute ./jbgtopbm ../examples/ccitt1.jbg test-ccitt1.pbm ; \
95+ ${LIBTOOL} --mode=execute ./pbmtojbg test-ccitt1.pbm >test-ccitt1.jbg 96+ ${LIBTOOL} --mode=execute ./pbmtojbg test-ccitt1.pbm >test-ccitt1.jbg
96 cmp ../examples/ccitt1.jbg test-ccitt1.jbg 97 cmp ../examples/ccitt1.jbg test-ccitt1.jbg
97 rm -f test-*.jbg test-*.pbm test-*.pgm 98 rm -f test-*.jbg test-*.pbm test-*.pgm
98 @echo 99 @echo
99@@ -81,18 +84,18 @@ test82: pbmtojbg jbgtopbm 100@@ -81,18 +84,18 @@
100 @echo 101 @echo
101  102
102 dotest1: 103 dotest1:
103- ./jbgtopbm ../examples/$(IMG).jbg test-$(IMG).pbm 104- ./jbgtopbm ../examples/$(IMG).jbg test-$(IMG).pbm
104- ./pbmtojbg $(OPTIONSP) test-$(IMG).pbm test-$(IMG).jbg 105- ./pbmtojbg $(OPTIONSP) test-$(IMG).pbm test-$(IMG).jbg
105+ ${LIBTOOL} --mode=execute ./jbgtopbm ../examples/$(IMG).jbg test-$(IMG).pbm 106+ ${LIBTOOL} --mode=execute ./jbgtopbm ../examples/$(IMG).jbg test-$(IMG).pbm
106+ ${LIBTOOL} --mode=execute ./pbmtojbg $(OPTIONSP) test-$(IMG).pbm test-$(IMG).jbg 107+ ${LIBTOOL} --mode=execute ./pbmtojbg $(OPTIONSP) test-$(IMG).pbm test-$(IMG).jbg
107 cmp test-$(IMG).jbg ../examples/$(IMG).jbg 108 cmp test-$(IMG).jbg ../examples/$(IMG).jbg
108  109
109 dotest2b: 110 dotest2b:
110- ./pbmtojbg $(OPTIONSP) test-$(IMG).pbm test-$(IMG).jbg 111- ./pbmtojbg $(OPTIONSP) test-$(IMG).pbm test-$(IMG).jbg
111- ./jbgtopbm $(OPTIONSJ) test-$(IMG).jbg test-$(IMG)-2.pbm 112- ./jbgtopbm $(OPTIONSJ) test-$(IMG).jbg test-$(IMG)-2.pbm
112+ ${LIBTOOL} --mode=execute ./pbmtojbg $(OPTIONSP) test-$(IMG).pbm test-$(IMG).jbg 113+ ${LIBTOOL} --mode=execute ./pbmtojbg $(OPTIONSP) test-$(IMG).pbm test-$(IMG).jbg
113+ ${LIBTOOL} --mode=execute ./jbgtopbm $(OPTIONSJ) test-$(IMG).jbg test-$(IMG)-2.pbm 114+ ${LIBTOOL} --mode=execute ./jbgtopbm $(OPTIONSJ) test-$(IMG).jbg test-$(IMG)-2.pbm
114 cmp test-$(IMG).pbm test-$(IMG)-2.pbm 115 cmp test-$(IMG).pbm test-$(IMG)-2.pbm
115  116
116 dotest2g: 117 dotest2g:
117- ./pbmtojbg $(OPTIONSP) ../examples/$(IMG).pgm test-$(IMG).jbg 118- ./pbmtojbg $(OPTIONSP) ../examples/$(IMG).pgm test-$(IMG).jbg
118- ./jbgtopbm $(OPTIONSJ) test-$(IMG).jbg test-$(IMG).pgm 119- ./jbgtopbm $(OPTIONSJ) test-$(IMG).jbg test-$(IMG).pgm
119+ ${LIBTOOL} --mode=execute ./pbmtojbg $(OPTIONSP) ../examples/$(IMG).pgm test-$(IMG).jbg 120+ ${LIBTOOL} --mode=execute ./pbmtojbg $(OPTIONSP) ../examples/$(IMG).pgm test-$(IMG).jbg
120+ ${LIBTOOL} --mode=execute ./jbgtopbm $(OPTIONSJ) test-$(IMG).jbg test-$(IMG).pgm 121+ ${LIBTOOL} --mode=execute ./jbgtopbm $(OPTIONSJ) test-$(IMG).jbg test-$(IMG).pgm
121 cmp test-$(IMG).pgm ../examples/$(IMG).pgm 122 cmp test-$(IMG).pgm ../examples/$(IMG).pgm
122  123
123 test85: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85 test-t82.pbm 124 test85: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85 test-t82.pbm
124@@ -120,41 +123,41 @@ test85: pbmtojbg jbgtopbm pbmtojbg85 jbg 125@@ -120,41 +123,41 @@
125 @echo 126 @echo
126  127
127 dotest85: test-$(IMG).pbm 128 dotest85: test-$(IMG).pbm
128- ./pbmtojbg85 $(OPTIONSP) test-$(IMG).pbm test-$(IMG).jbg85 129- ./pbmtojbg85 $(OPTIONSP) test-$(IMG).pbm test-$(IMG).jbg85
129+ ${LIBTOOL} --mode=execute ./pbmtojbg85 $(OPTIONSP) test-$(IMG).pbm test-$(IMG).jbg85 130+ ${LIBTOOL} --mode=execute ./pbmtojbg85 $(OPTIONSP) test-$(IMG).pbm test-$(IMG).jbg85
130 ls -l test-$(IMG).jbg85 131 ls -l test-$(IMG).jbg85
131- ./jbgtopbm test-$(IMG).jbg85 test-$(IMG).pbm85 132- ./jbgtopbm test-$(IMG).jbg85 test-$(IMG).pbm85
132+ ${LIBTOOL} --mode=execute ./jbgtopbm test-$(IMG).jbg85 test-$(IMG).pbm85 133+ ${LIBTOOL} --mode=execute ./jbgtopbm test-$(IMG).jbg85 test-$(IMG).pbm85
133 cmp test-$(IMG).pbm test-$(IMG).pbm85 134 cmp test-$(IMG).pbm test-$(IMG).pbm85
134 rm test-$(IMG).pbm85 135 rm test-$(IMG).pbm85
135- ./jbgtopbm85 test-$(IMG).jbg85 test-$(IMG).pbm85 136- ./jbgtopbm85 test-$(IMG).jbg85 test-$(IMG).pbm85
136+ ${LIBTOOL} --mode=execute ./jbgtopbm85 test-$(IMG).jbg85 test-$(IMG).pbm85 137+ ${LIBTOOL} --mode=execute ./jbgtopbm85 test-$(IMG).jbg85 test-$(IMG).pbm85
137 cmp test-$(IMG).pbm test-$(IMG).pbm85 138 cmp test-$(IMG).pbm test-$(IMG).pbm85