Remove conditional inclusion of JSIL

Author: peterschrammel

src/cbmc/CMakeLists.txt

@@ -16,6 +16,7 @@ target_link_libraries(cbmc-lib
     goto-instrument-lib
     goto-programs
     goto-symex
+    jsil
     json
     langapi
     linking
@@ -26,7 +27,6 @@ target_link_libraries(cbmc-lib
 )
 
 add_if_library(cbmc-lib bv_refinement)
-add_if_library(cbmc-lib jsil)
 
 # Executable
 add_executable(cbmc cbmc_main.cpp)

src/cbmc/Makefile

@@ -49,7 +49,9 @@ OBJ += ../ansi-c/ansi-c$(LIBEXT) \
       ../assembler/assembler$(LIBEXT) \
       ../solvers/solvers$(LIBEXT) \
       ../util/util$(LIBEXT) \
-      ../json/json$(LIBEXT)
+      ../json/json$(LIBEXT) \
+      ../jsil/jsil$(LIBEXT) \
+      # Empty last line
 
 INCLUDES= -I ..
 
@@ -67,11 +69,6 @@ ifneq ($(wildcard ../bv_refinement/Makefile),)
   CP_CXXFLAGS += -DHAVE_BV_REFINEMENT
 endif
 
-ifneq ($(wildcard ../jsil/Makefile),)
-  OBJ += ../jsil/jsil$(LIBEXT)
-  CP_CXXFLAGS += -DHAVE_JSIL
-endif
-
 ###############################################################################
 
 cbmc$(EXEEXT): $(OBJ)

src/cbmc/cbmc_languages.cpp

@@ -15,17 +15,11 @@ Author: Daniel Kroening, [email protected]
 
 #include <ansi-c/ansi_c_language_info.h>
 #include <cpp/cpp_language_info.h>
-
-#ifdef HAVE_JSIL
 #include <jsil/jsil_language_info.h>
-#endif
 
 void cbmc_parse_optionst::register_languages()
 {
   register_language(new_ansi_c_language_info);
   register_language(new_cpp_language_info);
-
-  #ifdef HAVE_JSIL
   register_language(new_jsil_language_info);
-  #endif
 }

src/goto-analyzer/CMakeLists.txt

@@ -16,13 +16,13 @@ target_link_libraries(goto-analyzer-lib
     analyses
     pointer-analysis
     langapi
+    jsil
     json
     assembler
     util
 )
 
 add_if_library(goto-analyzer-lib java_bytecode)
-add_if_library(goto-analyzer-lib jsil)
 add_if_library(goto-analyzer-lib specc)
 add_if_library(goto-analyzer-lib php)
 

src/goto-analyzer/Makefile

@@ -20,7 +20,9 @@ OBJ += ../ansi-c/ansi-c$(LIBEXT) \
       ../json/json$(LIBEXT) \
       ../assembler/assembler$(LIBEXT) \
       ../util/util$(LIBEXT) \
-      ../miniz/miniz$(OBJEXT)
+      ../miniz/miniz$(OBJEXT) \
+      ../jsil/jsil$(LIBEXT) \
+      # Empty last line
 
 INCLUDES= -I ..
 
@@ -33,11 +35,6 @@ CLEANFILES = goto-analyzer$(EXEEXT)
 
 all: goto-analyzer$(EXEEXT)
 
-ifneq ($(wildcard ../jsil/Makefile),)
-  OBJ += ../jsil/jsil$(LIBEXT)
-  CP_CXXFLAGS += -DHAVE_JSIL
-endif
-
 ###############################################################################
 
 goto-analyzer$(EXEEXT): $(OBJ)

src/goto-cc/Makefile

@@ -28,7 +28,9 @@ OBJ += ../big-int/big-int$(LIBEXT) \
       ../assembler/assembler$(LIBEXT) \
       ../langapi/langapi$(LIBEXT) \
       ../miniz/miniz$(OBJEXT) \
-      ../json/json$(LIBEXT)
+      ../json/json$(LIBEXT) \
+      ../jsil/jsil$(LIBEXT) \
+      # Empty last line
 
 INCLUDES= -I ..
 
@@ -44,11 +46,6 @@ all: goto-cl$(EXEEXT)
 endif
 all: goto-cc$(EXEEXT)
 
-ifneq ($(wildcard ../jsil/Makefile),)
-  OBJ += ../jsil/jsil$(LIBEXT)
-  CP_CXXFLAGS += -DHAVE_JSIL
-endif
-
 ###############################################################################
 
 goto-cc$(EXEEXT): $(OBJ)

src/goto-diff/CMakeLists.txt

@@ -24,7 +24,6 @@ target_link_libraries(goto-diff-lib
 )
 
 add_if_library(goto-diff-lib java_bytecode)
-add_if_library(goto-diff-lib jsil)
 add_if_library(goto-diff-lib php)
 
 # Executable