Update Makefiles and README to use the default LLVM installation

[boost-statechart-viewer.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index e72b273bef2e91de92e6feab48234c7333cb146d..0c8f7367c9bf31d8f0ee1e5d98f8dce8d8938c4f 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,21 +1,11 @@
--include ../config.local
+-include ../Makefile.config
 
-# Use our version of clang (even without installing)
-LLVM_BIN= $(CURDIR)/../_install/bin
+LLVM_CONFIG ?= llvm-config
 
-LLVM_CONFIG := $(shell $(LLVM_BIN)/llvm-config --cxxflags --ldflags --libs jit core)
+LLVM_FLAGS := $(shell $(LLVM_CONFIG) --cxxflags --ldflags --libs jit core)
 
-visualizer: visualizer.cpp commandlineopt.h stringoper.h
-       g++ $< -o $@ -g -lclangParse -lclangFrontend -lclangSerialization \
-       -lclangDriver -lclangCodeGen -lclangSema -lclangChecker \
+visualizer: visualizer.cpp stringoper.h iooper.h
+       $(CXX) $< -o $@ -g -Wall -lclangParse -lclangFrontend -lclangSerialization \
+       -lclangDriver -lclangCodeGen -lclangSema \
        -lclangAnalysis -lclangRewrite -lclangAST -lclangLex -lclangBasic \
-       $(LLVM_CONFIG)
-
-.PHONY: test
-test: test.pdf
-
-%.dot: %.cpp visualizer
-       ./visualizer $< -o $@
-
-%.pdf: %.dot
-       dot -Tps $< | epstopdf --filter > $@
+       $(LLVM_FLAGS)