home *** CD-ROM | disk | FTP | other *** search
/ The UNIX CD Bookshelf / OREILLY_TUCB_UNIX_CD.iso / upt / examples / SOURCES / NETPBM / ALPHA / NETPBM. next >
Encoding:
Text File  |  1998-07-24  |  35.1 KB  |  893 lines
  1. --- ./libtiff/Imakefile.rtr    Thu Oct 21 06:51:13 1993
  2. +++ ./libtiff/Imakefile    Wed May  3 12:23:08 1995
  3. @@ -66,7 +66,7 @@
  4.  #define DepLibTiff LibTiff
  5.  #include <../Pbmplus.tmpl>
  6.  
  7. -DEFINES = ${CONF_LIBRARY}
  8. +DEFINES = -D__alpha ${CONF_LIBRARY}
  9.  
  10.  SRCS = tif_aux.c tif_ccittrle.c tif_close.c tif_compress.c tif_dir.c \
  11.         tif_dirinfo.c tif_dirread.c tif_dirwrite.c tif_dumpmode.c tif_error.c \
  12. --- ./pbm/Imakefile.rtr    Wed May  3 12:22:55 1995
  13. +++ ./pbm/Imakefile    Wed May  3 12:27:38 1995
  14. @@ -21,7 +21,7 @@
  15.  CURRENTDEPLIBS = $(DEPLIBPBM)
  16.        INCLUDES = -I..
  17.  #if BuildLibTiff
  18. -       DEFINES = -DRGB_DB=\"DefaultRGBDatabase\" -DLIBTIFF
  19. +       DEFINES = -DRGB_DB=\"/usr/lib/X11/rgb\" -DLIBTIFF
  20.  #else
  21.         DEFINES = -DRGB_DB=\"DefaultRGBDatabase\"
  22.  #endif
  23. @@ -81,51 +81,51 @@
  24.  
  25.  DependTarget()
  26.  
  27. -NormalPbmplusProgramTarget(atktopbm)
  28. -NormalPbmplusProgramTarget(brushtopbm)
  29. -NormalPbmplusProgramTarget(cmuwmtopbm)
  30. -NormalPbmplusProgramTarget(g3topbm)
  31. -NormalPbmplusProgramTarget(icontopbm)
  32. -NormalPbmplusProgramTarget(gemtopbm)
  33. -NormalPbmplusProgramTarget(macptopbm)
  34. -NormalPbmplusProgramTarget(mgrtopbm)
  35. -NormalPbmplusProgramTarget(pbmclean)
  36. -NormalPbmplusProgramTarget(pbmlife)
  37. -NormalPbmplusProgramTarget(pbmmake)
  38. -NormalPbmplusProgramTarget(pbmmask)
  39. -NormalPbmplusProgramTarget(pbmpscale)
  40. -NormalPbmplusProgramTarget(pbmreduce)
  41. -NormalPbmplusProgramTarget(pbmtext)
  42. -NormalPbmplusProgramTarget(pbmto10x)
  43. -NormalPbmplusProgramTarget(pbmto4425)
  44. -NormalPbmplusProgramTarget(pbmtoascii)
  45. -NormalPbmplusProgramTarget(pbmtoatk)
  46. -NormalPbmplusProgramTarget(pbmtobbnbg)
  47. -NormalPbmplusProgramTarget(pbmtocmuwm)
  48. -NormalPbmplusProgramTarget(pbmtoepsi)
  49. -NormalPbmplusProgramTarget(pbmtoepson)
  50. -NormalPbmplusProgramTarget(pbmtog3)
  51. -NormalPbmplusProgramTarget(pbmtogem)
  52. -NormalPbmplusProgramTarget(pbmtogo)
  53. -NormalPbmplusProgramTarget(pbmtoicon)
  54. -NormalPbmplusProgramTarget(pbmtolj)
  55. -NormalPbmplusProgramTarget(pbmtoln03)
  56. -NormalPbmplusProgramTarget(pbmtolps)
  57. -NormalPbmplusProgramTarget(pbmtomacp)
  58. -NormalPbmplusProgramTarget(pbmtomgr)
  59. -NormalPbmplusProgramTarget(pbmtopi3)
  60. -NormalPbmplusProgramTarget(pbmtoplot)
  61. -NormalPbmplusProgramTarget(pbmtoptx)
  62. -NormalPbmplusProgramTarget(pbmtox10bm)
  63. -NormalPbmplusProgramTarget(pbmtoxbm)
  64. -NormalPbmplusProgramTarget(pbmtoybm)
  65. -NormalPbmplusProgramTarget(pbmtozinc)
  66. -NormalPbmplusProgramTarget(pbmupc)
  67. -NormalPbmplusProgramTarget(pi3topbm)
  68. -NormalPbmplusProgramTarget(pktopbm)
  69. -NormalPbmplusProgramTarget(xbmtopbm)
  70. -NormalPbmplusProgramTarget(ybmtopbm)
  71. -NormalPbmplusMathProgramTarget(pbmtopk)
  72. +NormalProgramTarget(atktopbm, atktopbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  73. +NormalProgramTarget(brushtopbm, brushtopbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  74. +NormalProgramTarget(cmuwmtopbm, cmuwmtopbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  75. +NormalProgramTarget(g3topbm, g3topbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  76. +NormalProgramTarget(icontopbm, icontopbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  77. +NormalProgramTarget(gemtopbm, gemtopbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  78. +NormalProgramTarget(macptopbm, macptopbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  79. +NormalProgramTarget(mgrtopbm, mgrtopbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  80. +NormalProgramTarget(pbmclean, pbmclean.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  81. +NormalProgramTarget(pbmlife, pbmlife.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  82. +NormalProgramTarget(pbmmake, pbmmake.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  83. +NormalProgramTarget(pbmmask, pbmmask.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  84. +NormalProgramTarget(pbmpscale, pbmpscale.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  85. +NormalProgramTarget(pbmreduce, pbmreduce.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  86. +NormalProgramTarget(pbmtext, pbmtext.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  87. +NormalProgramTarget(pbmto10x, pbmto10x.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  88. +NormalProgramTarget(pbmto4425, pbmto4425.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  89. +NormalProgramTarget(pbmtoascii, pbmtoascii.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  90. +NormalProgramTarget(pbmtoatk, pbmtoatk.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  91. +NormalProgramTarget(pbmtobbnbg, pbmtobbnbg.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  92. +NormalProgramTarget(pbmtocmuwm, pbmtocmuwm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  93. +NormalProgramTarget(pbmtoepsi, pbmtoepsi.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  94. +NormalProgramTarget(pbmtoepson, pbmtoepson.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  95. +NormalProgramTarget(pbmtog3, pbmtog3.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  96. +NormalProgramTarget(pbmtogem, pbmtogem.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  97. +NormalProgramTarget(pbmtogo, pbmtogo.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  98. +NormalProgramTarget(pbmtoicon, pbmtoicon.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  99. +NormalProgramTarget(pbmtolj, pbmtolj.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  100. +NormalProgramTarget(pbmtoln03, pbmtoln03.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  101. +NormalProgramTarget(pbmtolps, pbmtolps.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  102. +NormalProgramTarget(pbmtomacp, pbmtomacp.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  103. +NormalProgramTarget(pbmtomgr, pbmtomgr.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  104. +NormalProgramTarget(pbmtopi3, pbmtopi3.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  105. +NormalProgramTarget(pbmtoplot, pbmtoplot.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  106. +NormalProgramTarget(pbmtoptx, pbmtoptx.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  107. +NormalProgramTarget(pbmtox10bm, pbmtox10bm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  108. +NormalProgramTarget(pbmtoxbm, pbmtoxbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  109. +NormalProgramTarget(pbmtoybm, pbmtoybm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  110. +NormalProgramTarget(pbmtozinc, pbmtozinc.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  111. +NormalProgramTarget(pbmupc, pbmupc.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  112. +NormalProgramTarget(pi3topbm, pi3topbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  113. +NormalProgramTarget(pktopbm, pktopbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  114. +NormalProgramTarget(xbmtopbm, xbmtopbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  115. +NormalProgramTarget(ybmtopbm, ybmtopbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  116. +NormalProgramTarget(pbmtopk, pbmtopk.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
  117.  
  118.  NormalLibraryObjectRule()
  119.  NormalLibraryTarget(pbm,libpbm1.o libpbm2.o libpbm3.o libpbm4.o libpbm5.o)
  120. @@ -138,13 +138,26 @@
  121.  #endif
  122.  
  123.  #if InstallBinaries
  124. -InstallPbmplusPrograms($(BINS),$(PBMPLUSDIR)$(PBMPLUSBINDIR),$(INSTPGMFLAGS))
  125. +install::  $(BINS)
  126. +    for i in  $(BINS) ; do \
  127. +    (set -x; $(RM) $(DESTDIR) $(PBMPLUSDIR)$(PBMPLUSBINDIR)/$$i; \
  128. +    $(INSTALL) -c  $(INSTPGMFLAGS)  $$i $(PBMPLUSBINDIR) ); \
  129. +    done
  130.  #endif
  131.  
  132.  #if InstallManuals
  133. -InstallMultipleMan($(MAN1),$(PBMPLUSDIR)$(PBMPLUSMANDIR))
  134. -InstallMultipleMan($(MAN3),$(PBMPLUSDIR)$(PBMPLUSMANDIR))
  135. -InstallMultipleMan($(MAN5),$(PBMPLUSDIR)$(PBMPLUSMANDIR))
  136. +install::  $(MAN1)
  137. +    for i in   $(MAN1)  ; do \
  138. +    (set -x; $(INSTALL) -c  $(INSTMANFLAGS)  $$i $(PBMPLUSDIR)$(PBMPLUSMANDIR)  ); \
  139. +    done
  140. +install::  $(MAN3)
  141. +    for i in   $(MAN3)  ; do \
  142. +    (set -x; $(INSTALL) -c  $(INSTMANFLAGS)  $$i $(PBMPLUSDIR)$(PBMPLUSMANDIR)  ); \
  143. +    done
  144. +install::  $(MAN5)
  145. +    for i in   $(MAN5)  ; do \
  146. +    (set -x; $(INSTALL) -c  $(INSTMANFLAGS)  $$i $(PBMPLUSDIR)$(PBMPLUSMANDIR)  ); \
  147. +    done
  148.  #endif
  149.  
  150.  #if InstallLibraries
  151. @@ -152,5 +165,6 @@
  152.  #endif
  153.  
  154.  #if InstallIncludes
  155. -InstallMultipleFlags(pbm.h,$(PBMPLUSDIR)$(PBMPLUSINCDIR),$(INSTINCFLAGS))
  156. +install::  pbm.h
  157. +    $(INSTALL) -c   $(INSTINCFLAGS)   pbm.h  $(PBMPLUSDIR)$(PBMPLUSINCDIR)
  158.  #endif
  159. --- ./pgm/Imakefile.rtr    Wed May  3 12:22:56 1995
  160. +++ ./pgm/Imakefile    Wed May  3 12:23:08 1995
  161. @@ -60,29 +60,29 @@
  162.  
  163.  DependTarget()
  164.  
  165. -NormalPbmplusProgramTarget(bioradtopgm)
  166. -NormalPbmplusProgramTarget(asciitopgm)
  167. -NormalPbmplusProgramTarget(fstopgm)
  168. -NormalPbmplusProgramTarget(hipstopgm)
  169. -NormalPbmplusProgramTarget(lispmtopgm)
  170. -NormalPbmplusProgramTarget(pbmtopgm)
  171. -NormalPbmplusProgramTarget(pgmbentley)
  172. -NormalPbmplusProgramTarget(pgmenhance)
  173. -NormalPbmplusProgramTarget(pgmhist)
  174. -NormalPbmplusProgramTarget(pgmnoise)
  175. -NormalPbmplusProgramTarget(pgmnorm)
  176. -NormalPbmplusProgramTarget(pgmoil)
  177. -NormalPbmplusProgramTarget(pgmramp)
  178. -NormalPbmplusProgramTarget(pgmtofs)
  179. -NormalPbmplusProgramTarget(pgmtolispm)
  180. -NormalPbmplusProgramTarget(pgmtopbm)
  181. -NormalPbmplusProgramTarget(psidtopgm)
  182. -NormalPbmplusProgramTarget(spottopgm)
  183. -NormalPbmplusMathProgramTarget(pgmkernel)
  184. -NormalPbmplusMathProgramTarget(rawtopgm)
  185. -NormalPbmplusMathProgramTarget(pgmcrater)
  186. -NormalPbmplusMathProgramTarget(pgmedge)
  187. -NormalPbmplusMathProgramTarget(pgmtexture)
  188. +NormalProgramTarget(bioradtopgm, bioradtopgm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  189. +NormalProgramTarget(asciitopgm, asciitopgm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  190. +NormalProgramTarget(fstopgm, fstopgm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  191. +NormalProgramTarget(hipstopgm, hipstopgm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  192. +NormalProgramTarget(lispmtopgm, lispmtopgm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  193. +NormalProgramTarget(pbmtopgm, pbmtopgm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  194. +NormalProgramTarget(pgmbentley, pgmbentley.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  195. +NormalProgramTarget(pgmenhance, pgmenhance.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  196. +NormalProgramTarget(pgmhist, pgmhist.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  197. +NormalProgramTarget(pgmnoise, pgmnoise.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  198. +NormalProgramTarget(pgmnorm, pgmnorm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  199. +NormalProgramTarget(pgmoil, pgmoil.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  200. +NormalProgramTarget(pgmramp, pgmramp.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  201. +NormalProgramTarget(pgmtofs, pgmtofs.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  202. +NormalProgramTarget(pgmtolispm, pgmtolispm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  203. +NormalProgramTarget(pgmtopbm, pgmtopbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  204. +NormalProgramTarget(psidtopgm, psidtopgm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  205. +NormalProgramTarget(spottopgm, spottopgm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  206. +NormalProgramTarget(pgmkernel, pgmkernel.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
  207. +NormalProgramTarget(rawtopgm, rawtopgm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
  208. +NormalProgramTarget(pgmcrater, pgmcrater.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
  209. +NormalProgramTarget(pgmedge, pgmedge.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
  210. +NormalProgramTarget(pgmtexture, pgmtexture.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
  211.  
  212.  NormalLibraryObjectRule()
  213.  NormalLibraryTarget(pgm,libpgm1.o libpgm2.o)
  214. @@ -95,13 +95,26 @@
  215.  #endif
  216.  
  217.  #if InstallBinaries
  218. -InstallPbmplusPrograms($(BINS),$(PBMPLUSDIR)$(PBMPLUSBINDIR),$(INSTPGMFLAGS))
  219. +install::  $(BINS)
  220. +    for i in  $(BINS) ; do \
  221. +    (set -x; $(RM) $(DESTDIR) $(PBMPLUSDIR)$(PBMPLUSBINDIR)/$$i; \
  222. +    $(INSTALL) -c  $(INSTPGMFLAGS)  $$i $(PBMPLUSBINDIR) ); \
  223. +    done
  224.  #endif
  225.  
  226.  #if InstallManuals
  227. -InstallMultipleMan($(MAN1),$(PBMPLUSDIR)$(PBMPLUSMANDIR))
  228. -InstallMultipleMan($(MAN3),$(PBMPLUSDIR)$(PBMPLUSMANDIR))
  229. -InstallMultipleMan($(MAN5),$(PBMPLUSDIR)$(PBMPLUSMANDIR))
  230. +install::  $(MAN1)
  231. +    for i in   $(MAN1)  ; do \
  232. +    (set -x; $(INSTALL) -c  $(INSTMANFLAGS)  $$i $(PBMPLUSDIR)$(PBMPLUSMANDIR)  ); \
  233. +    done
  234. +install::  $(MAN3)
  235. +    for i in   $(MAN3)  ; do \
  236. +    (set -x; $(INSTALL) -c  $(INSTMANFLAGS)  $$i $(PBMPLUSDIR)$(PBMPLUSMANDIR)  ); \
  237. +    done
  238. +install::  $(MAN5)
  239. +    for i in   $(MAN5)  ; do \
  240. +    (set -x; $(INSTALL) -c  $(INSTMANFLAGS)  $$i $(PBMPLUSDIR)$(PBMPLUSMANDIR)  ); \
  241. +    done
  242.  #endif
  243.  
  244.  #if InstallLibraries
  245. @@ -109,5 +122,5 @@
  246.  #endif
  247.  
  248.  #if InstallIncludes
  249. -InstallMultipleFlags(pgm.h,$(PBMPLUSDIR)$(PBMPLUSINCDIR),$(INSTINCFLAGS))
  250. +    $(INSTALL) -c   $(INSTINCFLAGS)   pgm.h  $(PBMPLUSDIR)$(PBMPLUSINCDIR)
  251.  #endif
  252. --- ./pgm/pgmedge.c.rtr    Mon Oct  4 05:11:16 1993
  253. +++ ./pgm/pgmedge.c    Wed May  3 12:23:08 1995
  254. @@ -10,7 +10,9 @@
  255.  ** implied warranty.
  256.  */
  257.  
  258. +#if 0
  259.  #include <math.h>
  260. +#endif
  261.  #include "pgm.h"
  262.  
  263.  int
  264. --- ./pgm/pgmtexture.c.rtr    Mon Oct  4 05:11:21 1993
  265. +++ ./pgm/pgmtexture.c    Wed May  3 12:23:09 1995
  266. @@ -40,7 +40,9 @@
  267.  **             correlation function.
  268.  */
  269.  
  270. +#if 0
  271.  #include <math.h>
  272. +#endif
  273.  #include "pgm.h"
  274.  
  275.  #define RADIX 2.0
  276. --- ./pnm/Imakefile.rtr    Wed May  3 12:22:56 1995
  277. +++ ./pnm/Imakefile    Wed May  3 12:38:15 1995
  278. @@ -107,45 +107,45 @@
  279.  
  280.  DependTarget()
  281.  
  282. -NormalPbmplusProgramTarget(fitstopnm)
  283. -NormalPbmplusProgramTarget(giftopnm)
  284. -NormalPbmplusProgramTarget(pnmalias)
  285. -NormalPbmplusProgramTarget(pnmarith)
  286. -NormalPbmplusProgramTarget(pnmcat)
  287. -NormalPbmplusProgramTarget(pnmcomp)
  288. -NormalPbmplusProgramTarget(pnmconvol)
  289. -NormalPbmplusProgramTarget(pnmcrop)
  290. -NormalPbmplusProgramTarget(pnmcut)
  291. -NormalPbmplusProgramTarget(pnmdepth)
  292. -NormalPbmplusProgramTarget(pnmenlarge)
  293. -NormalPbmplusProgramTarget(pnmfile)
  294. -NormalPbmplusProgramTarget(pnmflip)
  295. -NormalPbmplusProgramTarget(pnmhistmap)
  296. -NormalPbmplusProgramTarget(pnminvert)
  297. -NormalPbmplusProgramTarget(pnmnoraw)
  298. -NormalPbmplusProgramTarget(pnmpad)
  299. -NormalPbmplusProgramTarget(pnmpaste)
  300. -NormalPbmplusProgramTarget(pnmtile)
  301. -NormalPbmplusProgramTarget(pnmtoddif)
  302. -NormalPbmplusProgramTarget(pnmtofits)
  303. -NormalPbmplusProgramTarget(pnmtops)
  304. -NormalPbmplusProgramTarget(pnmtorast)
  305. -NormalPbmplusProgramTarget(pnmtosgi)
  306. -NormalPbmplusProgramTarget(pnmtosir)
  307. -NormalPbmplusProgramTarget(pnmtoxwd)
  308. -NormalPbmplusProgramTarget(rasttopnm)
  309. -NormalPbmplusProgramTarget(sirtopnm)
  310. -NormalPbmplusProgramTarget(xwdtopnm)
  311. -NormalPbmplusProgramTarget(zeisstopnm)
  312. -NormalPbmplusProgramTarget(sgitopnm)
  313. -NormalPbmplusMathProgramTarget(pnmgamma)
  314. -NormalPbmplusMathProgramTarget(pnmnlfilt)
  315. -NormalPbmplusMathProgramTarget(pnmrotate)
  316. -NormalPbmplusMathProgramTarget(pnmscale)
  317. -NormalPbmplusMathProgramTarget(pnmshear)
  318. +NormalProgramTarget(fitstopnm, fitstopnm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  319. +NormalProgramTarget(giftopnm, giftopnm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  320. +NormalProgramTarget(pnmalias, pnmalias.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  321. +NormalProgramTarget(pnmarith, pnmarith.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  322. +NormalProgramTarget(pnmcat, pnmcat.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  323. +NormalProgramTarget(pnmcomp, pnmcomp.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  324. +NormalProgramTarget(pnmconvol, pnmconvol.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  325. +NormalProgramTarget(pnmcrop, pnmcrop.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  326. +NormalProgramTarget(pnmcut, pnmcut.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  327. +NormalProgramTarget(pnmdepth, pnmdepth.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  328. +NormalProgramTarget(pnmenlarge, pnmenlarge.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  329. +NormalProgramTarget(pnmfile, pnmfile.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  330. +NormalProgramTarget(pnmflip, pnmflip.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  331. +NormalProgramTarget(pnmhistmap, pnmhistmap.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  332. +NormalProgramTarget(pnminvert, pnminvert.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  333. +NormalProgramTarget(pnmnoraw, pnmnoraw.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  334. +NormalProgramTarget(pnmpad, pnmpad.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  335. +NormalProgramTarget(pnmpaste, pnmpaste.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  336. +NormalProgramTarget(pnmtile, pnmtile.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  337. +NormalProgramTarget(pnmtoddif, pnmtoddif.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  338. +NormalProgramTarget(pnmtofits, pnmtofits.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  339. +NormalProgramTarget(pnmtops, pnmtops.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  340. +NormalProgramTarget(pnmtorast, pnmtorast.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  341. +NormalProgramTarget(pnmtosgi, pnmtosgi.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  342. +NormalProgramTarget(pnmtosir, pnmtosir.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  343. +NormalProgramTarget(pnmtoxwd, pnmtoxwd.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  344. +NormalProgramTarget(rasttopnm, rasttopnm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  345. +NormalProgramTarget(sirtopnm, sirtopnm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  346. +NormalProgramTarget(xwdtopnm, xwdtopnm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  347. +NormalProgramTarget(zeisstopnm, zeisstopnm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  348. +NormalProgramTarget(sgitopnm, sgitopnm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  349. +NormalProgramTarget(pnmgamma, pnmgamma.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
  350. +NormalProgramTarget(pnmnlfilt, pnmnlfilt.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
  351. +NormalProgramTarget(pnmrotate, pnmrotate.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
  352. +NormalProgramTarget(pnmscale, pnmscale.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
  353. +NormalProgramTarget(pnmshear, pnmshear.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
  354.  #if BuildLibTiff
  355. -NormalPbmplusProgramTarget(tifftopnm)
  356. -NormalPbmplusProgramTarget(pnmtotiff)
  357. +NormalProgramTarget(tifftopnm, tifftopnm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  358. +NormalProgramTarget(pnmtotiff, pnmtotiff.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  359.  #endif
  360.  
  361.  NormalLibraryObjectRule()
  362. @@ -159,7 +159,11 @@
  363.  #endif
  364.  
  365.  #if InstallBinaries
  366. -InstallPbmplusPrograms($(BINS),$(PBMPLUSDIR)$(PBMPLUSBINDIR),$(INSTPGMFLAGS))
  367. +install::  $(BINS)
  368. +    for i in  $(BINS) ; do \
  369. +    (set -x; $(RM) $(DESTDIR) $(PBMPLUSDIR)$(PBMPLUSBINDIR)/$$i; \
  370. +    $(INSTALL) -c  $(INSTPGMFLAGS)  $$i $(PBMPLUSBINDIR) ); \
  371. +    done
  372.  InstallScript(anytopnm,$(PBMPLUSDIR)$(PBMPLUSBINDIR))
  373.  InstallScript(pnmindex,$(PBMPLUSDIR)$(PBMPLUSBINDIR))
  374.  InstallScript(pnmmargin,$(PBMPLUSDIR)$(PBMPLUSBINDIR))
  375. @@ -168,9 +172,18 @@
  376.  #endif
  377.  
  378.  #if InstallManuals
  379. -InstallMultipleMan($(MAN1),$(PBMPLUSDIR)$(PBMPLUSMANDIR))
  380. -InstallMultipleMan($(MAN3),$(PBMPLUSDIR)$(PBMPLUSMANDIR))
  381. -InstallMultipleMan($(MAN5),$(PBMPLUSDIR)$(PBMPLUSMANDIR))
  382. +install::  $(MAN1)
  383. +    for i in   $(MAN1)  ; do \
  384. +    (set -x; $(INSTALL) -c  $(INSTMANFLAGS)  $$i $(PBMPLUSDIR)$(PBMPLUSMANDIR)  ); \
  385. +    done
  386. +install::  $(MAN3)
  387. +    for i in   $(MAN3)  ; do \
  388. +    (set -x; $(INSTALL) -c  $(INSTMANFLAGS)  $$i $(PBMPLUSDIR)$(PBMPLUSMANDIR)  ); \
  389. +    done
  390. +install::  $(MAN5)
  391. +    for i in   $(MAN5)  ; do \
  392. +    (set -x; $(INSTALL) -c  $(INSTMANFLAGS)  $$i $(PBMPLUSDIR)$(PBMPLUSMANDIR)  ); \
  393. +    done
  394.  #endif
  395.  
  396.  #if InstallLibraries
  397. @@ -178,5 +191,5 @@
  398.  #endif
  399.  
  400.  #if InstallIncludes
  401. -InstallMultipleFlags(pnm.h,$(PBMPLUSDIR)$(PBMPLUSINCDIR),$(INSTINCFLAGS))
  402. +    $(INSTALL) -c   $(INSTINCFLAGS)   pnm.h  $(PBMPLUSDIR)$(PBMPLUSINCDIR)
  403.  #endif
  404. --- ./pnm/pnmgamma.c.rtr    Mon Oct  4 05:11:41 1993
  405. +++ ./pnm/pnmgamma.c    Wed May  3 12:23:09 1995
  406. @@ -10,7 +10,9 @@
  407.  ** implied warranty.
  408.  */
  409.  
  410. +#if 0
  411.  #include <math.h>
  412. +#endif
  413.  #include <ctype.h>
  414.  #include "pnm.h"
  415.  
  416. --- ./pnm/pnmrotate.c.rtr    Mon Oct  4 05:11:53 1993
  417. +++ ./pnm/pnmrotate.c    Wed May  3 12:23:09 1995
  418. @@ -10,7 +10,9 @@
  419.  ** implied warranty.
  420.  */
  421.  
  422. +#if 0
  423.  #include <math.h>
  424. +#endif
  425.  #include "pnm.h"
  426.  #ifndef M_PI
  427.  #define M_PI    3.14159265358979323846
  428. @@ -38,7 +40,7 @@
  429.      int antialias;
  430.      float fangle, xshearfac, yshearfac, new0;
  431.      int intnew0;
  432. -    register long fracnew0, omfracnew0;
  433. +    register int fracnew0, omfracnew0;
  434.      char* usage = "[-noantialias] <angle> [pnmfile]";
  435.  
  436.      pnm_init( &argc, argv );
  437. --- ./pnm/pnmshear.c.rtr    Mon Oct  4 05:11:55 1993
  438. +++ ./pnm/pnmshear.c    Wed May  3 12:23:09 1995
  439. @@ -10,7 +10,9 @@
  440.  ** implied warranty.
  441.  */
  442.  
  443. +#if 0
  444.  #include <math.h>
  445. +#endif
  446.  #include "pnm.h"
  447.  #ifndef M_PI
  448.  #define M_PI    3.14159265358979323846
  449. --- ./pnm/xwdtopnm.c.rtr    Mon Oct  4 05:12:03 1993
  450. +++ ./pnm/xwdtopnm.c    Wed May  3 12:23:10 1995
  451. @@ -14,18 +14,18 @@
  452.  #include "x10wd.h"
  453.  #include "x11wd.h"
  454.  
  455. -static void getinit ARGS(( FILE* file, int* colsP, int* rowsP, int* padrightP, long* maxvalP, long* visualclassP, int* formatP, xel** colorsP ));
  456. -static unsigned long getpixnum ARGS(( FILE* file ));
  457. +static void getinit ARGS(( FILE* file, int* colsP, int* rowsP, int* padrightP, int* maxvalP, int* visualclassP, int* formatP, xel** colorsP ));
  458. +static unsigned int getpixnum ARGS(( FILE* file ));
  459.  static short bs_short ARGS(( short s ));
  460. -static long bs_long ARGS(( long l ));
  461. +static int bs_long ARGS(( int l ));
  462.  
  463. -static unsigned long red_mask, green_mask, blue_mask;
  464. +static unsigned int red_mask, green_mask, blue_mask;
  465.  static int bits_per_item, bits_used, bit_shift, bits_per_pixel;
  466.  static char buf[4];
  467.  static char* byteP;
  468.  static short* shortP;
  469. -static long* longP;
  470. -static unsigned long pixel_mask;
  471. +static int* longP;
  472. +static unsigned int pixel_mask;
  473.  static int byte_swap, byte_order, bit_order;
  474.  
  475.  int
  476. @@ -39,7 +39,7 @@
  477.      xel* colors;
  478.      int rows, cols, format, padright, row;
  479.      register int col;
  480. -    long maxval, visualclass;
  481. +    int maxval, visualclass;
  482.  
  483.      pnm_init( &argc, argv );
  484.  
  485. @@ -89,7 +89,7 @@
  486.              case DirectColor:
  487.          for ( col = 0, xP = xelrow; col < cols; ++col, ++xP )
  488.          {
  489. -        register unsigned long ul;
  490. +        register unsigned int ul;
  491.  
  492.          ul = getpixnum( ifp );
  493.          switch ( bits_per_pixel )
  494. @@ -134,8 +134,8 @@
  495.      int* colsP;
  496.      int* rowsP;
  497.      int* padrightP;
  498. -    long* maxvalP;
  499. -    long* visualclassP;
  500. +    int* maxvalP;
  501. +    int* visualclassP;
  502.      int* formatP;
  503.      xel** colorsP;
  504.      {
  505. @@ -365,11 +365,11 @@
  506.          if ( *maxvalP != 65535L )
  507.              {
  508.              x11colors[i].red =
  509. -            (long) x11colors[i].red * (long) *maxvalP / 65535L;
  510. +            (int) x11colors[i].red * (int) *maxvalP / 65535L;
  511.              x11colors[i].green =
  512. -            (long) x11colors[i].green * (long) *maxvalP / 65535L;
  513. +            (int) x11colors[i].green * (int) *maxvalP / 65535L;
  514.              x11colors[i].blue =
  515. -            (long) x11colors[i].blue * (long) *maxvalP / 65535L;
  516. +            (int) x11colors[i].blue * (int) *maxvalP / 65535L;
  517.              }
  518.          if ( x11colors[i].red != x11colors[i].green ||
  519.               x11colors[i].green != x11colors[i].blue )
  520. @@ -444,10 +444,10 @@
  521.  
  522.      byteP = (char*) buf;
  523.      shortP = (short*) buf;
  524. -    longP = (long*) buf;
  525. +    longP = (int*) buf;
  526.      }
  527.  
  528. -static unsigned long
  529. +static unsigned int
  530.  getpixnum( file )
  531.      FILE* file;
  532.      {
  533. @@ -528,7 +528,7 @@
  534.  /* Byte-swapping junk. */
  535.  
  536.  union cheat {
  537. -    long l;
  538. +    int l;
  539.      short s;
  540.      unsigned char c[4];
  541.      };
  542. @@ -553,12 +553,12 @@
  543.      }
  544.  
  545.  #if __STDC__
  546. -static long
  547. -bs_long( long l )
  548. +static int
  549. +bs_long( int l )
  550.  #else /*__STDC__*/
  551. -static long
  552. +static int
  553.  bs_long( l )
  554. -    long l;
  555. +    int l;
  556.  #endif /*__STDC__*/
  557.      {
  558.      union cheat u;
  559. --- ./pnm/x11wd.h.rtr    Mon Oct  4 05:12:02 1993
  560. +++ ./pnm/x11wd.h    Wed May  3 12:23:10 1995
  561. @@ -18,7 +18,7 @@
  562.  #define TrueColor    4
  563.  #define DirectColor    5
  564.  
  565. -typedef unsigned long xwdval;
  566. +typedef unsigned int xwdval;
  567.  #define X11WD_FILE_VERSION 7
  568.  typedef struct {
  569.      xwdval header_size;        /* Size of the entire file header (bytes). */
  570. @@ -43,13 +43,13 @@
  571.      xwdval ncolors;        /* Number of Color structures */
  572.      xwdval window_width;    /* Window width */
  573.      xwdval window_height;    /* Window height */
  574. -    long window_x;        /* Window upper left X coordinate */
  575. -    long window_y;        /* Window upper left Y coordinate */
  576. +    int window_x;        /* Window upper left X coordinate */
  577. +    int window_y;        /* Window upper left Y coordinate */
  578.      xwdval window_bdrwidth;    /* Window border width */
  579.      } X11WDFileHeader;
  580.  
  581.  typedef struct {
  582. -    unsigned long num;
  583. +    unsigned int num;
  584.      unsigned short red, green, blue;
  585.      char flags;            /* do_red, do_green, do_blue */
  586.      char pad;
  587. --- ./pnm/pnmtoxwd.c.rtr    Mon Oct  4 05:12:00 1993
  588. +++ ./pnm/pnmtoxwd.c    Wed May  3 12:23:10 1995
  589. @@ -28,7 +28,7 @@
  590.      int pseudodepth;
  591.      int forcedirect, direct, grayscale;
  592.      xelval maxval;
  593. -    long lmaxval, xmaxval;
  594. +    int lmaxval, xmaxval;
  595.      colorhist_vector chv;
  596.      colorhash_table cht;
  597.      X11WDFileHeader h11;
  598. @@ -74,7 +74,7 @@
  599.      pm_usage( usage );
  600.  
  601.      xels = pnm_readpnm( ifp, &cols, &rows, &maxval, &format );
  602. -    lmaxval = (long) maxval;
  603. +    lmaxval = (int) maxval;
  604.      xmaxval = ( 1 << pseudodepth ) - 1;
  605.      pm_close( ifp );
  606.      
  607. @@ -232,9 +232,9 @@
  608.          /* Stupid hack because xloadimage and xwud disagree on
  609.          ** how to interpret bitmaps. */
  610.          if ( PNM_FORMAT_TYPE(format) == PBM_TYPE )
  611. -            color.red = (long) ( colors-1-i ) * 65535L / ( colors - 1 );
  612. +            color.red = (int) ( colors-1-i ) * 65535L / ( colors - 1 );
  613.          else
  614. -            color.red = (long) i * 65535L / ( colors - 1 );
  615. +            color.red = (int) i * 65535L / ( colors - 1 );
  616.  
  617.          color.green = color.red;
  618.          color.blue = color.red;
  619. @@ -246,9 +246,9 @@
  620.          color.blue = PPM_GETB( chv[i].color );
  621.          if ( lmaxval != 65535L )
  622.              {
  623. -            color.red = (long) color.red * 65535L / lmaxval;
  624. -            color.green = (long) color.green * 65535L / lmaxval;
  625. -            color.blue = (long) color.blue * 65535L / lmaxval;
  626. +            color.red = (int) color.red * 65535L / lmaxval;
  627. +            color.green = (int) color.green * 65535L / lmaxval;
  628. +            color.blue = (int) color.blue * 65535L / lmaxval;
  629.              }
  630.          }
  631.          pm_writebiglong( stdout, color.num );
  632. @@ -269,7 +269,7 @@
  633.          case PPM_TYPE:
  634.          for ( col = 0, xP = xels[row]; col < cols; ++col, ++xP )
  635.              {
  636. -            unsigned long ul;
  637. +            unsigned int ul;
  638.  
  639.              ul = ( ( PPM_GETR( *xP ) * xmaxval / lmaxval ) << 16 ) |
  640.               ( ( PPM_GETG( *xP ) * xmaxval / lmaxval ) << 8 ) |
  641. @@ -281,8 +281,8 @@
  642.          default:
  643.          for ( col = 0, xP = xels[row]; col < cols; ++col, ++xP )
  644.              {
  645. -            unsigned long ul;
  646. -            register unsigned long val;
  647. +            unsigned int ul;
  648. +            register unsigned int val;
  649.  
  650.              val = PNM_GET1( *xP );
  651.              ul = ( ( val * xmaxval / lmaxval ) << 16 ) |
  652. @@ -312,7 +312,7 @@
  653.              s = 1 - s;
  654.  
  655.          if ( maxval != bigger_maxval )
  656. -            s = (long) s * bigger_maxval / maxval;
  657. +            s = (int) s * bigger_maxval / maxval;
  658.          byte |= s << bitshift;
  659.          bitshift -= h11.bits_per_pixel;
  660.          if ( bitshift < 0 )
  661. --- ./pnm/tifftopnm.c.rtr    Mon Oct  4 05:12:01 1993
  662. +++ ./pnm/tifftopnm.c    Wed May  3 12:23:10 1995
  663. @@ -159,9 +159,9 @@
  664.          for ( i = 0; i < numcolors; ++i )
  665.          {
  666.          register xelval r, g, b;
  667. -        r = (long) redcolormap[i] * PNM_MAXMAXVAL / 65535L;
  668. -        g = (long) greencolormap[i] * PNM_MAXMAXVAL / 65535L;
  669. -        b = (long) bluecolormap[i] * PNM_MAXMAXVAL / 65535L;
  670. +        r = (int) redcolormap[i] * PNM_MAXMAXVAL / 65535L;
  671. +        g = (int) greencolormap[i] * PNM_MAXMAXVAL / 65535L;
  672. +        b = (int) bluecolormap[i] * PNM_MAXMAXVAL / 65535L;
  673.          PPM_ASSIGN( colormap[i], r, g, b );
  674.          }
  675.          break;
  676. --- ./ppm/Imakefile.rtr    Wed May  3 12:22:56 1995
  677. +++ ./ppm/Imakefile    Wed May  3 12:23:10 1995
  678. @@ -20,7 +20,7 @@
  679.     CURRENTLIBS = $(LIBPPM) $(LIBPGM) $(LIBPBM)
  680.  CURRENTDEPLIBS = $(DEPLIBPPM) $(DEPLIBPGM) $(DEPLIBPBM)
  681.       INCLUDES  = -I.. -I../$(PBMDIR) -I../$(PGMDIR)
  682. -       DEFINES = -DRGB_DB=\"DefaultRGBDatabase\"
  683. +       DEFINES = -DRGB_DB=\"/usr/lib/X11/rgb\"
  684.           MERGE = ppmmerge
  685.  
  686.            MAN1 = bmptoppm.1 gouldtoppm.1 hpcdtoppm.1 ilbmtoppm.1 \
  687. @@ -103,69 +103,69 @@
  688.  
  689.  DependTarget()
  690.  
  691. -NormalPbmplusProgramTarget(bmptoppm)
  692. -NormalPbmplusProgramTarget(gouldtoppm)
  693. -NormalPbmplusProgramTarget(hpcdtoppm)
  694. -NormalPbmplusProgramTarget(ilbmtoppm)
  695. -NormalPbmplusProgramTarget(imgtoppm)
  696. -NormalPbmplusProgramTarget(mtvtoppm)
  697. -NormalPbmplusProgramTarget(pcxtoppm)
  698. -NormalPbmplusProgramTarget(pgmtoppm)
  699. -NormalPbmplusProgramTarget(pi1toppm)
  700. -NormalPbmplusProgramTarget(picttoppm)
  701. -NormalPbmplusProgramTarget(pjtoppm)
  702. -NormalPbmplusProgramTarget(ppm3d)
  703. -NormalPbmplusProgramTarget(ppmbrighten)
  704. -NormalPbmplusProgramTarget(ppmchange)
  705. -NormalPbmplusProgramTarget(ppmdim)
  706. -NormalPbmplusProgramTarget(ppmdist)
  707. -NormalPbmplusProgramTarget(ppmdither)
  708. -NormalPbmplusProgramTarget(ppmflash)
  709. -NormalPbmplusProgramTarget(ppmhist)
  710. -NormalPbmplusProgramTarget(ppmmake)
  711. -NormalPbmplusProgramTarget(ppmmix)
  712. -NormalPbmplusProgramTarget(ppmnorm)
  713. -NormalPbmplusProgramTarget(ppmntsc)
  714. -NormalPbmplusProgramTarget(ppmquant)
  715. -NormalPbmplusProgramTarget(ppmrelief)
  716. -NormalPbmplusProgramTarget(ppmshift)
  717. -NormalPbmplusProgramTarget(ppmspread)
  718. -NormalPbmplusProgramTarget(ppmtoacad)
  719. -NormalPbmplusProgramTarget(ppmtobmp)
  720. -NormalPbmplusProgramTarget(ppmtogif)
  721. -NormalPbmplusProgramTarget(ppmtoicr)
  722. -NormalPbmplusProgramTarget(ppmtoilbm)
  723. -NormalPbmplusProgramTarget(ppmtomitsu)
  724. -NormalPbmplusProgramTarget(ppmtopcx)
  725. -NormalPbmplusProgramTarget(ppmtopgm)
  726. -NormalPbmplusProgramTarget(ppmtopi1)
  727. -NormalPbmplusProgramTarget(ppmtopict)
  728. -NormalPbmplusProgramTarget(ppmtopj)
  729. -NormalPbmplusProgramTarget(ppmtopjxl)
  730. -NormalPbmplusProgramTarget(ppmtopuzz)
  731. -NormalPbmplusProgramTarget(ppmtorgb3)
  732. -NormalPbmplusProgramTarget(ppmtosixel)
  733. -NormalPbmplusProgramTarget(ppmtotga)
  734. -NormalPbmplusProgramTarget(ppmtouil)
  735. -NormalPbmplusProgramTarget(ppmtoxpm)
  736. -NormalPbmplusProgramTarget(ppmtoyuv)
  737. -NormalPbmplusProgramTarget(ppmtoyuvsplit)
  738. -NormalPbmplusProgramTarget(qrttoppm)
  739. -NormalPbmplusProgramTarget(rawtoppm)
  740. -NormalPbmplusProgramTarget(rgb3toppm)
  741. -NormalPbmplusProgramTarget(sldtoppm)
  742. -NormalPbmplusProgramTarget(spctoppm)
  743. -NormalPbmplusProgramTarget(sputoppm)
  744. -NormalPbmplusProgramTarget(tgatoppm)
  745. -NormalPbmplusProgramTarget(ximtoppm)
  746. -NormalPbmplusProgramTarget(xpmtoppm)
  747. -NormalPbmplusProgramTarget(xvminitoppm)
  748. -NormalPbmplusProgramTarget(yuvtoppm)
  749. -NormalPbmplusProgramTarget(yuvsplittoppm)
  750. -NormalPbmplusMathProgramTarget(ppmforge)
  751. -NormalPbmplusMathProgramTarget(ppmpat)
  752. -NormalPbmplusMathProgramTarget(ppmqvga)
  753. -NormalPbmplusMathProgramTarget(ppmtomap)
  754. +NormalProgramTarget(bmptoppm, bmptoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  755. +NormalProgramTarget(gouldtoppm, gouldtoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  756. +NormalProgramTarget(hpcdtoppm, hpcdtoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  757. +NormalProgramTarget(ilbmtoppm, ilbmtoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  758. +NormalProgramTarget(imgtoppm, imgtoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  759. +NormalProgramTarget(mtvtoppm, mtvtoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  760. +NormalProgramTarget(pcxtoppm, pcxtoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  761. +NormalProgramTarget(pgmtoppm, pgmtoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  762. +NormalProgramTarget(pi1toppm, pi1toppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  763. +NormalProgramTarget(picttoppm, picttoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  764. +NormalProgramTarget(pjtoppm, pjtoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  765. +NormalProgramTarget(ppm3d, ppm3d.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  766. +NormalProgramTarget(ppmbrighten, ppmbrighten.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  767. +NormalProgramTarget(ppmchange, ppmchange.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  768. +NormalProgramTarget(ppmdim, ppmdim.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  769. +NormalProgramTarget(ppmdist, ppmdist.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  770. +NormalProgramTarget(ppmdither, ppmdither.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  771. +NormalProgramTarget(ppmflash, ppmflash.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  772. +NormalProgramTarget(ppmhist, ppmhist.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  773. +NormalProgramTarget(ppmmake, ppmmake.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  774. +NormalProgramTarget(ppmmix, ppmmix.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  775. +NormalProgramTarget(ppmnorm, ppmnorm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  776. +NormalProgramTarget(ppmntsc, ppmntsc.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  777. +NormalProgramTarget(ppmquant, ppmquant.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  778. +NormalProgramTarget(ppmrelief, ppmrelief.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  779. +NormalProgramTarget(ppmshift, ppmshift.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  780. +NormalProgramTarget(ppmspread, ppmspread.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  781. +NormalProgramTarget(ppmtoacad, ppmtoacad.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  782. +NormalProgramTarget(ppmtobmp, ppmtobmp.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  783. +NormalProgramTarget(ppmtogif, ppmtogif.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  784. +NormalProgramTarget(ppmtoicr, ppmtoicr.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  785. +NormalProgramTarget(ppmtoilbm, ppmtoilbm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  786. +NormalProgramTarget(ppmtomitsu, ppmtomitsu.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  787. +NormalProgramTarget(ppmtopcx, ppmtopcx.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  788. +NormalProgramTarget(ppmtopgm, ppmtopgm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  789. +NormalProgramTarget(ppmtopi1, ppmtopi1.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  790. +NormalProgramTarget(ppmtopict, ppmtopict.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  791. +NormalProgramTarget(ppmtopj, ppmtopj.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  792. +NormalProgramTarget(ppmtopjxl, ppmtopjxl.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  793. +NormalProgramTarget(ppmtopuzz, ppmtopuzz.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  794. +NormalProgramTarget(ppmtorgb3, ppmtorgb3.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  795. +NormalProgramTarget(ppmtosixel, ppmtosixel.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  796. +NormalProgramTarget(ppmtotga, ppmtotga.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  797. +NormalProgramTarget(ppmtouil, ppmtouil.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  798. +NormalProgramTarget(ppmtoxpm, ppmtoxpm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  799. +NormalProgramTarget(ppmtoyuv, ppmtoyuv.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  800. +NormalProgramTarget(ppmtoyuvsplit, ppmtoyuvsplit.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  801. +NormalProgramTarget(qrttoppm, qrttoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  802. +NormalProgramTarget(rawtoppm, rawtoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  803. +NormalProgramTarget(rgb3toppm, rgb3toppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  804. +NormalProgramTarget(sldtoppm, sldtoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  805. +NormalProgramTarget(spctoppm, spctoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  806. +NormalProgramTarget(sputoppm, sputoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  807. +NormalProgramTarget(tgatoppm, tgatoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  808. +NormalProgramTarget(ximtoppm, ximtoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  809. +NormalProgramTarget(xpmtoppm, xpmtoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  810. +NormalProgramTarget(xvminitoppm, xvminitoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  811. +NormalProgramTarget(yuvtoppm, yuvtoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  812. +NormalProgramTarget(yuvsplittoppm, yuvsplittoppm.o, $(CURRENTDEPLIBS), $(CURRENTLIBS),)
  813. +NormalProgramTarget(ppmforge, ppmforge.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
  814. +NormalProgramTarget(ppmpat, ppmpat.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
  815. +NormalProgramTarget(ppmqvga, ppmqvga.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
  816. +NormalProgramTarget(ppmtomap, ppmtomap.o, $(CURRENTDEPLIBS), $(CURRENTLIBS), -lm)
  817.  
  818.  NormalLibraryObjectRule()
  819.  NormalLibraryTarget(ppm,libppm1.o libppm2.o libppm3.o libppm4.o \
  820. @@ -179,14 +179,27 @@
  821.  #endif
  822.  
  823.  #if InstallBinaries
  824. -InstallPbmplusPrograms($(BINS),$(PBMPLUSDIR)$(PBMPLUSBINDIR),$(INSTPGMFLAGS))
  825. +install::  $(BINS)
  826. +    for i in  $(BINS) ; do \
  827. +    (set -x; $(RM) $(DESTDIR) $(PBMPLUSDIR)$(PBMPLUSBINDIR)/$$i; \
  828. +    $(INSTALL) -c  $(INSTPGMFLAGS)  $$i $(PBMPLUSBINDIR) ); \
  829. +    done
  830.  InstallScript(ppmquantall,$(PBMPLUSDIR)$(PBMPLUSBINDIR))
  831.  #endif
  832.  
  833.  #if InstallManuals
  834. -InstallMultipleMan($(MAN1),$(PBMPLUSDIR)$(PBMPLUSMANDIR))
  835. -InstallMultipleMan($(MAN3),$(PBMPLUSDIR)$(PBMPLUSMANDIR))
  836. -InstallMultipleMan($(MAN5),$(PBMPLUSDIR)$(PBMPLUSMANDIR))
  837. +install::  $(MAN1)
  838. +    for i in   $(MAN1)  ; do \
  839. +    (set -x; $(INSTALL) -c  $(INSTMANFLAGS)  $$i $(PBMPLUSDIR)$(PBMPLUSMANDIR)  ); \
  840. +    done
  841. +install::  $(MAN3)
  842. +    for i in   $(MAN3)  ; do \
  843. +    (set -x; $(INSTALL) -c  $(INSTMANFLAGS)  $$i $(PBMPLUSDIR)$(PBMPLUSMANDIR)  ); \
  844. +    done
  845. +install::  $(MAN5)
  846. +    for i in   $(MAN5)  ; do \
  847. +    (set -x; $(INSTALL) -c  $(INSTMANFLAGS)  $$i $(PBMPLUSDIR)$(PBMPLUSMANDIR)  ); \
  848. +    done
  849.  #endif
  850.  
  851.  #if InstallLibraries
  852. @@ -194,5 +207,5 @@
  853.  #endif
  854.  
  855.  #if InstallIncludes
  856. -InstallMultipleFlags(ppm.h,$(PBMPLUSDIR)$(PBMPLUSINCDIR),$(INSTINCFLAGS))
  857. +    $(INSTALL) -c   $(INSTINCFLAGS) ppm.h  $(PBMPLUSDIR)$(PBMPLUSINCDIR)
  858.  #endif
  859. --- ./ppm/ppmpat.c.rtr    Mon Oct  4 05:12:31 1993
  860. +++ ./ppm/ppmpat.c    Wed May  3 12:23:11 1995
  861. @@ -10,7 +10,9 @@
  862.  ** implied warranty.
  863.  */
  864.  
  865. +#if 0
  866.  #include <math.h>
  867. +#endif
  868.  #include "ppm.h"
  869.  #include "ppmdraw.h"
  870.  #ifndef M_PI
  871. --- ./pbmplus.h.rtr    Tue Mar  1 04:46:36 1994
  872. +++ ./pbmplus.h    Wed May  3 12:23:11 1995
  873. @@ -106,8 +106,8 @@
  874.  #else /* SYSV or AMIGA */
  875.  
  876.  #include <strings.h>
  877. -extern void srandom();
  878. -extern long random();
  879. +/* extern void srandom();
  880. +extern long random(); */
  881.  
  882.  #endif /*SYSV or AMIGA*/
  883.  
  884. --- ./Imakefile.rtr    Wed May  3 12:22:57 1995
  885. +++ ./Imakefile    Wed May  3 12:23:11 1995
  886. @@ -25,5 +25,5 @@
  887.  DependSubdirs($(SUBDIRS))
  888.  
  889.  #if InstallIncludes
  890. -InstallMultipleFlags(pbmplus.h,$(PBMPLUSDIR)$(PBMPLUSINCDIR),$(INSTINCFLAGS))
  891. +    $(INSTALL) -c   $(INSTINCFLAGS)   pbmplus.h  $(PBMPLUSDIR)$(PBMPLUSINCDIR)
  892.  #endif
  893.