Removing the CVC4_NEEDS_REPLACEMENT_FUNCTIONS guard to have a simpler build process.

diff --git a/src/Makefile.am b/src/Makefile.am
index 3f573f55e834e3998621ec550499de4f0eda55f1..fc346ded5fd65cee863ceb059c2b6eb9ac0608d6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -437,10 +437,8 @@ libcvc4_la_LIBADD += \
        @top_builddir@/proofs/signatures/libsignatures.la
 endif
 
-if CVC4_NEEDS_REPLACEMENT_FUNCTIONS
 libcvc4_la_LIBADD += \
        @builddir@/lib/libreplacements.la
-endif
 
 if CVC4_USE_GLPK
 libcvc4_la_LIBADD += $(GLPK_LIBS)

diff --git a/src/compat/Makefile.am b/src/compat/Makefile.am
index ebb13426da21bfda5857944a673070dd1c7157c4..df4603a9a320c0e034cf0d4dd38de66e770a5ca5 100644 (file)
--- a/src/compat/Makefile.am
+++ b/src/compat/Makefile.am
@@ -26,12 +26,8 @@ libcvc4compat_la_LDFLAGS = \
 
 libcvc4compat_la_LIBADD = \
        @builddir@/../libcvc4.la \
-       @builddir@/../parser/libcvc4parser.la
-
-if CVC4_NEEDS_REPLACEMENT_FUNCTIONS
-libcvc4compat_la_LIBADD += \
+       @builddir@/../parser/libcvc4parser.la \
        @builddir@/../lib/libreplacements.la
-endif
 
 libcvc4compat_la_SOURCES = \
        cvc3_compat.h \

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 8d5d6392455dd37923ad22f5d2e60a0448c88555..8db3d664c191955c4aaec2197b36165edecb3058 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -4,11 +4,10 @@ AM_CPPFLAGS = \
 AM_CFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
 AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN)
 
-if CVC4_NEEDS_REPLACEMENT_FUNCTIONS
 noinst_LTLIBRARIES = libreplacements.la
-endif
 
 libreplacements_la_SOURCES =
+
 libreplacements_la_LIBADD = \
        $(LTLIBOBJS)
 

diff --git a/src/main/Makefile.am b/src/main/Makefile.am
index 478d3f3eea893f02bd8266f7ddba03e468481c6c..372e817f6116b7f5d6b0ff1f5b2ceb62234c25fd 100644 (file)
--- a/src/main/Makefile.am
+++ b/src/main/Makefile.am
@@ -30,11 +30,9 @@ pcvc4_LDADD = \
        libmain.a \
        @builddir@/../parser/libcvc4parser.la \
        @builddir@/../libcvc4.la \
-       $(READLINE_LIBS)
-if CVC4_NEEDS_REPLACEMENT_FUNCTIONS
-pcvc4_LDADD += \
+       $(READLINE_LIBS) \
        @builddir@/../lib/libreplacements.la
-endif
+
 pcvc4_CPPFLAGS = $(AM_CPPFLAGS) $(BOOST_CPPFLAGS) -DPORTFOLIO_BUILD
 pcvc4_LDADD += $(BOOST_THREAD_LIBS)
 pcvc4_LDADD += $(BOOST_THREAD_LDFLAGS)
@@ -54,11 +52,8 @@ cvc4_LDADD = \
        libmain.a \
        @builddir@/../parser/libcvc4parser.la \
        @builddir@/../libcvc4.la \
-       $(READLINE_LIBS)
-if CVC4_NEEDS_REPLACEMENT_FUNCTIONS
-cvc4_LDADD += \
+       $(READLINE_LIBS) \
        @builddir@/../lib/libreplacements.la
-endif
 
 BUILT_SOURCES = \
        $(TOKENS_FILES)

diff --git a/src/parser/Makefile.am b/src/parser/Makefile.am
index 18e77fab3ee8b3ab4b9dffe2387870d83e90c8eb..ca10de6840d1bd08ee9ebe21e772ac11bac2d11f 100644 (file)
--- a/src/parser/Makefile.am
+++ b/src/parser/Makefile.am
@@ -29,12 +29,8 @@ libcvc4parser_la_LIBADD = \
        @builddir@/smt2/libparsersmt2.la \
        @builddir@/tptp/libparsertptp.la \
        @builddir@/cvc/libparsercvc.la \
-       @builddir@/../libcvc4.la
-
-if CVC4_NEEDS_REPLACEMENT_FUNCTIONS
-libcvc4parser_la_LIBADD += \
+       @builddir@/../libcvc4.la \
        @builddir@/../lib/libreplacements.la
-endif
 
 libcvc4parser_la_SOURCES = \
        antlr_input.cpp \