From: Nick Terrell Date: Fri, 28 Oct 2016 21:24:15 +0000 (-0700) Subject: [pzstd] Move -I flags to PZSTD_CPPFLAGS X-Git-Tag: v1.1.1~5^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F434%2Fhead;p=thirdparty%2Fzstd.git [pzstd] Move -I flags to PZSTD_CPPFLAGS --- diff --git a/contrib/pzstd/Makefile b/contrib/pzstd/Makefile index 4f63887d3..2de50416c 100644 --- a/contrib/pzstd/Makefile +++ b/contrib/pzstd/Makefile @@ -24,16 +24,18 @@ TESTFLAGS ?= DEPFLAGS = -MMD -MP -MF $*.Td POSTCOMPILE = mv -f $*.Td $*.d -# CFLAGS, CXXFLAGS, and LDFLAGS are for the users to override +# CFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS are for the users to override CFLAGS ?= -O3 -Wall -Wextra CXXFLAGS ?= -O3 -Wall -Wextra -pedantic -std=c++11 +CPPFLAGS ?= LDFLAGS ?= -# Googletest default flags +# Include flags PZSTD_INC = -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(PROGDIR) -I. GTEST_INC = -isystem googletest/googletest/include -PZSTD_CCXXFLAGS = $(PZSTD_INC) $(GTEST_INC) +PZSTD_CPPFLAGS = $(PZSTD_INC) $(GTEST_INC) +PZSTD_CCXXFLAGS = PZSTD_CFLAGS = $(PZSTD_CCXXFLAGS) PZSTD_CXXFLAGS = $(PZSTD_CCXXFLAGS) PZSTD_LDFLAGS =