From 788a52c399f4731ac1fb27a49db48626f3e140e1 Mon Sep 17 00:00:00 2001 From: anthraxx Date: Tue, 2 Apr 2019 14:53:28 +0200 Subject: [PATCH] respect existence of distro CFLAGS and CPPFLAGS - append CFLAGS instead of set to honor default distro CFLAGS - add CPPFLAGS that are defined by distros --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e4ded69..7fef84a 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ # OFLAGS = -O0 -g OFLAGS = -O2 -CFLAGS = -std=gnu99 -fPIC -Wall -Wno-format-truncation $(OFLAGS) +CFLAGS += -std=gnu99 -fPIC -Wall -Wno-format-truncation $(OFLAGS) SHELL = /bin/sh TAR = tar @@ -68,17 +68,17 @@ all: libgif.so libgif.a libutil.so libutil.a $(UTILS) ifeq ($(UNAME), Darwin) $(CC) $(CFLAGS) -dynamiclib -current_version $(LIBVER) $(OBJECTS) -o $(LIBGIFSO) else - $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBGIFSOMAJOR) -o $(LIBGIFSO) $(OBJECTS) + $(CC) $(CFLAGS) $(CPPFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBGIFSOMAJOR) -o $(LIBGIFSO) $(OBJECTS) endif libgif.a: $(OBJECTS) $(HEADERS) $(AR) rcs libgif.a $(OBJECTS) $(LIBUTILSO): $(UOBJECTS) $(UHEADERS) ifeq ($(UNAME), Darwin) $(CC) $(CFLAGS) -dynamiclib -current_version $(LIBVER) $(OBJECTS) -o $(LIBUTILSO) else - $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBUTILMAJOR) -o $(LIBUTILSO) $(UOBJECTS) + $(CC) $(CFLAGS) $(CPPFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBUTILMAJOR) -o $(LIBUTILSO) $(UOBJECTS) endif libutil.a: $(UOBJECTS) $(UHEADERS) -- 2.21.0