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
|
--- pnm/Makefile.orig Sat May 27 04:14:52 2000
+++ pnm/Makefile Sat Jun 3 00:00:00 2000
@@ -3,8 +3,7 @@
LIBROOT = pnm
LIBPNM = lib$(LIBROOT).$(NETPBMLIBSUFFIX)
-MAJ = 9
-MIN = 3
+SOVER = 1
PPMDIR = $(SRCDIR)/ppm
LIBPPM = libppm.$(NETPBMLIBSUFFIX)
@@ -61,14 +60,14 @@
pnmsmooth pnmtile pnmtoddif pnmtofits \
pnmtoplainpnm pnmtops pnmtorast \
pnmtosgi pnmtosir pnmtoxwd \
- rasttopnm sgitopnm sirtopnm xwdtopnm zeisstopnm
+ rasttopnm sgitopnm sirtopnm zeisstopnm
MATHBINARIES = pnmgamma pnmnlfilt pnmrotate pnmscale pnmshear
# We don't include programs that have special library dependencies in the
# merge scheme, because we don't want those dependencies to prevent us
# from building all the other programs.
-NOMERGEBINARIES =
+NOMERGEBINARIES = xwdtopnm
ifneq ($(PNGHDR_DIR),NONE)
ifneq ($(PNGLIB_DIR),NONE)
NOMERGEBINARIES += pnmtopng pngtopnm
@@ -105,6 +104,8 @@
MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES))
LIBOBJECTS = libpnm1.o libpnm2.o libpnm3.o libpnm4.o
+LIBSOBJECTS = $(patsubst %.o, %.so, $(LIBOBJECTS))
+LIBSHHOPT = $(SRCDIR)/shhopt/libshhopt.a
MANUALS1 = $(BINARIES) $(SCRIPTS)
MANUALS3 = libpnm
@@ -116,10 +117,12 @@
.PHONY: all
all: $(BINARIES)
- $(MAKE) -C jbig all
PHONY: merge
merge: $(MERGENAME) $(NOMERGEBINARIES)
- $(MAKE) -C jbig all
+
+xwdtopnm: %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT)
+ $(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \
+ $(LIBSHHOPT) $(CDEBUG)
ifeq ($(TIFFLIB_DIR),$(TIFFDIR))
# We're using the internal Tiff library, so make sure it's built
@@ -130,18 +133,18 @@
endif
# The Tiff library references math functions.
-tifftopnm pnmtotiff pnmtotiffcmyk: %: %.o \
- $(NETPBMLIBS) $(TIFFLIB_DIR)/libtiff.$(LIBTIFFSUFFIX) $(LIBOPT)
+tifftopnm pnmtotiff pnmtotiffcmyk: %: %.o $(NETPBMLIBS) $(LIBOPT) \
+ $(TIFFLIB_DIR)/libtiff.$(LIBTIFFSUFFIX) $(LIBSHHOPT)
$(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \
- -L$(TIFFLIB_DIR) -ltiff $(JPEGLD) -lm $(CDEBUG)
+ -L$(TIFFLIB_DIR) -ltiff $(JPEGLD) -lm $(LIBSHHOPT) $(CDEBUG)
pngtopnm pnmtopng: %: %.o $(NETPBMLIBS) $(LIBOPT)
$(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \
-L$(PNGLIB_DIR) -lpng -lz -lm $(CDEBUG)
-jpegtopnm: %: %.o $(NETPBMLIBS) $(LIBOPT)
+jpegtopnm: %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT)
$(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` $(JPEGLD) \
- $(CDEBUG)
+ $(LIBSHHOPT) $(CDEBUG)
ifeq ($(URTLIB_DIR),$(URTDIR))
# We're using the internal URT library, so make sure it's built
@@ -178,22 +181,20 @@
# backward compatibility: program used to be gemtopbm
rm -f $(INSTALLBINARIES)/gemtopbm
ln -s $(INSTALLBINARIES)/gemtopnm$(EXE) $(INSTALLBINARIES)/gemtopbm
- $(MAKE) -C jbig install.bin
.PHONY: install.merge
install.merge: install.merge.common
- $(MAKE) -C jbig install.bin
.PHONY: install.lib
install.lib: install.lib.common
.PHONY: install.man
install.man: install.man.common
- $(MAKE) -C jbig install.man
+$(SRCDIR)/shhopt/libshhopt.a:
+ cd ../shhopt; $(MAKE) libshhopt.a
.PHONY: clean
clean: clean.common
- $(MAKE) -C jbig clean
FORCE:
|
