fixes for replacement function library

diff --git a/src/compat/Makefile.am b/src/compat/Makefile.am
index a79301c18372deea9668fe673cfa36bb7ece93f9..1c2998e94e52ad4f8493d395ef4afe007bf75d0c 100644 (file)
--- a/src/compat/Makefile.am
+++ b/src/compat/Makefile.am
@@ -29,14 +29,19 @@ libcvc4compat_la_LDFLAGS = \
 libcvc4compat_noinst_la_LDFLAGS =
 
 libcvc4compat_la_LIBADD = \
-       @builddir@/../lib/libreplacements.la \
        -L@builddir@/.. -lcvc4 \
        -L@builddir@/../parser -lcvc4parser
 libcvc4compat_noinst_la_LIBADD = \
-       @builddir@/../lib/libreplacements.la \
        -L@builddir@/.. -lcvc4 \
        -L@builddir@/../parser -lcvc4parser
 
+if CVC4_NEEDS_REPLACEMENT_FUNCTIONS
+libcvc4compat_la_LIBADD += \
+       @builddir@/../lib/libreplacements.la
+libcvc4compat_noinst_la_LIBADD += \
+       @builddir@/../lib/libreplacements.la
+endif
+
 libcvc4compat_la_SOURCES = \
        cvc3_compat.h \
        cvc3_compat.cpp

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 7867a1d4efc6a480c8449a5015dd631e96ccd1d7..a6ea59e95467a5ea0c8a399e41c1e57230064f7c 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -4,9 +4,11 @@ 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 = empty.c
+libreplacements_la_SOURCES =
 libreplacements_la_LIBADD = \
        $(LTLIBOBJS)
 
@@ -15,7 +17,3 @@ EXTRA_DIST = \
        clock_gettime.c \
        clock_gettime.h
 
-CLEANFILES = empty.c
-
-# empty.c hack -- need *some* source file so that library make rules are built
-empty.c:; touch empty.c

diff --git a/src/parser/Makefile.am b/src/parser/Makefile.am
index 6ef35375223c104562e31de637927b863dbb5a7e..82973b32ba2ff4b44cd765e9f2ef8d7b3e5e791f 100644 (file)
--- a/src/parser/Makefile.am
+++ b/src/parser/Makefile.am
@@ -33,16 +33,21 @@ libcvc4parser_la_LIBADD = \
        @builddir@/smt2/libparsersmt2.la \
        @builddir@/tptp/libparsertptp.la \
        @builddir@/cvc/libparsercvc.la \
-       @builddir@/../lib/libreplacements.la \
        -L@builddir@/.. -lcvc4
 libcvc4parser_noinst_la_LIBADD = \
        @builddir@/smt1/libparsersmt1.la \
        @builddir@/smt2/libparsersmt2.la \
        @builddir@/tptp/libparsertptp.la \
        @builddir@/cvc/libparsercvc.la \
-       @builddir@/../lib/libreplacements.la \
        @builddir@/../libcvc4_noinst.la
 
+if CVC4_NEEDS_REPLACEMENT_FUNCTIONS
+libcvc4parser_la_LIBADD += \
+       @builddir@/../lib/libreplacements.la
+libcvc4parser_noinst_la_LIBADD += \
+       @builddir@/../lib/libreplacements.la
+endif
+
 libcvc4parser_la_SOURCES = \
        antlr_input.h \
        antlr_input.cpp \