home *** CD-ROM | disk | FTP | other *** search
- --- ./libtiff/Imakefile.rtr Thu Oct 21 06:51:13 1993
- +++ ./libtiff/Imakefile Wed May 3 12:23:08 1995
- @@ -66,7 +66,7 @@
- #define DepLibTiff LibTiff
- #include <../Pbmplus.tmpl>
-
- -DEFINES = ${CONF_LIBRARY}
- +DEFINES = -D__alpha ${CONF_LIBRARY}
-
- SRCS = tif_aux.c tif_ccittrle.c tif_close.c tif_compress.c tif_dir.c \
- tif_dirinfo.c tif_dirread.c tif_dirwrite.c tif_dumpmode.c tif_error.c \
- --- ./pbm/Imakefile.rtr Wed May 3 12:22:55 1995
- +++ ./pbm/Imakefile Wed May 3 12:27:38 1995
- @@ -21,7 +21,7 @@
- CURRENTDEPLIBS = $(DEPLIBPBM)
- INCLUDES = -I..
- #if BuildLibTiff
- - DEFINES = -DRGB_DB=\"DefaultRGBDatabase\" -DLIBTIFF
- + DEFINES = -DRGB_DB=\"/usr/lib/X11/rgb\" -DLIBTIFF
- #else
- DEFINES = -DRGB_DB=\"DefaultRGBDatabase\"
- #endif
- @@ -81,51 +81,51 @@
-
- DependTarget()
-
- -NormalPbmplusProgramTarget(atktopbm)
- -NormalPbmplusProgramTarget(brushtopbm)
- -NormalPbmplusProgramTarget(cmuwmtopbm)
- -NormalPbmplusProgramTarget(g3topbm)
- -NormalPbmplusProgramTarget(icontopbm)
- -NormalPbmplusProgramTarget(gemtopbm)
- -NormalPbmplusProgramTarget(macptopbm)
- -NormalPbmplusProgramTarget(mgrtopbm)
- -NormalPbmplusProgramTarget(pbmclean)
- -NormalPbmplusProgramTarget(pbmlife)
- -NormalPbmplusProgramTarget(pbmmake)
- -NormalPbmplusProgramTarget(pbmmask)
- -NormalPbmplusProgramTarget(pbmpscale)
- -NormalPbmplusProgramTarget(pbmreduce)
- -NormalPbmplusProgramTarget(pbmtext)
- -NormalPbmplusProgramTarget(pbmto10x)
- -NormalPbmplusProgramTarget(pbmto4425)
- -NormalPbmplusProgramTarget(pbmtoascii)
- -NormalPbmplusProgramTarget(pbmtoatk)
- -NormalPbmplusProgramTarget(pbmtobbnbg)
- -NormalPbmplusProgramTarget(pbmtocmuwm)
- -NormalPbmplusProgramTarget(pbmtoepsi)
- -NormalPbmplusProgramTarget(pbmtoepson)
- -NormalPbmplusProgramTarget(pbmtog3)
- -NormalPbmplusProgramTarget(pbmtogem)
- -NormalPbmplusProgramTarget(pbmtogo)
- -NormalPbmplusProgramTarget(pbmtoicon)
- -NormalPbmplusProgramTarget(pbmtolj)
- -NormalPbmplusProgramTarget(pbmtoln03)
- -NormalPbmplusProgramTarget(pbmtolps)
- -NormalPbmplusProgramTarget(pbmtomacp)
- -NormalPbmplusProgramTarget(pbmtomgr)
- -NormalPbmplusProgramTarget(pbmtopi3)
- -NormalPbmplusProgramTarget(pbmtoplot)
- -NormalPbmplusProgramTarget(pbmtoptx)
- -NormalPbmplusProgramTarget(pbmtox10bm)
- -NormalPbmplusProgramTarget(pbmtoxbm)
- -NormalPbmplusProgramTarget(pbmtoybm)
- -NormalPbmplusProgramTarget(pbmtozinc)
- -NormalPbmplusProgramTarget(pbmupc)
- -NormalPbmplusProgramTarget(pi3topbm)
- -NormalPbmplusProgramTarget(pktopbm)
- -NormalPbmplusProgramTarget(xbmtopbm)
- -NormalPbmplusProgramTarget(ybmtopbm)
- -NormalPbmplusMathProgramTarget(pbmtopk)
- +NormalProgramTarget(atktopbm, atktopbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(brushtopbm, brushtopbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(cmuwmtopbm, cmuwmtopbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(g3topbm, g3topbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(icontopbm, icontopbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(gemtopbm, gemtopbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(macptopbm, macptopbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(mgrtopbm, mgrtopbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmclean, pbmclean.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmlife, pbmlife.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmmake, pbmmake.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmmask, pbmmask.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmpscale, pbmpscale.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmreduce, pbmreduce.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmtext, pbmtext.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmto10x, pbmto10x.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmto4425, pbmto4425.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmtoascii, pbmtoascii.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmtoatk, pbmtoatk.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmtobbnbg, pbmtobbnbg.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmtocmuwm, pbmtocmuwm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmtoepsi, pbmtoepsi.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmtoepson, pbmtoepson.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmtog3, pbmtog3.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmtogem, pbmtogem.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmtogo, pbmtogo.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmtoicon, pbmtoicon.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmtolj, pbmtolj.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmtoln03, pbmtoln03.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmtolps, pbmtolps.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmtomacp, pbmtomacp.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmtomgr, pbmtomgr.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmtopi3, pbmtopi3.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmtoplot, pbmtoplot.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmtoptx, pbmtoptx.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmtox10bm, pbmtox10bm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmtoxbm, pbmtoxbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmtoybm, pbmtoybm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmtozinc, pbmtozinc.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmupc, pbmupc.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pi3topbm, pi3topbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pktopbm, pktopbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(xbmtopbm, xbmtopbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ybmtopbm, ybmtopbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmtopk, pbmtopk.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
-
- NormalLibraryObjectRule()
- NormalLibraryTarget(pbm,libpbm1.o libpbm2.o libpbm3.o libpbm4.o libpbm5.o)
- @@ -138,13 +138,26 @@
- #endif
-
- #if InstallBinaries
- -InstallPbmplusPrograms($(BINS),$(PBMPLUSDIR)$(PBMPLUSBINDIR),$(INSTPGMFLAGS))
- +install:: $(BINS)
- + for i in $(BINS) ; do \
- + (set -x; $(RM) $(DESTDIR) $(PBMPLUSDIR)$(PBMPLUSBINDIR)/$$i; \
- + $(INSTALL) -c $(INSTPGMFLAGS) $$i $(PBMPLUSBINDIR) ); \
- + done
- #endif
-
- #if InstallManuals
- -InstallMultipleMan($(MAN1),$(PBMPLUSDIR)$(PBMPLUSMANDIR))
- -InstallMultipleMan($(MAN3),$(PBMPLUSDIR)$(PBMPLUSMANDIR))
- -InstallMultipleMan($(MAN5),$(PBMPLUSDIR)$(PBMPLUSMANDIR))
- +install:: $(MAN1)
- + for i in $(MAN1) ; do \
- + (set -x; $(INSTALL) -c $(INSTMANFLAGS) $$i $(PBMPLUSDIR)$(PBMPLUSMANDIR) ); \
- + done
- +install:: $(MAN3)
- + for i in $(MAN3) ; do \
- + (set -x; $(INSTALL) -c $(INSTMANFLAGS) $$i $(PBMPLUSDIR)$(PBMPLUSMANDIR) ); \
- + done
- +install:: $(MAN5)
- + for i in $(MAN5) ; do \
- + (set -x; $(INSTALL) -c $(INSTMANFLAGS) $$i $(PBMPLUSDIR)$(PBMPLUSMANDIR) ); \
- + done
- #endif
-
- #if InstallLibraries
- @@ -152,5 +165,6 @@
- #endif
-
- #if InstallIncludes
- -InstallMultipleFlags(pbm.h,$(PBMPLUSDIR)$(PBMPLUSINCDIR),$(INSTINCFLAGS))
- +install:: pbm.h
- + $(INSTALL) -c $(INSTINCFLAGS) pbm.h $(PBMPLUSDIR)$(PBMPLUSINCDIR)
- #endif
- --- ./pgm/Imakefile.rtr Wed May 3 12:22:56 1995
- +++ ./pgm/Imakefile Wed May 3 12:23:08 1995
- @@ -60,29 +60,29 @@
-
- DependTarget()
-
- -NormalPbmplusProgramTarget(bioradtopgm)
- -NormalPbmplusProgramTarget(asciitopgm)
- -NormalPbmplusProgramTarget(fstopgm)
- -NormalPbmplusProgramTarget(hipstopgm)
- -NormalPbmplusProgramTarget(lispmtopgm)
- -NormalPbmplusProgramTarget(pbmtopgm)
- -NormalPbmplusProgramTarget(pgmbentley)
- -NormalPbmplusProgramTarget(pgmenhance)
- -NormalPbmplusProgramTarget(pgmhist)
- -NormalPbmplusProgramTarget(pgmnoise)
- -NormalPbmplusProgramTarget(pgmnorm)
- -NormalPbmplusProgramTarget(pgmoil)
- -NormalPbmplusProgramTarget(pgmramp)
- -NormalPbmplusProgramTarget(pgmtofs)
- -NormalPbmplusProgramTarget(pgmtolispm)
- -NormalPbmplusProgramTarget(pgmtopbm)
- -NormalPbmplusProgramTarget(psidtopgm)
- -NormalPbmplusProgramTarget(spottopgm)
- -NormalPbmplusMathProgramTarget(pgmkernel)
- -NormalPbmplusMathProgramTarget(rawtopgm)
- -NormalPbmplusMathProgramTarget(pgmcrater)
- -NormalPbmplusMathProgramTarget(pgmedge)
- -NormalPbmplusMathProgramTarget(pgmtexture)
- +NormalProgramTarget(bioradtopgm, bioradtopgm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(asciitopgm, asciitopgm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(fstopgm, fstopgm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(hipstopgm, hipstopgm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(lispmtopgm, lispmtopgm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pbmtopgm, pbmtopgm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pgmbentley, pgmbentley.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pgmenhance, pgmenhance.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pgmhist, pgmhist.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pgmnoise, pgmnoise.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pgmnorm, pgmnorm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pgmoil, pgmoil.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pgmramp, pgmramp.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pgmtofs, pgmtofs.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pgmtolispm, pgmtolispm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pgmtopbm, pgmtopbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(psidtopgm, psidtopgm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(spottopgm, spottopgm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pgmkernel, pgmkernel.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
- +NormalProgramTarget(rawtopgm, rawtopgm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
- +NormalProgramTarget(pgmcrater, pgmcrater.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
- +NormalProgramTarget(pgmedge, pgmedge.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
- +NormalProgramTarget(pgmtexture, pgmtexture.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
-
- NormalLibraryObjectRule()
- NormalLibraryTarget(pgm,libpgm1.o libpgm2.o)
- @@ -95,13 +95,26 @@
- #endif
-
- #if InstallBinaries
- -InstallPbmplusPrograms($(BINS),$(PBMPLUSDIR)$(PBMPLUSBINDIR),$(INSTPGMFLAGS))
- +install:: $(BINS)
- + for i in $(BINS) ; do \
- + (set -x; $(RM) $(DESTDIR) $(PBMPLUSDIR)$(PBMPLUSBINDIR)/$$i; \
- + $(INSTALL) -c $(INSTPGMFLAGS) $$i $(PBMPLUSBINDIR) ); \
- + done
- #endif
-
- #if InstallManuals
- -InstallMultipleMan($(MAN1),$(PBMPLUSDIR)$(PBMPLUSMANDIR))
- -InstallMultipleMan($(MAN3),$(PBMPLUSDIR)$(PBMPLUSMANDIR))
- -InstallMultipleMan($(MAN5),$(PBMPLUSDIR)$(PBMPLUSMANDIR))
- +install:: $(MAN1)
- + for i in $(MAN1) ; do \
- + (set -x; $(INSTALL) -c $(INSTMANFLAGS) $$i $(PBMPLUSDIR)$(PBMPLUSMANDIR) ); \
- + done
- +install:: $(MAN3)
- + for i in $(MAN3) ; do \
- + (set -x; $(INSTALL) -c $(INSTMANFLAGS) $$i $(PBMPLUSDIR)$(PBMPLUSMANDIR) ); \
- + done
- +install:: $(MAN5)
- + for i in $(MAN5) ; do \
- + (set -x; $(INSTALL) -c $(INSTMANFLAGS) $$i $(PBMPLUSDIR)$(PBMPLUSMANDIR) ); \
- + done
- #endif
-
- #if InstallLibraries
- @@ -109,5 +122,5 @@
- #endif
-
- #if InstallIncludes
- -InstallMultipleFlags(pgm.h,$(PBMPLUSDIR)$(PBMPLUSINCDIR),$(INSTINCFLAGS))
- + $(INSTALL) -c $(INSTINCFLAGS) pgm.h $(PBMPLUSDIR)$(PBMPLUSINCDIR)
- #endif
- --- ./pgm/pgmedge.c.rtr Mon Oct 4 05:11:16 1993
- +++ ./pgm/pgmedge.c Wed May 3 12:23:08 1995
- @@ -10,7 +10,9 @@
- ** implied warranty.
- */
-
- +#if 0
- #include <math.h>
- +#endif
- #include "pgm.h"
-
- int
- --- ./pgm/pgmtexture.c.rtr Mon Oct 4 05:11:21 1993
- +++ ./pgm/pgmtexture.c Wed May 3 12:23:09 1995
- @@ -40,7 +40,9 @@
- ** correlation function.
- */
-
- +#if 0
- #include <math.h>
- +#endif
- #include "pgm.h"
-
- #define RADIX 2.0
- --- ./pnm/Imakefile.rtr Wed May 3 12:22:56 1995
- +++ ./pnm/Imakefile Wed May 3 12:38:15 1995
- @@ -107,45 +107,45 @@
-
- DependTarget()
-
- -NormalPbmplusProgramTarget(fitstopnm)
- -NormalPbmplusProgramTarget(giftopnm)
- -NormalPbmplusProgramTarget(pnmalias)
- -NormalPbmplusProgramTarget(pnmarith)
- -NormalPbmplusProgramTarget(pnmcat)
- -NormalPbmplusProgramTarget(pnmcomp)
- -NormalPbmplusProgramTarget(pnmconvol)
- -NormalPbmplusProgramTarget(pnmcrop)
- -NormalPbmplusProgramTarget(pnmcut)
- -NormalPbmplusProgramTarget(pnmdepth)
- -NormalPbmplusProgramTarget(pnmenlarge)
- -NormalPbmplusProgramTarget(pnmfile)
- -NormalPbmplusProgramTarget(pnmflip)
- -NormalPbmplusProgramTarget(pnmhistmap)
- -NormalPbmplusProgramTarget(pnminvert)
- -NormalPbmplusProgramTarget(pnmnoraw)
- -NormalPbmplusProgramTarget(pnmpad)
- -NormalPbmplusProgramTarget(pnmpaste)
- -NormalPbmplusProgramTarget(pnmtile)
- -NormalPbmplusProgramTarget(pnmtoddif)
- -NormalPbmplusProgramTarget(pnmtofits)
- -NormalPbmplusProgramTarget(pnmtops)
- -NormalPbmplusProgramTarget(pnmtorast)
- -NormalPbmplusProgramTarget(pnmtosgi)
- -NormalPbmplusProgramTarget(pnmtosir)
- -NormalPbmplusProgramTarget(pnmtoxwd)
- -NormalPbmplusProgramTarget(rasttopnm)
- -NormalPbmplusProgramTarget(sirtopnm)
- -NormalPbmplusProgramTarget(xwdtopnm)
- -NormalPbmplusProgramTarget(zeisstopnm)
- -NormalPbmplusProgramTarget(sgitopnm)
- -NormalPbmplusMathProgramTarget(pnmgamma)
- -NormalPbmplusMathProgramTarget(pnmnlfilt)
- -NormalPbmplusMathProgramTarget(pnmrotate)
- -NormalPbmplusMathProgramTarget(pnmscale)
- -NormalPbmplusMathProgramTarget(pnmshear)
- +NormalProgramTarget(fitstopnm, fitstopnm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(giftopnm, giftopnm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pnmalias, pnmalias.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pnmarith, pnmarith.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pnmcat, pnmcat.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pnmcomp, pnmcomp.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pnmconvol, pnmconvol.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pnmcrop, pnmcrop.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pnmcut, pnmcut.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pnmdepth, pnmdepth.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pnmenlarge, pnmenlarge.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pnmfile, pnmfile.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pnmflip, pnmflip.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pnmhistmap, pnmhistmap.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pnminvert, pnminvert.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pnmnoraw, pnmnoraw.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pnmpad, pnmpad.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pnmpaste, pnmpaste.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pnmtile, pnmtile.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pnmtoddif, pnmtoddif.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pnmtofits, pnmtofits.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pnmtops, pnmtops.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pnmtorast, pnmtorast.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pnmtosgi, pnmtosgi.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pnmtosir, pnmtosir.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pnmtoxwd, pnmtoxwd.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(rasttopnm, rasttopnm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(sirtopnm, sirtopnm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(xwdtopnm, xwdtopnm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(zeisstopnm, zeisstopnm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(sgitopnm, sgitopnm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pnmgamma, pnmgamma.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
- +NormalProgramTarget(pnmnlfilt, pnmnlfilt.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
- +NormalProgramTarget(pnmrotate, pnmrotate.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
- +NormalProgramTarget(pnmscale, pnmscale.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
- +NormalProgramTarget(pnmshear, pnmshear.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
- #if BuildLibTiff
- -NormalPbmplusProgramTarget(tifftopnm)
- -NormalPbmplusProgramTarget(pnmtotiff)
- +NormalProgramTarget(tifftopnm, tifftopnm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pnmtotiff, pnmtotiff.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- #endif
-
- NormalLibraryObjectRule()
- @@ -159,7 +159,11 @@
- #endif
-
- #if InstallBinaries
- -InstallPbmplusPrograms($(BINS),$(PBMPLUSDIR)$(PBMPLUSBINDIR),$(INSTPGMFLAGS))
- +install:: $(BINS)
- + for i in $(BINS) ; do \
- + (set -x; $(RM) $(DESTDIR) $(PBMPLUSDIR)$(PBMPLUSBINDIR)/$$i; \
- + $(INSTALL) -c $(INSTPGMFLAGS) $$i $(PBMPLUSBINDIR) ); \
- + done
- InstallScript(anytopnm,$(PBMPLUSDIR)$(PBMPLUSBINDIR))
- InstallScript(pnmindex,$(PBMPLUSDIR)$(PBMPLUSBINDIR))
- InstallScript(pnmmargin,$(PBMPLUSDIR)$(PBMPLUSBINDIR))
- @@ -168,9 +172,18 @@
- #endif
-
- #if InstallManuals
- -InstallMultipleMan($(MAN1),$(PBMPLUSDIR)$(PBMPLUSMANDIR))
- -InstallMultipleMan($(MAN3),$(PBMPLUSDIR)$(PBMPLUSMANDIR))
- -InstallMultipleMan($(MAN5),$(PBMPLUSDIR)$(PBMPLUSMANDIR))
- +install:: $(MAN1)
- + for i in $(MAN1) ; do \
- + (set -x; $(INSTALL) -c $(INSTMANFLAGS) $$i $(PBMPLUSDIR)$(PBMPLUSMANDIR) ); \
- + done
- +install:: $(MAN3)
- + for i in $(MAN3) ; do \
- + (set -x; $(INSTALL) -c $(INSTMANFLAGS) $$i $(PBMPLUSDIR)$(PBMPLUSMANDIR) ); \
- + done
- +install:: $(MAN5)
- + for i in $(MAN5) ; do \
- + (set -x; $(INSTALL) -c $(INSTMANFLAGS) $$i $(PBMPLUSDIR)$(PBMPLUSMANDIR) ); \
- + done
- #endif
-
- #if InstallLibraries
- @@ -178,5 +191,5 @@
- #endif
-
- #if InstallIncludes
- -InstallMultipleFlags(pnm.h,$(PBMPLUSDIR)$(PBMPLUSINCDIR),$(INSTINCFLAGS))
- + $(INSTALL) -c $(INSTINCFLAGS) pnm.h $(PBMPLUSDIR)$(PBMPLUSINCDIR)
- #endif
- --- ./pnm/pnmgamma.c.rtr Mon Oct 4 05:11:41 1993
- +++ ./pnm/pnmgamma.c Wed May 3 12:23:09 1995
- @@ -10,7 +10,9 @@
- ** implied warranty.
- */
-
- +#if 0
- #include <math.h>
- +#endif
- #include <ctype.h>
- #include "pnm.h"
-
- --- ./pnm/pnmrotate.c.rtr Mon Oct 4 05:11:53 1993
- +++ ./pnm/pnmrotate.c Wed May 3 12:23:09 1995
- @@ -10,7 +10,9 @@
- ** implied warranty.
- */
-
- +#if 0
- #include <math.h>
- +#endif
- #include "pnm.h"
- #ifndef M_PI
- #define M_PI 3.14159265358979323846
- @@ -38,7 +40,7 @@
- int antialias;
- float fangle, xshearfac, yshearfac, new0;
- int intnew0;
- - register long fracnew0, omfracnew0;
- + register int fracnew0, omfracnew0;
- char* usage = "[-noantialias] <angle> [pnmfile]";
-
- pnm_init( &argc, argv );
- --- ./pnm/pnmshear.c.rtr Mon Oct 4 05:11:55 1993
- +++ ./pnm/pnmshear.c Wed May 3 12:23:09 1995
- @@ -10,7 +10,9 @@
- ** implied warranty.
- */
-
- +#if 0
- #include <math.h>
- +#endif
- #include "pnm.h"
- #ifndef M_PI
- #define M_PI 3.14159265358979323846
- --- ./pnm/xwdtopnm.c.rtr Mon Oct 4 05:12:03 1993
- +++ ./pnm/xwdtopnm.c Wed May 3 12:23:10 1995
- @@ -14,18 +14,18 @@
- #include "x10wd.h"
- #include "x11wd.h"
-
- -static void getinit ARGS(( FILE* file, int* colsP, int* rowsP, int* padrightP, long* maxvalP, long* visualclassP, int* formatP, xel** colorsP ));
- -static unsigned long getpixnum ARGS(( FILE* file ));
- +static void getinit ARGS(( FILE* file, int* colsP, int* rowsP, int* padrightP, int* maxvalP, int* visualclassP, int* formatP, xel** colorsP ));
- +static unsigned int getpixnum ARGS(( FILE* file ));
- static short bs_short ARGS(( short s ));
- -static long bs_long ARGS(( long l ));
- +static int bs_long ARGS(( int l ));
-
- -static unsigned long red_mask, green_mask, blue_mask;
- +static unsigned int red_mask, green_mask, blue_mask;
- static int bits_per_item, bits_used, bit_shift, bits_per_pixel;
- static char buf[4];
- static char* byteP;
- static short* shortP;
- -static long* longP;
- -static unsigned long pixel_mask;
- +static int* longP;
- +static unsigned int pixel_mask;
- static int byte_swap, byte_order, bit_order;
-
- int
- @@ -39,7 +39,7 @@
- xel* colors;
- int rows, cols, format, padright, row;
- register int col;
- - long maxval, visualclass;
- + int maxval, visualclass;
-
- pnm_init( &argc, argv );
-
- @@ -89,7 +89,7 @@
- case DirectColor:
- for ( col = 0, xP = xelrow; col < cols; ++col, ++xP )
- {
- - register unsigned long ul;
- + register unsigned int ul;
-
- ul = getpixnum( ifp );
- switch ( bits_per_pixel )
- @@ -134,8 +134,8 @@
- int* colsP;
- int* rowsP;
- int* padrightP;
- - long* maxvalP;
- - long* visualclassP;
- + int* maxvalP;
- + int* visualclassP;
- int* formatP;
- xel** colorsP;
- {
- @@ -365,11 +365,11 @@
- if ( *maxvalP != 65535L )
- {
- x11colors[i].red =
- - (long) x11colors[i].red * (long) *maxvalP / 65535L;
- + (int) x11colors[i].red * (int) *maxvalP / 65535L;
- x11colors[i].green =
- - (long) x11colors[i].green * (long) *maxvalP / 65535L;
- + (int) x11colors[i].green * (int) *maxvalP / 65535L;
- x11colors[i].blue =
- - (long) x11colors[i].blue * (long) *maxvalP / 65535L;
- + (int) x11colors[i].blue * (int) *maxvalP / 65535L;
- }
- if ( x11colors[i].red != x11colors[i].green ||
- x11colors[i].green != x11colors[i].blue )
- @@ -444,10 +444,10 @@
-
- byteP = (char*) buf;
- shortP = (short*) buf;
- - longP = (long*) buf;
- + longP = (int*) buf;
- }
-
- -static unsigned long
- +static unsigned int
- getpixnum( file )
- FILE* file;
- {
- @@ -528,7 +528,7 @@
- /* Byte-swapping junk. */
-
- union cheat {
- - long l;
- + int l;
- short s;
- unsigned char c[4];
- };
- @@ -553,12 +553,12 @@
- }
-
- #if __STDC__
- -static long
- -bs_long( long l )
- +static int
- +bs_long( int l )
- #else /*__STDC__*/
- -static long
- +static int
- bs_long( l )
- - long l;
- + int l;
- #endif /*__STDC__*/
- {
- union cheat u;
- --- ./pnm/x11wd.h.rtr Mon Oct 4 05:12:02 1993
- +++ ./pnm/x11wd.h Wed May 3 12:23:10 1995
- @@ -18,7 +18,7 @@
- #define TrueColor 4
- #define DirectColor 5
-
- -typedef unsigned long xwdval;
- +typedef unsigned int xwdval;
- #define X11WD_FILE_VERSION 7
- typedef struct {
- xwdval header_size; /* Size of the entire file header (bytes). */
- @@ -43,13 +43,13 @@
- xwdval ncolors; /* Number of Color structures */
- xwdval window_width; /* Window width */
- xwdval window_height; /* Window height */
- - long window_x; /* Window upper left X coordinate */
- - long window_y; /* Window upper left Y coordinate */
- + int window_x; /* Window upper left X coordinate */
- + int window_y; /* Window upper left Y coordinate */
- xwdval window_bdrwidth; /* Window border width */
- } X11WDFileHeader;
-
- typedef struct {
- - unsigned long num;
- + unsigned int num;
- unsigned short red, green, blue;
- char flags; /* do_red, do_green, do_blue */
- char pad;
- --- ./pnm/pnmtoxwd.c.rtr Mon Oct 4 05:12:00 1993
- +++ ./pnm/pnmtoxwd.c Wed May 3 12:23:10 1995
- @@ -28,7 +28,7 @@
- int pseudodepth;
- int forcedirect, direct, grayscale;
- xelval maxval;
- - long lmaxval, xmaxval;
- + int lmaxval, xmaxval;
- colorhist_vector chv;
- colorhash_table cht;
- X11WDFileHeader h11;
- @@ -74,7 +74,7 @@
- pm_usage( usage );
-
- xels = pnm_readpnm( ifp, &cols, &rows, &maxval, &format );
- - lmaxval = (long) maxval;
- + lmaxval = (int) maxval;
- xmaxval = ( 1 << pseudodepth ) - 1;
- pm_close( ifp );
-
- @@ -232,9 +232,9 @@
- /* Stupid hack because xloadimage and xwud disagree on
- ** how to interpret bitmaps. */
- if ( PNM_FORMAT_TYPE(format) == PBM_TYPE )
- - color.red = (long) ( colors-1-i ) * 65535L / ( colors - 1 );
- + color.red = (int) ( colors-1-i ) * 65535L / ( colors - 1 );
- else
- - color.red = (long) i * 65535L / ( colors - 1 );
- + color.red = (int) i * 65535L / ( colors - 1 );
-
- color.green = color.red;
- color.blue = color.red;
- @@ -246,9 +246,9 @@
- color.blue = PPM_GETB( chv[i].color );
- if ( lmaxval != 65535L )
- {
- - color.red = (long) color.red * 65535L / lmaxval;
- - color.green = (long) color.green * 65535L / lmaxval;
- - color.blue = (long) color.blue * 65535L / lmaxval;
- + color.red = (int) color.red * 65535L / lmaxval;
- + color.green = (int) color.green * 65535L / lmaxval;
- + color.blue = (int) color.blue * 65535L / lmaxval;
- }
- }
- pm_writebiglong( stdout, color.num );
- @@ -269,7 +269,7 @@
- case PPM_TYPE:
- for ( col = 0, xP = xels[row]; col < cols; ++col, ++xP )
- {
- - unsigned long ul;
- + unsigned int ul;
-
- ul = ( ( PPM_GETR( *xP ) * xmaxval / lmaxval ) << 16 ) |
- ( ( PPM_GETG( *xP ) * xmaxval / lmaxval ) << 8 ) |
- @@ -281,8 +281,8 @@
- default:
- for ( col = 0, xP = xels[row]; col < cols; ++col, ++xP )
- {
- - unsigned long ul;
- - register unsigned long val;
- + unsigned int ul;
- + register unsigned int val;
-
- val = PNM_GET1( *xP );
- ul = ( ( val * xmaxval / lmaxval ) << 16 ) |
- @@ -312,7 +312,7 @@
- s = 1 - s;
-
- if ( maxval != bigger_maxval )
- - s = (long) s * bigger_maxval / maxval;
- + s = (int) s * bigger_maxval / maxval;
- byte |= s << bitshift;
- bitshift -= h11.bits_per_pixel;
- if ( bitshift < 0 )
- --- ./pnm/tifftopnm.c.rtr Mon Oct 4 05:12:01 1993
- +++ ./pnm/tifftopnm.c Wed May 3 12:23:10 1995
- @@ -159,9 +159,9 @@
- for ( i = 0; i < numcolors; ++i )
- {
- register xelval r, g, b;
- - r = (long) redcolormap[i] * PNM_MAXMAXVAL / 65535L;
- - g = (long) greencolormap[i] * PNM_MAXMAXVAL / 65535L;
- - b = (long) bluecolormap[i] * PNM_MAXMAXVAL / 65535L;
- + r = (int) redcolormap[i] * PNM_MAXMAXVAL / 65535L;
- + g = (int) greencolormap[i] * PNM_MAXMAXVAL / 65535L;
- + b = (int) bluecolormap[i] * PNM_MAXMAXVAL / 65535L;
- PPM_ASSIGN( colormap[i], r, g, b );
- }
- break;
- --- ./ppm/Imakefile.rtr Wed May 3 12:22:56 1995
- +++ ./ppm/Imakefile Wed May 3 12:23:10 1995
- @@ -20,7 +20,7 @@
- CURRENTLIBS = $(LIBPPM) $(LIBPGM) $(LIBPBM)
- CURRENTDEPLIBS = $(DEPLIBPPM) $(DEPLIBPGM) $(DEPLIBPBM)
- INCLUDES = -I.. -I../$(PBMDIR) -I../$(PGMDIR)
- - DEFINES = -DRGB_DB=\"DefaultRGBDatabase\"
- + DEFINES = -DRGB_DB=\"/usr/lib/X11/rgb\"
- MERGE = ppmmerge
-
- MAN1 = bmptoppm.1 gouldtoppm.1 hpcdtoppm.1 ilbmtoppm.1 \
- @@ -103,69 +103,69 @@
-
- DependTarget()
-
- -NormalPbmplusProgramTarget(bmptoppm)
- -NormalPbmplusProgramTarget(gouldtoppm)
- -NormalPbmplusProgramTarget(hpcdtoppm)
- -NormalPbmplusProgramTarget(ilbmtoppm)
- -NormalPbmplusProgramTarget(imgtoppm)
- -NormalPbmplusProgramTarget(mtvtoppm)
- -NormalPbmplusProgramTarget(pcxtoppm)
- -NormalPbmplusProgramTarget(pgmtoppm)
- -NormalPbmplusProgramTarget(pi1toppm)
- -NormalPbmplusProgramTarget(picttoppm)
- -NormalPbmplusProgramTarget(pjtoppm)
- -NormalPbmplusProgramTarget(ppm3d)
- -NormalPbmplusProgramTarget(ppmbrighten)
- -NormalPbmplusProgramTarget(ppmchange)
- -NormalPbmplusProgramTarget(ppmdim)
- -NormalPbmplusProgramTarget(ppmdist)
- -NormalPbmplusProgramTarget(ppmdither)
- -NormalPbmplusProgramTarget(ppmflash)
- -NormalPbmplusProgramTarget(ppmhist)
- -NormalPbmplusProgramTarget(ppmmake)
- -NormalPbmplusProgramTarget(ppmmix)
- -NormalPbmplusProgramTarget(ppmnorm)
- -NormalPbmplusProgramTarget(ppmntsc)
- -NormalPbmplusProgramTarget(ppmquant)
- -NormalPbmplusProgramTarget(ppmrelief)
- -NormalPbmplusProgramTarget(ppmshift)
- -NormalPbmplusProgramTarget(ppmspread)
- -NormalPbmplusProgramTarget(ppmtoacad)
- -NormalPbmplusProgramTarget(ppmtobmp)
- -NormalPbmplusProgramTarget(ppmtogif)
- -NormalPbmplusProgramTarget(ppmtoicr)
- -NormalPbmplusProgramTarget(ppmtoilbm)
- -NormalPbmplusProgramTarget(ppmtomitsu)
- -NormalPbmplusProgramTarget(ppmtopcx)
- -NormalPbmplusProgramTarget(ppmtopgm)
- -NormalPbmplusProgramTarget(ppmtopi1)
- -NormalPbmplusProgramTarget(ppmtopict)
- -NormalPbmplusProgramTarget(ppmtopj)
- -NormalPbmplusProgramTarget(ppmtopjxl)
- -NormalPbmplusProgramTarget(ppmtopuzz)
- -NormalPbmplusProgramTarget(ppmtorgb3)
- -NormalPbmplusProgramTarget(ppmtosixel)
- -NormalPbmplusProgramTarget(ppmtotga)
- -NormalPbmplusProgramTarget(ppmtouil)
- -NormalPbmplusProgramTarget(ppmtoxpm)
- -NormalPbmplusProgramTarget(ppmtoyuv)
- -NormalPbmplusProgramTarget(ppmtoyuvsplit)
- -NormalPbmplusProgramTarget(qrttoppm)
- -NormalPbmplusProgramTarget(rawtoppm)
- -NormalPbmplusProgramTarget(rgb3toppm)
- -NormalPbmplusProgramTarget(sldtoppm)
- -NormalPbmplusProgramTarget(spctoppm)
- -NormalPbmplusProgramTarget(sputoppm)
- -NormalPbmplusProgramTarget(tgatoppm)
- -NormalPbmplusProgramTarget(ximtoppm)
- -NormalPbmplusProgramTarget(xpmtoppm)
- -NormalPbmplusProgramTarget(xvminitoppm)
- -NormalPbmplusProgramTarget(yuvtoppm)
- -NormalPbmplusProgramTarget(yuvsplittoppm)
- -NormalPbmplusMathProgramTarget(ppmforge)
- -NormalPbmplusMathProgramTarget(ppmpat)
- -NormalPbmplusMathProgramTarget(ppmqvga)
- -NormalPbmplusMathProgramTarget(ppmtomap)
- +NormalProgramTarget(bmptoppm, bmptoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(gouldtoppm, gouldtoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(hpcdtoppm, hpcdtoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ilbmtoppm, ilbmtoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(imgtoppm, imgtoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(mtvtoppm, mtvtoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pcxtoppm, pcxtoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pgmtoppm, pgmtoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pi1toppm, pi1toppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(picttoppm, picttoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(pjtoppm, pjtoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppm3d, ppm3d.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmbrighten, ppmbrighten.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmchange, ppmchange.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmdim, ppmdim.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmdist, ppmdist.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmdither, ppmdither.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmflash, ppmflash.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmhist, ppmhist.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmmake, ppmmake.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmmix, ppmmix.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmnorm, ppmnorm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmntsc, ppmntsc.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmquant, ppmquant.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmrelief, ppmrelief.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmshift, ppmshift.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmspread, ppmspread.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmtoacad, ppmtoacad.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmtobmp, ppmtobmp.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmtogif, ppmtogif.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmtoicr, ppmtoicr.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmtoilbm, ppmtoilbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmtomitsu, ppmtomitsu.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmtopcx, ppmtopcx.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmtopgm, ppmtopgm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmtopi1, ppmtopi1.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmtopict, ppmtopict.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmtopj, ppmtopj.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmtopjxl, ppmtopjxl.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmtopuzz, ppmtopuzz.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmtorgb3, ppmtorgb3.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmtosixel, ppmtosixel.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmtotga, ppmtotga.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmtouil, ppmtouil.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmtoxpm, ppmtoxpm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmtoyuv, ppmtoyuv.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmtoyuvsplit, ppmtoyuvsplit.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(qrttoppm, qrttoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(rawtoppm, rawtoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(rgb3toppm, rgb3toppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(sldtoppm, sldtoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(spctoppm, spctoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(sputoppm, sputoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(tgatoppm, tgatoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ximtoppm, ximtoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(xpmtoppm, xpmtoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(xvminitoppm, xvminitoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(yuvtoppm, yuvtoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(yuvsplittoppm, yuvsplittoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
- +NormalProgramTarget(ppmforge, ppmforge.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
- +NormalProgramTarget(ppmpat, ppmpat.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
- +NormalProgramTarget(ppmqvga, ppmqvga.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
- +NormalProgramTarget(ppmtomap, ppmtomap.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
-
- NormalLibraryObjectRule()
- NormalLibraryTarget(ppm,libppm1.o libppm2.o libppm3.o libppm4.o \
- @@ -179,14 +179,27 @@
- #endif
-
- #if InstallBinaries
- -InstallPbmplusPrograms($(BINS),$(PBMPLUSDIR)$(PBMPLUSBINDIR),$(INSTPGMFLAGS))
- +install:: $(BINS)
- + for i in $(BINS) ; do \
- + (set -x; $(RM) $(DESTDIR) $(PBMPLUSDIR)$(PBMPLUSBINDIR)/$$i; \
- + $(INSTALL) -c $(INSTPGMFLAGS) $$i $(PBMPLUSBINDIR) ); \
- + done
- InstallScript(ppmquantall,$(PBMPLUSDIR)$(PBMPLUSBINDIR))
- #endif
-
- #if InstallManuals
- -InstallMultipleMan($(MAN1),$(PBMPLUSDIR)$(PBMPLUSMANDIR))
- -InstallMultipleMan($(MAN3),$(PBMPLUSDIR)$(PBMPLUSMANDIR))
- -InstallMultipleMan($(MAN5),$(PBMPLUSDIR)$(PBMPLUSMANDIR))
- +install:: $(MAN1)
- + for i in $(MAN1) ; do \
- + (set -x; $(INSTALL) -c $(INSTMANFLAGS) $$i $(PBMPLUSDIR)$(PBMPLUSMANDIR) ); \
- + done
- +install:: $(MAN3)
- + for i in $(MAN3) ; do \
- + (set -x; $(INSTALL) -c $(INSTMANFLAGS) $$i $(PBMPLUSDIR)$(PBMPLUSMANDIR) ); \
- + done
- +install:: $(MAN5)
- + for i in $(MAN5) ; do \
- + (set -x; $(INSTALL) -c $(INSTMANFLAGS) $$i $(PBMPLUSDIR)$(PBMPLUSMANDIR) ); \
- + done
- #endif
-
- #if InstallLibraries
- @@ -194,5 +207,5 @@
- #endif
-
- #if InstallIncludes
- -InstallMultipleFlags(ppm.h,$(PBMPLUSDIR)$(PBMPLUSINCDIR),$(INSTINCFLAGS))
- + $(INSTALL) -c $(INSTINCFLAGS) ppm.h $(PBMPLUSDIR)$(PBMPLUSINCDIR)
- #endif
- --- ./ppm/ppmpat.c.rtr Mon Oct 4 05:12:31 1993
- +++ ./ppm/ppmpat.c Wed May 3 12:23:11 1995
- @@ -10,7 +10,9 @@
- ** implied warranty.
- */
-
- +#if 0
- #include <math.h>
- +#endif
- #include "ppm.h"
- #include "ppmdraw.h"
- #ifndef M_PI
- --- ./pbmplus.h.rtr Tue Mar 1 04:46:36 1994
- +++ ./pbmplus.h Wed May 3 12:23:11 1995
- @@ -106,8 +106,8 @@
- #else /* SYSV or AMIGA */
-
- #include <strings.h>
- -extern void srandom();
- -extern long random();
- +/* extern void srandom();
- +extern long random(); */
-
- #endif /*SYSV or AMIGA*/
-
- --- ./Imakefile.rtr Wed May 3 12:22:57 1995
- +++ ./Imakefile Wed May 3 12:23:11 1995
- @@ -25,5 +25,5 @@
- DependSubdirs($(SUBDIRS))
-
- #if InstallIncludes
- -InstallMultipleFlags(pbmplus.h,$(PBMPLUSDIR)$(PBMPLUSINCDIR),$(INSTINCFLAGS))
- + $(INSTALL) -c $(INSTINCFLAGS) pbmplus.h $(PBMPLUSDIR)$(PBMPLUSINCDIR)
- #endif
-