From ca20f8bef6374d99a832d32df56cfba688e0bc62 Mon Sep 17 00:00:00 2001 From: bloodstalker Date: Fri, 24 Mar 2017 14:57:16 +0430 Subject: fixed the makefiles --- json/makefile | 72 ++++------------------------------------------------------- 1 file changed, 4 insertions(+), 68 deletions(-) diff --git a/json/makefile b/json/makefile index 998fad1..9f02064 100644 --- a/json/makefile +++ b/json/makefile @@ -1,74 +1,10 @@ -#############################################################VARS############################################################# -CXX?=clang++ -LLVM_CONF?=llvm-config -BUILD_MODE?=COV_NO_CLANG -CXX_FLAGS=$(shell $(LLVM_CONF) --cxxflags) +######################################INCLUDES################################# +include ../macros.mk -ifeq ($(BUILD_MODE), COV_USE) -ifneq ($(CXX), clang++) -$(error This build mode is only useable with clang++.) -endif -EXTRA_CXX_FALGS=-I$(shell $(LLVM_CONF) --src-root)/tools/clang/include -I$(shell $(LLVM_CONF) --obj-root)/tools/clang/include\ - -std=c++11 -stdlib=libstdc++ -UNDEBUG -fprofile-instr-use=code.profdata -fexceptions -EXTRA_LD_FLAGS=-v tinyxml2/tinyxml2.o -fprofile-instr-use=code.profdata -endif +############################################################################### -ifeq ($(BUILD_MODE), COV_GEN) -ifneq ($(CXX), clang++) -$(error This build mode is only useable with clang++.) -endif -EXTRA_CXX_FALGS=-I$(shell $(LLVM_CONF) --src-root)/tools/clang/include -I$(shell $(LLVM_CONF) --obj-root)/tools/clang/include\ - -std=c++11 -UNDEBUG -fprofile-instr-generate -fexceptions -EXTRA_LD_FLAGS=-v tinyxml2/tinyxml2.o -fprofile-instr-generate -endif - -#for gcov compatibility -ifeq ($(BUILD_MODE), COV_GNU) -#ifneq ($(CXX), clang++) -#$(error This build mode is only useable with clang++.) -#endif -EXTRA_CXX_FALGS=-I$(shell $(LLVM_CONF) --src-root)/tools/clang/include -I$(shell $(LLVM_CONF) --obj-root)/tools/clang/include\ - -std=c++11 -stdlib=libstdc++ -UNDEBUG -fprofile-arcs -ftest-coverage -fexceptions -EXTRA_LD_FLAGS=-v tinyxml2/tinyxml2.o -fprofile-arcs -ftest-coverage -endif - -ifeq ($(BUILD_MODE), COV_NO_CLANG) -EXTRA_CXX_FALGS=-I$(shell $(LLVM_CONF) --src-root)/tools/clang/include -I$(shell $(LLVM_CONF) --obj-root)/tools/clang/include\ - -std=c++11 -stdlib=libstdc++ -UNDEBUG -fexceptions -EXTRA_LD_FLAGS=-v tinyxml2/tinyxml2.o -endif - -ifeq ($(BUILD_MODE), COV_NO_CLANG_1Z) -ifeq ($(CXX), g++) -$(error This build mode is only useable with clang++.) -endif -EXTRA_CXX_FALGS=-I$(shell $(LLVM_CONF) --src-root)/tools/clang/include -I$(shell $(LLVM_CONF) --obj-root)/tools/clang/include\ - -std=c++1z -stdlib=libstdc++ -UNDEBUG -fexceptions -EXTRA_LD_FLAGS=-v tinyxml2/tinyxml2.o -endif - -ifeq ($(BUILD_MODE), COV_NO_CLANG_14) -ifeq ($(CXX), g++) -$(error This build mode is only useable with clang++.) -endif -EXTRA_CXX_FALGS=-I$(shell $(LLVM_CONF) --src-root)/tools/clang/include -I$(shell $(LLVM_CONF) --obj-root)/tools/clang/include\ - -std=c++14 -stdlib=libstdc++ -UNDEBUG -fexceptions -EXTRA_LD_FLAGS=-v tinyxml2/tinyxml2.o -endif - -ifeq ($(BUILD_MODE), GNU_MODE) -ifneq ($(CXX), g++) -$(error This build mode is only useable with g++.) -endif -EXTRA_CXX_FALGS=-I$(shell $(LLVM_CONF) --src-root)/tools/clang/include -I$(shell $(LLVM_CONF) --obj-root)/tools/clang/include\ - -std=c++11 -static-libstdc++ -UNDEBUG -fexceptions -EXTRA_LD_FLAGS=-v tinyxml2/tinyxml2.o -endif - -CXX_FLAGS+=$(EXTRA_CXX_FALGS) - -###########################################################RULES############################################################## +####################################RULES###################################### .DEFAULT: json .PHONY: json -- cgit v1.2.3