Merge pull request #27 from fantazio/fix_path

Stop relying on the cmti paths to find the corresponding source files

Author: nojb

.gitignore

@@ -17,6 +17,7 @@
 *.o
 *.opt
 *.out
+*.install
 _build
 _opam
 

Makefile

@@ -1,7 +1,7 @@
-.PHONY: clean examples check
+.PHONY: clean examples check dca
 
-all:
-	dune build
+dca:
+	dune build dead_code_analyzer.install
 
 check:
 	make -C check

check/Makefile

@@ -1,3 +1,4 @@
+.PHONY: clean prepare threshold-3-0.5 threshold-1 internal classic opt
 
 TARGET=res.out
 EXT=byt
@@ -16,20 +17,24 @@ all: aggregate.$(EXT)$(EXE)
 opt:
 	make EXT=opt
 
-internal: prepare check.$(EXT)$(EXE)
-	../_build/install/default/bin/dead_code_analyzer -A --internal ../examples > $(TARGET)
-	./src/check.$(EXT)$(EXE) ./internal $(TARGET)
-
 classic: prepare check.$(EXT)$(EXE)
-	../_build/install/default/bin/dead_code_analyzer -A ../examples > $(TARGET)
+	make -C ../examples run_dca DEADFLAGS="-A" \
+		| tail -n +2 | sed '$$d' > $(TARGET)
 	./src/check.$(EXT)$(EXE) ./classic $(TARGET)
 
+internal: prepare check.$(EXT)$(EXE)
+	make -C ../examples run_dca DEADFLAGS="-A --internal" \
+		| tail -n +2 | sed '$$d' > $(TARGET)
+	./src/check.$(EXT)$(EXE) ./internal $(TARGET)
+
 threshold-1: prepare check.$(EXT)$(EXE)
-	../_build/install/default/bin/dead_code_analyzer -A --internal -E threshold:1 -M threshold:1 -T threshold:1 ../examples > $(TARGET)
+	make -C ../examples run_dca DEADFLAGS="-A --internal -E threshold:1 -M threshold:1 -T threshold:1" \
+		| tail -n +2 | sed '$$d' > $(TARGET)
 	./src/check.$(EXT)$(EXE) ./threshold-1 $(TARGET)
 
 threshold-3-0.5: prepare check.$(EXT)$(EXE)
-	../_build/install/default/bin/dead_code_analyzer -A --internal -E threshold:3 -Oa both:3,0.5 -On both:3,0.5 -M threshold:3 -T threshold:3 ../examples > $(TARGET)
+	make -C ../examples run_dca DEADFLAGS="-A --internal -E threshold:3 -Oa both:3,0.5 -On both:3,0.5 -M threshold:3 -T threshold:3" \
+		| tail -n +2 | sed '$$d' > $(TARGET)
 	./src/check.$(EXT)$(EXE) ./threshold-3-0.5 $(TARGET)
 
 prepare: