1From 6245f18091cad11520c159248c1cf7a84f12857c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 5 Apr 2017 13:15:43 -0700
4Subject: [PATCH] make: Respect variables from environement
5
6link with shared zlib
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 Makefile.unx | 18 ++++++++----------
11 1 file changed, 8 insertions(+), 10 deletions(-)
12
13diff --git a/Makefile.unx b/Makefile.unx
14index 772da46..4ae7061 100644
15--- a/Makefile.unx
16+++ b/Makefile.unx
17@@ -24,18 +24,16 @@ ZINC = -I$(ZPATH)
18 ZLIB = $(ZPATH)/libz.a
19
20 INCS = $(ZINC)
21-LIBS = $(ZLIB)
22+LIBS = -lz
23
24-CC = gcc
25-LD = gcc
26-RM = rm
27-CFLAGS = -O -Wall $(INCS) -DUSE_ZLIB
28+CC ?= gcc
29+LD ?= gcc
30+RM ?= rm
31+CFLAGS += -O -Wall $(INCS) -DUSE_ZLIB
32 # [note that -Wall is a gcc-specific compilation flag ("all warnings on")]
33 O = .o
34 E =
35
36-LDFLAGS =
37-
38 PROG = pngcheck
39 PROG2 = pngsplit
40 PROG3 = png-fix-IDAT-windowsize
41@@ -57,13 +55,13 @@ EXES = $(PROG)$(E) $(PROG2)$(E) $(PROG3)$(E)
42 all:  $(EXES)
43
44 $(PROG)$(E): $(PROG).c
45-	$(CC) $(CFLAGS) -o $@ $(PROG).c $(LIBS)
46+	$(CC) $(CFLAGS) -o $@ $(PROG).c $(LDFLAGS) $(LIBS)
47
48 $(PROG2)$(E): gpl/$(PROG2).c
49-	$(CC) $(CFLAGS) -o $@ gpl/$(PROG2).c $(LIBS)
50+	$(CC) $(CFLAGS) -o $@ gpl/$(PROG2).c $(LDFLAGS) $(LIBS)
51
52 $(PROG3)$(E): gpl/$(PROG3).c
53-	$(CC) $(CFLAGS) -o $@ gpl/$(PROG3).c $(LIBS)
54+	$(CC) $(CFLAGS) -o $@ gpl/$(PROG3).c $(LDFLAGS) $(LIBS)
55
56
57 # maintenance ---------------------------------------------------------------
58--
592.12.2
60
61