2000-05-19 08:34:13 +00:00
|
|
|
--- ppm/Makefile.orig Sat May 6 12:57:43 2000
|
|
|
|
+++ ppm/Makefile Mon May 8 00:00:00 2000
|
|
|
|
@@ -3,7 +3,7 @@
|
|
|
|
|
|
|
|
LIBROOT = ppm
|
|
|
|
LIBPPM = lib$(LIBROOT).$(NETPBMLIBSUFFIX)
|
|
|
|
-MAJ = 9
|
|
|
|
+MAJ = 1
|
|
|
|
MIN = 1
|
|
|
|
|
|
|
|
PGMDIR = $(SRCDIR)/pgm
|
|
|
|
@@ -19,12 +19,13 @@
|
2000-04-01 23:57:38 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
NETPBMLIBS = $(LIBPPM) $(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM)
|
|
|
|
+NETPBMLD = -L. -lppm -L$(PBMDIR) -lpbm -L$(PGMDIR) -lpgm
|
2000-04-07 21:54:04 +00:00
|
|
|
LIBLIBS = $(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM)
|
2000-04-01 23:57:38 +00:00
|
|
|
|
2000-04-07 21:54:04 +00:00
|
|
|
PORTBINARIES = bmptoppm eyuvtoppm gouldtoppm hpcdtoppm ilbmtoppm imgtoppm \
|
2000-04-08 06:12:34 +00:00
|
|
|
mtvtoppm pcxtoppm pgmtoppm pi1toppm picttoppm \
|
|
|
|
pjtoppm \
|
2000-05-19 08:34:13 +00:00
|
|
|
- ppm3d ppmbrighten ppmchange ppmcolormask \
|
|
|
|
+ ppm3d ppmbrighten ppmchange \
|
|
|
|
ppmdim ppmdist ppmdither \
|
|
|
|
ppmflash ppmhist ppmmake ppmmix ppmnorm \
|
|
|
|
ppmquant ppmrelief ppmshift ppmspread ppmtoacad \
|
|
|
|
@@ -34,19 +35,20 @@
|
2000-04-27 11:28:19 +00:00
|
|
|
ppmtotga ppmtouil ppmtoxpm ppmtoyuv \
|
2000-05-19 08:34:13 +00:00
|
|
|
ppmtoyuvsplit ppmtv \
|
2000-04-27 11:28:19 +00:00
|
|
|
qrttoppm rawtoppm rgb3toppm sldtoppm spctoppm \
|
|
|
|
- sputoppm tgatoppm ximtoppm xpmtoppm xvminitoppm \
|
|
|
|
+ sputoppm xpmtoppm xvminitoppm \
|
|
|
|
yuvtoppm yuvsplittoppm
|
|
|
|
|
2000-04-07 21:54:04 +00:00
|
|
|
# We don't build vidtoppm by default, because it requires special libraries
|
|
|
|
# and there is no known requirement for vidtoppm.
|
2000-04-01 23:57:38 +00:00
|
|
|
|
2000-05-19 08:34:13 +00:00
|
|
|
+NOMERGEBINARIES = ppmcolormask ppmntsc tgatoppm ximtoppm
|
2000-04-01 23:57:38 +00:00
|
|
|
ifneq ($(JPEGLIB_DIR), NONE)
|
|
|
|
ifneq ($(JPEGHDR_DIR), NONE)
|
|
|
|
NOMERGEBINARIES += ppmtojpeg
|
2000-05-19 08:34:13 +00:00
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
|
|
|
-MATHBINARIES = ppmcie ppmforge ppmlabel ppmntsc ppmpat ppmqvga ppmtomap
|
|
|
|
+MATHBINARIES = ppmcie ppmforge ppmlabel ppmpat ppmqvga ppmtomap
|
|
|
|
BINARIES = $(PORTBINARIES) $(NOMERGEBINARIES) $(MATHBINARIES)
|
|
|
|
SCRIPTS = ppmquantall ppmshadow ppmfade
|
|
|
|
|
|
|
|
@@ -55,6 +57,8 @@
|
2000-04-01 23:57:38 +00:00
|
|
|
MERGE_OBJECTS = $(patsubst %,%.o2, $(PORTBINARIES) $(MATHBINARIES))
|
|
|
|
|
|
|
|
LIBOBJECTS = libppm1.o libppm2.o libppm3.o libppm4.o libppm5.o bitio.o
|
|
|
|
+LIBSOBJECTS = libppm1.so libppm2.so libppm3.so libppm4.so libppm5.so bitio.so
|
2000-05-19 08:34:13 +00:00
|
|
|
+LIBOBJECTS_X = $(SRCDIR)/shhopt/libshhopt.a
|
2000-04-01 23:57:38 +00:00
|
|
|
|
|
|
|
MANUALS1 = $(BINARIES) $(SCRIPTS)
|
|
|
|
MANUALS3 = libppm
|
2000-05-19 08:34:13 +00:00
|
|
|
@@ -62,7 +66,7 @@
|
2000-04-01 23:57:38 +00:00
|
|
|
|
|
|
|
MERGENAME= ppmmerge
|
|
|
|
|
|
|
|
-INTERFACE_HEADERS = ppm.h
|
|
|
|
+INTERFACE_HEADERS = ppm.h ppmcmap.h ppmdraw.h
|
|
|
|
|
|
|
|
.PHONY: all
|
|
|
|
all: $(BINARIES)
|
2000-05-19 08:34:13 +00:00
|
|
|
@@ -72,16 +76,23 @@
|
2000-04-01 23:57:38 +00:00
|
|
|
|
|
|
|
# Rules for plain programs.
|
2000-04-07 21:54:04 +00:00
|
|
|
$(PORTBINARIES): %: %.o $(NETPBMLIBS)
|
|
|
|
- $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) \
|
2000-04-08 06:12:34 +00:00
|
|
|
- $(CDEBUG)
|
|
|
|
+ $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) $(CDEBUG)
|
2000-04-01 23:57:38 +00:00
|
|
|
|
|
|
|
# Rule for math-dependent programs.
|
|
|
|
$(MATHBINARIES): %: %.o $(NETPBMLIBS)
|
|
|
|
- $(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLIBS) $(CDEBUG)
|
|
|
|
+ $(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLD) $(CDEBUG)
|
2000-05-19 08:34:13 +00:00
|
|
|
+
|
|
|
|
+ppmcolormask tgatoppm ximtoppm: %: %.o $(NETPBMLIBS) $(LIBOBJECTS_X)
|
|
|
|
+ $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) \
|
|
|
|
+ $(LIBOBJECTS_X) $(CDEBUG)
|
|
|
|
+
|
|
|
|
+ppmntsc: %: %.o $(NETPBMLIBS) $(LIBOBJECTS_X)
|
|
|
|
+ $(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLD) \
|
|
|
|
+ $(LIBOBJECTS_X) $(CDEBUG)
|
2000-04-07 21:54:04 +00:00
|
|
|
|
2000-05-19 08:34:13 +00:00
|
|
|
ppmtojpeg: %: %.o $(NETPBMLIBS)
|
2000-04-07 21:54:04 +00:00
|
|
|
- $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) \
|
2000-05-19 08:34:13 +00:00
|
|
|
- -L$(JPEGLIB_DIR) -ljpeg $(CDEBUG)
|
|
|
|
+ $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) \
|
|
|
|
+ $(LIBOBJECTS_X) -L$(JPEGLIB_DIR) -ljpeg $(CDEBUG)
|
2000-04-01 23:57:38 +00:00
|
|
|
|
2000-05-19 08:34:13 +00:00
|
|
|
# And libraries.
|
|
|
|
$(PBMDIR)/$(LIBPBM): FORCE
|
|
|
|
@@ -96,6 +107,9 @@
|
|
|
|
install.lib: install.lib.common
|
2000-04-01 23:57:38 +00:00
|
|
|
|
2000-05-19 08:34:13 +00:00
|
|
|
include $(SRCDIR)/Makefile.common
|
2000-04-01 23:57:38 +00:00
|
|
|
+
|
2000-05-19 08:34:13 +00:00
|
|
|
+$(SRCDIR)/shhopt/libshhopt.a:
|
|
|
|
+ cd ../shhopt; $(MAKE) libshhopt.a
|
2000-04-01 23:57:38 +00:00
|
|
|
|
2000-05-19 08:34:13 +00:00
|
|
|
.PHONY: clean
|
|
|
|
clean:
|