Skip to content

HAVE_BV_REFINEMENT and HAVE_JAVA_BYTECODE are no longer needed #1318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 1, 2017
Merged

HAVE_BV_REFINEMENT and HAVE_JAVA_BYTECODE are no longer needed #1318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions src/clobber/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ SRC = clobber_main.cpp \
# Empty last line
OBJ += ../ansi-c/ansi-c$(LIBEXT) \
../cpp/cpp$(LIBEXT) \
../java_bytecode/java_bytecode$(LIBEXT) \
../linking/linking$(LIBEXT) \
../big-int/big-int$(LIBEXT) \
../goto-programs/goto-programs$(LIBEXT) \
Expand Down Expand Up @@ -30,16 +31,6 @@ CLEANFILES = clobber$(EXEEXT)

all: clobber$(EXEEXT)

ifneq ($(wildcard ../bv_refinement/Makefile),)
OBJ += ../bv_refinement/bv_refinement$(LIBEXT)
CP_CXXFLAGS += -DHAVE_BV_REFINEMENT
endif

ifneq ($(wildcard ../java_bytecode/Makefile),)
OBJ += ../java_bytecode/java_bytecode$(LIBEXT)
CP_CXXFLAGS += -DHAVE_JAVA_BYTECODE
endif

ifneq ($(wildcard ../specc/Makefile),)
OBJ += ../specc/specc$(LIBEXT)
CP_CXXFLAGS += -DHAVE_SPECC
Expand Down
6 changes: 1 addition & 5 deletions src/goto-diff/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ SRC = change_impact.cpp \

OBJ += ../ansi-c/ansi-c$(LIBEXT) \
../cpp/cpp$(LIBEXT) \
../java_bytecode/java_bytecode$(LIBEXT) \
../linking/linking$(LIBEXT) \
../big-int/big-int$(LIBEXT) \
../goto-programs/goto-programs$(LIBEXT) \
Expand All @@ -33,11 +34,6 @@ CLEANFILES = goto-diff$(EXEEXT)

all: goto-diff$(EXEEXT)

ifneq ($(wildcard ../java_bytecode/Makefile),)
OBJ += ../java_bytecode/java_bytecode$(LIBEXT)
CP_CXXFLAGS += -DHAVE_JAVA_BYTECODE
endif

ifneq ($(wildcard ../specc/Makefile),)
OBJ += ../specc/specc$(LIBEXT)
CP_CXXFLAGS += -DHAVE_SPECC
Expand Down
4 changes: 0 additions & 4 deletions src/goto-diff/goto_diff_languages.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ Author: Daniel Kroening, [email protected]
#include <specc/specc_language.h>
#endif

#ifdef HAVE_JAVA_BYTECODE
#include <java_bytecode/java_bytecode_language.h>
#endif

void goto_diff_languagest::register_languages()
{
Expand All @@ -33,7 +31,5 @@ void goto_diff_languagest::register_languages()
register_language(new_specc_language);
#endif

#ifdef HAVE_JAVA_BYTECODE
register_language(new_java_bytecode_language);
#endif
}
6 changes: 1 addition & 5 deletions src/goto-instrument/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ SRC = accelerate/accelerate.cpp \

OBJ += ../ansi-c/ansi-c$(LIBEXT) \
../cpp/cpp$(LIBEXT) \
../java_bytecode/java_bytecode$(LIBEXT) \
../linking/linking$(LIBEXT) \
../big-int/big-int$(LIBEXT) \
../goto-programs/goto-programs$(LIBEXT) \
Expand All @@ -90,11 +91,6 @@ include ../common

all: goto-instrument$(EXEEXT)

ifneq ($(wildcard ../java_bytecode/Makefile),)
OBJ += ../java_bytecode/java_bytecode$(LIBEXT)
CP_CXXFLAGS += -DHAVE_JAVA_BYTECODE
endif

ifneq ($(LIB_GLPK),)
LIBS += $(LIB_GLPK)
CP_CXXFLAGS += -DHAVE_GLPK
Expand Down
11 changes: 1 addition & 10 deletions src/symex/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ SRC = path_search.cpp \

OBJ += ../ansi-c/ansi-c$(LIBEXT) \
../cpp/cpp$(LIBEXT) \
../java_bytecode/java_bytecode$(LIBEXT) \
../linking/linking$(LIBEXT) \
../big-int/big-int$(LIBEXT) \
../goto-programs/goto-programs$(LIBEXT) \
Expand Down Expand Up @@ -34,16 +35,6 @@ CLEANFILES = symex$(EXEEXT)

all: symex$(EXEEXT)

ifneq ($(wildcard ../bv_refinement/Makefile),)
OBJ += ../bv_refinement/bv_refinement$(LIBEXT)
CP_CXXFLAGS += -DHAVE_BV_REFINEMENT
endif

ifneq ($(wildcard ../java_bytecode/Makefile),)
OBJ += ../java_bytecode/java_bytecode$(LIBEXT)
CP_CXXFLAGS += -DHAVE_JAVA_BYTECODE
endif

ifneq ($(wildcard ../specc/Makefile),)
OBJ += ../specc/specc$(LIBEXT)
CP_CXXFLAGS += -DHAVE_SPECC
Expand Down