Fix makefile

Author: qinheping

src/Makefile

@@ -78,7 +78,8 @@ goto-harness.dir: util.dir goto-programs.dir langapi.dir linking.dir \
                   goto-instrument.dir
 
 goto-instrument.dir: languages goto-programs.dir pointer-analysis.dir \
-                     goto-symex.dir linking.dir analyses.dir solvers.dir
+                     goto-symex.dir linking.dir analyses.dir solvers.dir \
+                     goto-checker.dir
 
 goto-checker.dir: solvers.dir goto-symex.dir goto-programs.dir
 

src/goto-instrument/Makefile

@@ -107,6 +107,7 @@ OBJ += ../ansi-c/ansi-c$(LIBEXT) \
       ../cpp/cpp$(LIBEXT) \
       ../linking/linking$(LIBEXT) \
       ../big-int/big-int$(LIBEXT) \
+      ../goto-checker/goto-checker$(LIBEXT) \
       ../goto-programs/goto-programs$(LIBEXT) \
       ../goto-symex/goto-symex$(LIBEXT) \
       ../assembler/assembler$(LIBEXT) \

src/goto-instrument/synthesizer/cegis_verifier.cpp

@@ -25,17 +25,16 @@ Author: Qinheping Hu
 #include <analyses/dependence_graph.h>
 #include <ansi-c/cprover_library.h>
 #include <assembler/remove_asm.h>
-#include <contracts/contracts.h>
-#include <contracts/utils.h>
 #include <cpp/cprover_library.h>
 #include <goto-checker/all_properties_verifier_with_trace_storage.h>
 #include <goto-checker/multi_path_symex_checker.h>
+#include <goto-instrument/contracts/contracts.h>
+#include <goto-instrument/contracts/utils.h>
+#include <goto-instrument/havoc_utils.h>
 #include <langapi/language_util.h>
 #include <pointer-analysis/add_failed_symbols.h>
 #include <solvers/prop/prop.h>
 
-#include "havoc_utils.h"
-
 static bool contains_symbol_prefix(const exprt &expr, const std::string &prefix)
 {
   if(

src/goto-instrument/synthesizer/synthesizer_utils.cpp

@@ -9,13 +9,11 @@ Author: Qinheping Hu
 #include "synthesizer_utils.h"
 
 #include <analyses/natural_loops.h>
-
-#include "havoc_utils.h"
+#include <goto-instrument/contracts/utils.h>
+#include <goto-instrument/havoc_utils.h>
 
 #include <sstream>
 
-#include "contracts/utils.h"
-
 goto_programt::const_targett get_loop_end_from_loop_head_and_content(
   const goto_programt::const_targett &loop_head,
   const loop_templatet<goto_programt::const_targett> &loop)