]>
Commit | Line | Data |
---|---|---|
8f478a75 JB |
1 | --- libpng-1.2.10/contrib/pngminus/makefile.std.orig 2006-04-23 20:45:35.000000000 +0200 |
2 | +++ libpng-1.2.10/contrib/pngminus/makefile.std 2006-05-20 00:07:36.332062500 +0200 | |
3 | @@ -12,20 +12,20 @@ | |
4 | #PNGLIB = -L$(PNGPATH)/lib -lpng12 | |
5 | #PNGLIBS = $(PNGPATH)/lib/libpng12.a | |
6 | PNGINC = -I../.. | |
7 | -PNGLIB = -L../.. -lpng | |
8 | +PNGLIB = -L../.. -L../../.libs -lpng | |
9 | PNGLIBS = ../../libpng.a | |
10 | ||
11 | #ZPATH = /usr/local | |
4fff5d48 AM |
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 | |
05423455 | 21 | |
4fff5d48 AM |
22 | -CFLAGS=-O3 $(PNGINC) $(ZINC) |
23 | +CFLAGS=$(OPT_FLAGS) $(PNGINC) $(ZINC) | |
24 | LDFLAGS=$(PNGLIB) $(ZLIB) | |
25 | -LDFLAGSS=$(PNGLIBS) $(ZLIBS) | |
26 | +LDFLAGSS=$(LD_FLAGS) $(PNGLIBS) $(ZLIBS) | |
05423455 | 27 | C=.c |
28 | O=.o | |
29 | L=.a | |
e904b066 PS |
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) |