From 44ee91efd25f0c64e1ef5d932280935f20403512 Mon Sep 17 00:00:00 2001 From: Morgan Deters Date: Mon, 5 Nov 2012 23:21:37 +0000 Subject: [PATCH] fixes for replacement function library --- src/compat/Makefile.am | 9 +++++++-- src/lib/Makefile.am | 8 +++----- src/parser/Makefile.am | 9 +++++++-- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/compat/Makefile.am b/src/compat/Makefile.am index a79301c18..1c2998e94 100644 --- 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 7867a1d4e..a6ea59e95 100644 --- 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 6ef353752..82973b32b 100644 --- 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 \ -- 2.30.2