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
4 #PNGLIB = -L$(PNGPATH)/lib -lpng15
5 #PNGLIBS = $(PNGPATH)/lib/libpng15.a
7 -PNGLIB = -L../.. -lpng
8 +PNGLIB = -L../.. -L../../.libs -lpng15
9 PNGLIBS = ../../libpng.a
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
22 -CFLAGS=$(PNGINC) $(ZINC)
23 +CFLAGS=$(OPT_FLAGS) $(PNGINC) $(ZINC)
24 LDLIBS=$(PNGLIB) $(ZLIB)
25 -LDLIBSS=$(PNGLIBS) $(ZLIBS)
26 +LDLIBSS=$(LD_FLAGS) $(PNGLIBS) $(ZLIBS)
34 -#all: png2pnm$(E) pnm2png$(E)
35 -all: png2pnm$(E) pnm2png$(E) png2pnm-static$(E) pnm2png-static$(E)
36 +all: png2pnm$(E) pnm2png$(E)
38 png2pnm$(O): png2pnm$(C)
39 $(CC) -c $(CFLAGS) png2pnm$(C)