From 35e40fdadd220663259bdb4f1a9ddcf043b7294b Mon Sep 17 00:00:00 2001
From: Morgan Deters <mdeters@cs.nyu.edu>
Date: Tue, 5 Aug 2014 20:47:36 -0400
Subject: [PATCH] First crack at fixing double-linking issues in build system.

---
 src/bindings/Makefile.am             | 32 ++++++++++++++--------------
 src/bindings/compat/c/Makefile.am    |  4 ++--
 src/bindings/compat/java/Makefile.am |  4 ++--
 src/compat/Makefile.am               |  4 ++--
 src/parser/Makefile.am               |  2 +-
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/bindings/Makefile.am b/src/bindings/Makefile.am
index 2214d9b88..e7548bbe1 100644
--- a/src/bindings/Makefile.am
+++ b/src/bindings/Makefile.am
@@ -63,8 +63,8 @@ java_libcvc4jni_la_LDFLAGS = \
 	-shrext $(CVC4_JAVA_MODULE_EXT) \
 	-version-info $(LIBCVC4BINDINGS_VERSION)
 java_libcvc4jni_la_LIBADD = \
-	-L@builddir@/.. -lcvc4 \
-	-L@builddir@/../parser -lcvc4parser
+	@builddir@/../libcvc4.la \
+	@builddir@/../parser/libcvc4parser.la
 endif
 if CVC4_LANGUAGE_BINDING_CSHARP
 csharplib_LTLIBRARIES += csharp/CVC4.la
@@ -72,8 +72,8 @@ csharp_CVC4_la_LDFLAGS = \
 	-module \
 	-version-info $(LIBCVC4BINDINGS_VERSION)
 csharp_CVC4_la_LIBADD = \
-	-L@builddir@/.. -lcvc4 \
-	-L@builddir@/../parser -lcvc4parser
+	@builddir@/../libcvc4.la \
+	@builddir@/../parser/libcvc4parser.la
 endif
 if CVC4_LANGUAGE_BINDING_PERL
 perllib_LTLIBRARIES += perl/CVC4.la
@@ -81,8 +81,8 @@ perl_CVC4_la_LDFLAGS = \
 	-module \
 	-version-info $(LIBCVC4BINDINGS_VERSION)
 perl_CVC4_la_LIBADD = \
-	-L@builddir@/.. -lcvc4 \
-	-L@builddir@/../parser -lcvc4parser
+	@builddir@/../libcvc4.la \
+	@builddir@/../parser/libcvc4parser.la
 perldata_DATA += perl/CVC4.pm
 endif
 if CVC4_LANGUAGE_BINDING_PHP
@@ -91,8 +91,8 @@ php_CVC4_la_LDFLAGS = \
 	-module \
 	-version-info $(LIBCVC4BINDINGS_VERSION)
 php_CVC4_la_LIBADD = \
-	-L@builddir@/.. -lcvc4 \
-	-L@builddir@/../parser -lcvc4parser
+	@builddir@/../libcvc4.la \
+	@builddir@/../parser/libcvc4parser.la
 phpdata_DATA += php/CVC4.php
 endif
 if CVC4_LANGUAGE_BINDING_PYTHON
@@ -102,8 +102,8 @@ python_CVC4_la_LDFLAGS = \
 	-module \
 	-version-info $(LIBCVC4BINDINGS_VERSION)
 python_CVC4_la_LIBADD = \
-	-L@builddir@/.. -lcvc4 \
-	-L@builddir@/../parser -lcvc4parser
+	@builddir@/../libcvc4.la \
+	@builddir@/../parser/libcvc4parser.la
 pythondata_DATA += python/CVC4.py
 endif
 if CVC4_LANGUAGE_BINDING_OCAML
@@ -117,8 +117,8 @@ ocaml_CVC4_la_LDFLAGS = \
 	-module \
 	-version-info $(LIBCVC4BINDINGS_VERSION)
 ocaml_CVC4_la_LIBADD = \
-	-L@builddir@/.. -lcvc4 \
-	-L@builddir@/../parser -lcvc4parser
+	@builddir@/../libcvc4.la \
+	@builddir@/../parser/libcvc4parser.la
 endif
 if CVC4_LANGUAGE_BINDING_RUBY
 rubylib_LTLIBRARIES += ruby/CVC4.la
