summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjofret2008-05-30 12:31:46 +0000
committerjofret2008-05-30 12:31:46 +0000
commite64a14b7a032e77c53c337829ad010b7b50cc29b (patch)
tree86d9017fc644de402daa10b36f391b8225167780 /src
parent35161122685c2f8a41d4ddfec6862b349b6b33e3 (diff)
downloadscilab2c-e64a14b7a032e77c53c337829ad010b7b50cc29b.tar.gz
scilab2c-e64a14b7a032e77c53c337829ad010b7b50cc29b.tar.bz2
scilab2c-e64a14b7a032e77c53c337829ad010b7b50cc29b.zip
Correct sqrt dependancies
Diffstat (limited to 'src')
-rw-r--r--src/auxiliaryFunctions/pythag/Makefile.am9
-rw-r--r--src/auxiliaryFunctions/pythag/Makefile.in14
2 files changed, 16 insertions, 7 deletions
diff --git a/src/auxiliaryFunctions/pythag/Makefile.am b/src/auxiliaryFunctions/pythag/Makefile.am
index 01b84e4c..2fa58ebe 100644
--- a/src/auxiliaryFunctions/pythag/Makefile.am
+++ b/src/auxiliaryFunctions/pythag/Makefile.am
@@ -10,9 +10,9 @@
##
##
-libPythag_la_CFLAGS = -I ../../type \
- -I ../includes \
- -I ../../elementaryFunctions/includes
+libPythag_la_CFLAGS = -I $(top_builddir)/type \
+ -I $(top_builddir)/auxiliaryFunctions/includes \
+ -I $(top_builddir)/elementaryFunctions/includes
instdir = $(top_builddir)/lib
@@ -45,6 +45,9 @@ testPythag_SOURCES = testPythag.c
testPythag_CFLAGS = $(check_INCLUDES)
testPythag_LDADD = $(top_builddir)/type/libFloatComplex.la \
$(top_builddir)/type/libDoubleComplex.la \
+ $(top_builddir)/lib/lapack/libscilapack.la \
$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
+ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
+ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
@LIBMATH@
diff --git a/src/auxiliaryFunctions/pythag/Makefile.in b/src/auxiliaryFunctions/pythag/Makefile.in
index 9a4dcda2..e31a2f92 100644
--- a/src/auxiliaryFunctions/pythag/Makefile.in
+++ b/src/auxiliaryFunctions/pythag/Makefile.in
@@ -65,8 +65,11 @@ am_testPythag_OBJECTS = testPythag-testPythag.$(OBJEXT)
testPythag_OBJECTS = $(am_testPythag_OBJECTS)
testPythag_DEPENDENCIES = $(top_builddir)/type/libFloatComplex.la \
$(top_builddir)/type/libDoubleComplex.la \
+ $(top_builddir)/lib/lapack/libscilapack.la \
$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
- $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la
+ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
+ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
+ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la
testPythag_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(testPythag_CFLAGS) \
$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -197,9 +200,9 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-libPythag_la_CFLAGS = -I ../../type \
- -I ../includes \
- -I ../../elementaryFunctions/includes
+libPythag_la_CFLAGS = -I $(top_builddir)/type \
+ -I $(top_builddir)/auxiliaryFunctions/includes \
+ -I $(top_builddir)/elementaryFunctions/includes
instdir = $(top_builddir)/lib
pkglib_LTLIBRARIES = libPythag.la
@@ -225,8 +228,11 @@ testPythag_SOURCES = testPythag.c
testPythag_CFLAGS = $(check_INCLUDES)
testPythag_LDADD = $(top_builddir)/type/libFloatComplex.la \
$(top_builddir)/type/libDoubleComplex.la \
+ $(top_builddir)/lib/lapack/libscilapack.la \
$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
+ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
+ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
@LIBMATH@
all: all-am