projects / packages / libpng.git / blame
| Commit | Line | Data |
|---|---|---|
| 8a4e3b5c JB |
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 | |
| bd3c1796 | 3 | @@ -12,21 +12,21 @@ |
| d81fa4a7 JB |
4 | #PNGLIB = -L$(PNGPATH)/lib -lpng16 |
| 5 | #PNGLIBS = $(PNGPATH)/lib/libpng16.a | |
| 8f478a75 JB |
6 | PNGINC = -I../.. |
| 7 | -PNGLIB = -L../.. -lpng | |
| d81fa4a7 | 8 | +PNGLIB = -L../.. -L../../.libs -lpng16 |
| 8f478a75 JB |
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 | |
| 8a4e3b5c | 18 | +ZINC = |
| 4fff5d48 AM |
19 | +ZLIB = -lz |
| 20 | +ZLIBS = -lz | |
| 05423455 | 21 | |
| bd3c1796 JR |
22 | -CPPFLAGS=$(PNGINC) $(ZINC) |
| 23 | +CPPFLAGS=$(OPT_FLAGS) $(PNGINC) $(ZINC) | |
| 24 | CFLAGS= | |
| 8a4e3b5c JB |
25 | LDLIBS=$(PNGLIB) $(ZLIB) |
| 26 | -LDLIBSS=$(PNGLIBS) $(ZLIBS) | |
| 27 | +LDLIBSS=$(LD_FLAGS) $(PNGLIBS) $(ZLIBS) | |
| 05423455 | 28 | C=.c |
| 29 | O=.o | |
| 30 | L=.a | |
| e904b066 PS |
31 | @@ -33,8 +33,7 @@ |
| 32 | ||
| 33 | # dependencies | |
| 34 | ||
| 35 | -#all: png2pnm$(E) pnm2png$(E) | |
| 36 | -all: png2pnm$(E) pnm2png$(E) png2pnm-static$(E) pnm2png-static$(E) | |
| 37 | +all: png2pnm$(E) pnm2png$(E) | |
| 38 | ||
| 39 | png2pnm$(O): png2pnm$(C) | |
| 40 | $(CC) -c $(CFLAGS) png2pnm$(C) |