libpng-pngminus.patch

   1 --- libpng-1.5.7/contrib/pngminus/makefile.std.orig     2011-12-15 16:45:32.000000000 +0100
   2 +++ libpng-1.5.7/contrib/pngminus/makefile.std  2011-12-18 16:24:38.099367091 +0100
   3 @@ -12,20 +12,20 @@
   4  #PNGLIB = -L$(PNGPATH)/lib -lpng15
   5  #PNGLIBS = $(PNGPATH)/lib/libpng15.a
   6  PNGINC = -I../..
   7 -PNGLIB = -L../.. -lpng
   8 +PNGLIB = -L../.. -L../../.libs -lpng15
   9  PNGLIBS = ../../libpng.a
  10
  11  #ZPATH = /usr/local
  12  #ZINC = -I$(ZPATH)/include
  13  #ZLIB = -L$(ZPATH)/lib -lz
  14  #ZLIBS = $(ZPATH)/lib/libz.a
  15 -ZINC = -I../../../zlib
  16 -ZLIB = -L../../../zlib -lz
  17 -ZLIBS = ../../../zlib/libz.a
  18 +ZINC =
  19 +ZLIB = -lz
  20 +ZLIBS = -lz
  21
  22 -CFLAGS=$(PNGINC) $(ZINC)
  23 +CFLAGS=$(OPT_FLAGS) $(PNGINC) $(ZINC)
  24  LDLIBS=$(PNGLIB) $(ZLIB)
  25 -LDLIBSS=$(PNGLIBS) $(ZLIBS)
  26 +LDLIBSS=$(LD_FLAGS) $(PNGLIBS) $(ZLIBS)
  27  C=.c
  28  O=.o
  29  L=.a
  30 @@ -33,8 +33,7 @@
  31
  32  # dependencies
  33
  34 -#all: png2pnm$(E) pnm2png$(E)
  35 -all: png2pnm$(E) pnm2png$(E) png2pnm-static$(E) pnm2png-static$(E)
  36 +all: png2pnm$(E) pnm2png$(E)
  37
  38  png2pnm$(O): png2pnm$(C)
  39         $(CC) -c $(CFLAGS) png2pnm$(C)