]>
Commit | Line | Data |
---|---|---|
e940033e JB |
1 | --- libpng-1.6.37/contrib/pngminus/Makefile~ 2019-04-14 20:10:32.000000000 +0200 |
2 | +++ libpng-1.6.37/contrib/pngminus/Makefile 2019-04-23 09:25:47.422459927 +0200 | |
3 | @@ -8,7 +8,7 @@ | |
4 | RM = rm -f | |
5 | ||
b300377a | 6 | PNGINC = -I../.. |
e940033e JB |
7 | -PNGLIB_SHARED = -L../.. -lpng |
8 | +PNGLIB_SHARED = -L../.. -L../../.libs/ -lpng16 | |
9 | PNGLIB_STATIC = ../../libpng.a | |
10 | ||
11 | # Uncomment the following if you have a custom zlib build at ../../../zlib | |
12 | @@ -20,10 +20,10 @@ | |
13 | ZLIB_SHARED = -lz | |
14 | ZLIB_STATIC = -lz | |
b300377a | 15 | |
e940033e JB |
16 | -CPPFLAGS = $(PNGINC) $(ZINC) |
17 | +CPPFLAGS = $(OPT_FLAGS) $(PNGINC) $(ZINC) | |
18 | CFLAGS = | |
19 | LDFLAGS = | |
20 | -LIBS_SHARED = $(PNGLIB_SHARED) $(ZLIB_SHARED) | |
21 | +LIBS_SHARED = $(LD_FLAGS) $(PNGLIB_SHARED) $(ZLIB_SHARED) | |
22 | LIBS_STATIC = $(PNGLIB_STATIC) $(ZLIB_STATIC) | |
7b0709ed | 23 | |
e940033e JB |
24 | EXEEXT = |
25 | @@ -31,7 +31,7 @@ | |
b62c16f1 PS |
26 | |
27 | # dependencies | |
28 | ||
e940033e JB |
29 | -all: png2pnm$(EXEEXT) pnm2png$(EXEEXT) png2pnm-static$(EXEEXT) pnm2png-static$(EXEEXT) |
30 | +all: png2pnm$(EXEEXT) pnm2png$(EXEEXT) | |
b62c16f1 | 31 | |
e940033e JB |
32 | png2pnm.o: png2pnm.c |
33 | $(CC) -c $(CPPFLAGS) $(CFLAGS) png2pnm.c |