@@ -126,8 +126,8 @@ ruby_CVC4_la_LDFLAGS = \
 	-module \
 	-version-info $(LIBCVC4BINDINGS_VERSION)
 ruby_CVC4_la_LIBADD = \
-	-L@builddir@/.. -lcvc4 \
-	-L@builddir@/../parser -lcvc4parser
+	@builddir@/../libcvc4.la \
+	@builddir@/../parser/libcvc4parser.la
 endif
 if CVC4_LANGUAGE_BINDING_TCL
 tcllib_LTLIBRARIES += tcl/CVC4.la
@@ -135,8 +135,8 @@ tcl_CVC4_la_LDFLAGS = \
 	-module \
 	-version-info $(LIBCVC4BINDINGS_VERSION)
 tcl_CVC4_la_LIBADD = \
-	-L@builddir@/.. -lcvc4 \
-	-L@builddir@/../parser -lcvc4parser
+	@builddir@/../libcvc4.la \
+	@builddir@/../parser/libcvc4parser.la
 endif
 # this endif matches the "if CVC4_HAS_SWIG" above
 endif
diff --git a/src/bindings/compat/c/Makefile.am b/src/bindings/compat/c/Makefile.am
index 5a788f2bf..4ec4626c6 100644
--- a/src/bindings/compat/c/Makefile.am
+++ b/src/bindings/compat/c/Makefile.am
@@ -25,8 +25,8 @@ lib_LTLIBRARIES += libcvc4bindings_c_compat.la
 libcvc4bindings_c_compat_la_LDFLAGS = \
 	-version-info $(LIBCVC4BINDINGS_VERSION)
 libcvc4bindings_c_compat_la_LIBADD = \
-	-L@builddir@/../../../compat -lcvc4compat \
-	-L@builddir@/../../.. -lcvc4
+	@builddir@/../../../compat/libcvc4compat.la \
+	@builddir@/../../../libcvc4.la
 
 endif
 
diff --git a/src/bindings/compat/java/Makefile.am b/src/bindings/compat/java/Makefile.am
index 9eb985822..5b052568d 100644
--- a/src/bindings/compat/java/Makefile.am
+++ b/src/bindings/compat/java/Makefile.am
@@ -33,8 +33,8 @@ libcvc4compatjni_la_LDFLAGS = \
 	-shrext $(CVC4_JAVA_MODULE_EXT) \
 	-version-info $(LIBCVC4BINDINGS_VERSION)
 libcvc4compatjni_la_LIBADD = \
-	-L@builddir@/../../../compat -lcvc4compat \
-	-L@builddir@/../../.. -lcvc4
+	@builddir@/../../../compat/libcvc4compat.la \
+	@builddir@/../../../libcvc4.la
 BUILT_SOURCES += $(JNI_CPP_FILES)
 
 endif
diff --git a/src/compat/Makefile.am b/src/compat/Makefile.am
index 5a8bd454e..ebb13426d 100644
--- a/src/compat/Makefile.am
+++ b/src/compat/Makefile.am
@@ -25,8 +25,8 @@ libcvc4compat_la_LDFLAGS = \
 	-version-info $(LIBCVC4COMPAT_VERSION)
 
 libcvc4compat_la_LIBADD = \
-	-L@builddir@/.. -lcvc4 \
-	-L@builddir@/../parser -lcvc4parser
+	@builddir@/../libcvc4.la \
+	@builddir@/../parser/libcvc4parser.la
 
 if CVC4_NEEDS_REPLACEMENT_FUNCTIONS
 libcvc4compat_la_LIBADD += \
diff --git a/src/parser/Makefile.am b/src/parser/Makefile.am
index a178f8dd5..c8a8cc941 100644
--- a/src/parser/Makefile.am
+++ b/src/parser/Makefile.am
@@ -29,7 +29,7 @@ libcvc4parser_la_LIBADD = \
 	@builddir@/smt2/libparsersmt2.la \
 	@builddir@/tptp/libparsertptp.la \
 	@builddir@/cvc/libparsercvc.la \
-	-L@builddir@/.. -lcvc4
+	@builddir@/../libcvc4.la
 
 if CVC4_NEEDS_REPLACEMENT_FUNCTIONS
 libcvc4parser_la_LIBADD += \
-- 
2.30.2