use ordered shim and CLI opts from Verdi repo

Author: palmskog

extraction/aggregation-dynamic/Makefile

@@ -1,21 +1,23 @@
 PYTHON=python2.7
 
-OCAMLBUILD = ocamlbuild -package uuidm -lib str -lib unix -I ocaml -cflag -g
-OCAMLBUILD_TEST = ocamlbuild -package uuidm -package oUnit -lib str -I ocaml -I test -cflag -g
+OCAMLBUILD = ocamlbuild -package uuidm -lib str -lib unix -I ocaml -I lib -cflag -g
+OCAMLBUILD_TEST = ocamlbuild -package uuidm -package oUnit -lib str -I ocaml -I test -I lib -cflag -g
+
+LIB = lib/OrderedShim.ml lib/Util.ml lib/Opts.ml
 
 AGGREGATION = ocaml/TreeAggregation.ml ocaml/TreeAggregation.mli \
  ocaml/TreeAggregationArrangement.ml ocaml/TreeAggregationMain.ml \
- ocaml/Serialization.ml ocaml/Opts.ml ocaml/OrderedShim.ml ocaml/Util.ml
+ ocaml/Serialization.ml
 
 AGGREGATION_TEST = test/SerializationTest.ml test/OptsTest.ml \
 test/TreeAggregationTest.ml test/TestCommon.ml
 
 default: TreeAggregationMain.native
 
-TreeAggregationMain.native: $(AGGREGATION)
+TreeAggregationMain.native: $(LIB) $(AGGREGATION)
 	$(OCAMLBUILD) TreeAggregationMain.native
 
-TreeAggregationTest.native: $(AGGREGATION) $(AGGREGATION_TEST)
+TreeAggregationTest.native: $(LIB) $(AGGREGATION) $(AGGREGATION_TEST)
 	$(OCAMLBUILD_TEST) TreeAggregationTest.native
 
 test-units: TreeAggregationTest.native