From c98e47a0c148103da65955acfb3782e37a8fc4c3 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Wed, 26 Mar 2008 05:57:19 +0000
Subject: Fix shared linking regression

---
 src/graph/view2D/Makefile.in    | 5 ++---
 src/graph/view3D/Makefile.in    | 6 +++---
 src/graph/viewAlone/Makefile.in | 6 +++---
 src/graph/viewman/Makefile.in   | 6 +++---
 4 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'src/graph')

diff --git a/src/graph/view2D/Makefile.in b/src/graph/view2D/Makefile.in
index e64ad57b..477ca263 100644
--- a/src/graph/view2D/Makefile.in
+++ b/src/graph/view2D/Makefile.in
@@ -37,7 +37,7 @@ LINC=	$(axiom_src_srcdir)/graph/include
 # global include files shared by everyone
 GINC=	$(axiom_src_srcdir)/include
 
-build_libdir = $(abs_top_builddir)/src/lib
+build_libdir = $(top_builddir)/src/lib
 
 bin_PROGRAMS = view2D$(EXEEXT)
 
@@ -48,8 +48,7 @@ view2D_objects = $(view2D_SOURCES:.c=.lo)
 
 Gfun_objects = ../Gdraws/Gfun.lo
 
-view2D_LDADD = $(axiom_target_libdir)/libspad.la \
-		$(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT)
+view2D_LDADD = $(build_libdir)/libspad.la -L$(build_libdir) -lopen-axiom-core
 
 view2D_DEPENDENCIES = $(Gfun_objects)
 
diff --git a/src/graph/view3D/Makefile.in b/src/graph/view3D/Makefile.in
index 897c17c9..d8c4fe79 100644
--- a/src/graph/view3D/Makefile.in
+++ b/src/graph/view3D/Makefile.in
@@ -41,7 +41,7 @@ GINC=	$(axiom_src_srcdir)/include
 # bitmaps for cursors
 BIT=	$(axiom_src_srcdir)/graph/include/purty
 
-build_libdir = $(abs_top_builddir)/src/lib
+build_libdir = $(top_builddir)/src/lib
 
 bin_PROGRAMS = view3D$(EXEEXT)
 
@@ -57,8 +57,8 @@ view3D_objects = $(addprefix $(builddir)/, $(view3D_SOURCES:.c=.lo))
 Gfun_objects = ../Gdraws/Gfun.lo
 
 
-view3D_LDADD = $(axiom_target_libdir)/libspad.la \
-		$(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT)
+view3D_LDADD = $(build_libdir)/libspad.la \
+		-L$(build_libdir) -lopen-axiom-core
 view3D_DEPENDENCIES = $(Gfun_objects)
 
 subdir = src/graph/view3D/
diff --git a/src/graph/viewAlone/Makefile.in b/src/graph/viewAlone/Makefile.in
index 6f679cbe..707f4507 100644
--- a/src/graph/viewAlone/Makefile.in
+++ b/src/graph/viewAlone/Makefile.in
@@ -36,7 +36,7 @@ LINC=	$(axiom_src_srcdir)/graph/include
 # global include files shared by everyone
 GINC=	$(axiom_src_srcdir)/include
 
-build_libdir = $(abs_top_builddir)/src/lib
+build_libdir = $(top_builddir)/src/lib
 
 bin_PROGRAMS = viewAlone$(EXEEXT)
 
@@ -44,8 +44,8 @@ viewAlone_SOURCES = viewAlone.c spoonComp.c spoon2D.c
 
 viewAlone_objects = $(viewAlone_SOURCES:.c=.lo)
 
-viewAlone_LDADD = $(axiom_target_libdir)/libspad.la \
-		$(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT)
+viewAlone_LDADD = $(build_libdir)/libspad.la \
+		-L$(build_libdir) -lopen-axiom-core
 viewAlone_DEPENDENCIES =
 
 subdir = src/graph/viewAlone/
diff --git a/src/graph/viewman/Makefile.in b/src/graph/viewman/Makefile.in
index 2a6f8ac2..9f096bdd 100644
--- a/src/graph/viewman/Makefile.in
+++ b/src/graph/viewman/Makefile.in
@@ -36,7 +36,7 @@ LINC=	$(axiom_src_srcdir)/graph/include
 # global include files shared by everyone 
 GINC=	$(axiom_src_srcdir)/include
 
-build_libdir = $(abs_top_builddir)/src/lib
+build_libdir = $(top_builddir)/src/lib
 
 bin_PROGRAMS = viewman$(EXEEXT)
 
@@ -53,8 +53,8 @@ viewman_headers = $(srcdir)/viewman.h \
 
 
 viewman_DEPENDENCIES =
-viewman_LDFLAGS = $(axiom_target_libdir)/libspad.la \
-		$(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT)
+viewman_LDFLAGS = $(build_libdir)/libspad.la \
+		-L$(build_libdir) -lopen-axiom-core
 
 subdir = src/graph/viewman/
 
-- 
cgit v1.2.3