comparison: netpbm/netpbm.patch
netpbm/netpbm.patch
- changeset 733
- 0db5307f7f51
- parent 54
- f012bbb2a542
equal
deleted
inserted
replaced
| 0:9d52e54d9a37 | 1:b7b41392f98a |
|---|---|
| 60 -static __inline__ float | 60 -static __inline__ float |
| 61 +static float | 61 +static float |
| 62 pm_ungamma709(float const brightness) { | 62 pm_ungamma709(float const brightness) { |
| 63 | 63 |
| 64 /* These are the same parameters as in pm_gamma, above */ | 64 /* These are the same parameters as in pm_gamma, above */ |
| 65 Index: converter/other/Makefile | |
| 66 --- converter/other/Makefile.orig 2005-02-05 18:48:28.000000000 +0100 | |
| 67 +++ converter/other/Makefile 2009-01-09 00:54:13.704466003 +0100 | |
| 68 @@ -111,29 +111,29 @@ | |
| 69 endif | |
| 70 | |
| 71 tifftopnm pnmtotiff pnmtotiffcmyk: %: %.o $(NETPBMLIB) $(LIBOPT) | |
| 72 - $(LD) $(LDFLAGS) -o $@ $@.o \ | |
| 73 + $(LD) -o $@ $@.o \ | |
| 74 `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(TIFFLIB) $(TIFFLIB_EXTRALIBS)` \ | |
| 75 - $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) | |
| 76 + $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) | |
| 77 | |
| 78 pngtopnm: %: %.o $(NETPBMLIB) $(LIBOPT) | |
| 79 - $(LD) $(LDFLAGS) -o $@ $@.o \ | |
| 80 + $(LD) -o $@ $@.o \ | |
| 81 `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(PNGLIB) $(ZLIB)` \ | |
| 82 - $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) | |
| 83 + $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) | |
| 84 | |
| 85 pnmtopng: %: %.o pngtxt.o $(NETPBMLIB) $(LIBOPT) | |
| 86 - $(LD) $(LDFLAGS) -o $@ $@.o pngtxt.o \ | |
| 87 + $(LD) -o $@ $@.o pngtxt.o \ | |
| 88 `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(PNGLIB) $(ZLIB)` \ | |
| 89 - $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) | |
| 90 + $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) | |
| 91 | |
| 92 jpegtopnm: %: %.o jpegdatasource.o exif.o $(NETPBMLIB) $(LIBOPT) | |
| 93 - $(LD) $(LDFLAGS) -o $@ $< jpegdatasource.o exif.o \ | |
| 94 + $(LD) -o $@ $< jpegdatasource.o exif.o \ | |
| 95 `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(JPEGLIB)` \ | |
| 96 - $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) | |
| 97 + $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) | |
| 98 | |
| 99 pnmtojpeg: %: %.o $(NETPBMLIB) $(LIBOPT) | |
| 100 - $(LD) $(LDFLAGS) -o $@ $@.o \ | |
| 101 + $(LD) -o $@ $@.o \ | |
| 102 `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(JPEGLIB)` \ | |
| 103 - $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) | |
| 104 + $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) | |
| 105 | |
| 106 # If URTLIB is BUNDLED_URTLIB, then we're responsible for building it, which | |
| 107 # means it needs to be a dependency: | |
| 108 @@ -142,13 +142,13 @@ | |
| 109 endif | |
| 110 | |
| 111 rletopnm pnmtorle: %: %.o $(NETPBMLIB) $(URTLIBDEP) $(LIBOPT) | |
| 112 - $(LD) $(LDFLAGS) -o $@ $@.o \ | |
| 113 - `$(LIBOPT) $(NETPBMLIB) $(URTLIB)` $(MATHLIB) $(LDLIBS) \ | |
| 114 + $(LD) -o $@ $@.o \ | |
| 115 + `$(LIBOPT) $(NETPBMLIB) $(URTLIB)` $(LDFLAGS) $(MATHLIB) $(LDLIBS) \ | |
| 116 $(RPATH) $(LADD) | |
| 117 | |
| 118 pnmtorast rasttopnm: %: %.o rast.o $(NETPBMLIB) $(LIBOPT) | |
| 119 - $(LD) $(LDFLAGS) -o $@ $@.o rast.o \ | |
| 120 - `$(LIBOPT) $(NETPBMLIB)` $(MATHLIB) $(LDLIBS) \ | |
| 121 + $(LD) -o $@ $@.o rast.o \ | |
| 122 + `$(LIBOPT) $(NETPBMLIB)` $(LDFLAGS) $(MATHLIB) $(LDLIBS) \ | |
| 123 $(RPATH) $(LADD) | |
| 124 | |
| 125 install.bin: install.bin.local |
