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