Adapt llvm_json trace_adapter Makefile

Make it similar to the trace32 trace_adapter.

Author: Jugst3r

tools/gnatcov/Makefile

@@ -105,7 +105,7 @@ include architecture.mk
 
 ifeq ($(HOST_OS), windows)
 ifeq ($(BITS_ARCH), 32)
-DEFAULT_ADAPTERS = trace32
+DEFAULT_ADAPTERS = trace32 llvm_json
 else
 DEFAULT_ADAPTERS =
 endif
@@ -115,11 +115,11 @@ ifeq ($(HOST_OS), linux)
 ifeq ($(BITS_ARCH), 32)
 DEFAULT_ADAPTERS =
 else
-DEFAULT_ADAPTERS = trace32
+DEFAULT_ADAPTERS = trace32 llvm_json
 endif
 endif
 
-ADAPTERS_LIST=$(DEFAULT_ADAPTERS)
+ADAPTERS_LIST ?= $(DEFAULT_ADAPTERS)
 
 PROCESSORS=0
 BUILD_MODE=dev
@@ -128,8 +128,9 @@ BUILD_MODE=dev
 # == Variables to pass down to sub-makefiles for trace adapters ==
 # ================================================================
 
-# The Trace32 adapter use the same prefix as GNATcov
+# The trace adapters use the same prefix as GNATcov
 trace32_ADAPTER_INSTALL_VARS=PREFIX=$(PREFIX)
+llvm_json_ADAPTER_INSTALL_VARS=PREFIX=$(PREFIX)
 
 .PHONY: default all adapters bin $(PGMPATH)
 

tools/gnatcov/trace_adapters/llvm_json/Makefile

@@ -1,35 +1,50 @@
+PREFIX=install
+PARALLEL_BUILD=0
+include ../../host.mk
+
 LLVM_CXXFLAGS := $(shell llvm-config --cxxflags)
 LLVM_LDFLAGS := $(shell llvm-config --ldflags)
 LLVM_LIBS := $(shell llvm-config --libs --system-libs)
 
-# Set this to the right path for you.
+# Set this to the right path for you
 LIBSTD_PATH := "$(dir $(shell which gnat))../lib64/"
 
+EXENAME=gnatcov_llvm_exporter
+DIRNAME=gnatcoverage
+
 GPRBUILD_FLAGS := \
-			-cargs:c++ ${LLVM_CXXFLAGS} -g \
+			-cargs:c++ $(LLVM_CXXFLAGS) -g \
 			-largs \
 				--verbose \
 				-fuse-ld=lld \
-				-L ${LIBSTD_PATH} \
-				${LLVM_LDFLAGS} \
-				${LLVM_LIBS}
+				-L $(LIBSTD_PATH) \
+				$(LLVM_LDFLAGS) \
+				$(LLVM_LIBS)
+
+.PHONY: force
 
-gprbuild:
-	@gprbuild -v ${GPRBUILD_FLAGS}
+bin: force
+	gprbuild -j$(PARALLEL_BUILD) $(GPRBUILD_FLAGS)
 
 cmake:
 	mkdir -p build
 	cmake \
 		-B build \
 		-DCMAKE_C_COMPILER=clang \
 		-DCMAKE_CXX_COMPILER=clang++ \
-		-DCMAKE_CXX_FLAGS="${LLVM_CXXFLAGS}" \
-		-DCMAKE_EXE_LINKER_FLAGS="-L ${LIBSTD_PATH}"
+		-DCMAKE_CXX_FLAGS="$(LLVM_CXXFLAGS)" \
+		-DCMAKE_EXE_LINKER_FLAGS="-L $(LIBSTD_PATH)"
 	cd build && make
 
 .PHONY: clean
 
 clean:
 	gprclean
-	${RM} -rf obj
-	${RM} -rf build
+	$(RM) -rf obj
+	$(RM) -rf build
+
+.PHONY: install
+
+install:
+	$(MKDIR) $(PREFIX)/libexec/$(DIRNAME)
+	$(CP) $(EXENAME) $(PREFIX)/libexec/$(DIRNAME)

tools/gnatcov/trace_adapters/llvm_json/gnatcov_llvm_exporter.gpr

@@ -1,10 +1,13 @@
 project GNATcov_LLVM_exporter is
 
     for Languages use ("C++");
-
     for Source_Dirs use ("src");
     for Main use ("main.cpp");
-
     for Object_Dir use "obj";
+    for Exec_Dir use ".";
+
+    package Builder is
+       for Executable ("main.cpp") use "gnatcov_llvm_exporter";
+    end Builder;
 
 end GNATcov_LLVM_exporter;