Move function body generation to goto instrument directory

Author: danpoe

src/goto-instrument/Makefile

@@ -35,6 +35,7 @@ SRC = accelerate/accelerate.cpp \
       full_slicer.cpp \
       function.cpp \
       function_modifies.cpp \
+      generate_function_bodies.cpp \
       goto_instrument_languages.cpp \
       goto_instrument_main.cpp \
       goto_instrument_parse_options.cpp \

src/goto-programs/generate_function_bodies.cpp renamed to src/goto-instrument/generate_function_bodies.cpp

@@ -12,14 +12,13 @@ Author: Diffblue Ltd.
 #include <ansi-c/c_object_factory_parameters.h>
 
 #include <goto-programs/goto_convert.h>
+#include <goto-programs/remove_skip.h>
 
 #include <util/arith_tools.h>
 #include <util/format_expr.h>
 #include <util/make_unique.h>
 #include <util/string_utils.h>
 
-#include "remove_skip.h"
-
 void generate_function_bodiest::generate_function_body(
   goto_functiont &function,
   symbol_tablet &symbol_table,

src/goto-programs/generate_function_bodies.h renamed to src/goto-instrument/generate_function_bodies.h

@@ -27,8 +27,8 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include <analyses/goto_check.h>
 
-#include <goto-programs/generate_function_bodies.h>
 #include "aggressive_slicer.h"
+#include "generate_function_bodies.h"
 
 #include "count_eloc.h"
 

src/goto-instrument/goto_instrument_parse_options.h

@@ -6,7 +6,6 @@ SRC = adjust_float_expressions.cpp \
       destructor.cpp \
       elf_reader.cpp \
       format_strings.cpp \
-      generate_function_bodies.cpp \
       goto_asm.cpp \
       goto_clean_expr.cpp \
       goto_convert.cpp \