Fix up Makefiles, and fix include issues compiling with gcc

2016-09-01 18:26:19 -07:00
parent b1a3ab1804
commit 7df55e17e9
5 changed files with 13 additions and 13 deletions
@@ -24,10 +24,10 @@ GTEST_LIB ?= -L $(PZSTDDIR)/googletest/build/googlemock/gtest

 CPPFLAGS = -I$(PZSTDDIR) $(GTEST_INC) $(GTEST_LIB) -I$(ZSTDDIR)/common -I$(PROGDIR)

-CFLAGS  ?= -O3
-CFLAGS  += -std=c++11
-CFLAGS  += $(MOREFLAGS)
-FLAGS    = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
+CXXFLAGS  ?= -O3
+CXXFLAGS  += -std=c++11
+CXXFLAGS  += $(MOREFLAGS)
+FLAGS    = $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)

 datagen.o: $(PROGDIR)/datagen.*
 	$(CXX) $(FLAGS) $(PROGDIR)/datagen.c -c -o $@