summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjofret2008-05-30 12:27:49 +0000
committerjofret2008-05-30 12:27:49 +0000
commit0fe7ddaef21065cbc7b2563dab0586c9f4b97ca7 (patch)
treebb85785c33157c3c0b82a1d82f938ad03ba46bf0 /src
parentbce36a4569db3eb9ffc61faa6ed4fe6c53181d7f (diff)
downloadscilab2c-0fe7ddaef21065cbc7b2563dab0586c9f4b97ca7.tar.gz
scilab2c-0fe7ddaef21065cbc7b2563dab0586c9f4b97ca7.tar.bz2
scilab2c-0fe7ddaef21065cbc7b2563dab0586c9f4b97ca7.zip
Correct sqrt dependancies
Diffstat (limited to 'src')
-rw-r--r--src/auxiliaryFunctions/abs/Makefile.am8
-rw-r--r--src/auxiliaryFunctions/abs/Makefile.in12
2 files changed, 13 insertions, 7 deletions
diff --git a/src/auxiliaryFunctions/abs/Makefile.am b/src/auxiliaryFunctions/abs/Makefile.am
index 60291ad5..8ec99220 100644
--- a/src/auxiliaryFunctions/abs/Makefile.am
+++ b/src/auxiliaryFunctions/abs/Makefile.am
@@ -10,9 +10,9 @@
##
##
-libAbs_la_CFLAGS = -I ../../type \
- -I ../includes \
- -I ../../elementaryFunctions/includes
+libAbs_la_CFLAGS = -I $(top_builddir)/type \
+ -I $(top_builddir)/auxiliaryFunctions/includes \
+ -I $(top_builddir)/elementaryFunctions/includes
instdir = $(top_builddir)/lib
@@ -41,8 +41,10 @@ check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \
check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
$(top_builddir)/type/libFloatComplex.la \
+ $(top_builddir)/lib/lapack/libscilapack.la \
$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
+ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
@LIBMATH@
check_PROGRAMS = testFloatAbs testDoubleAbs
diff --git a/src/auxiliaryFunctions/abs/Makefile.in b/src/auxiliaryFunctions/abs/Makefile.in
index bef46b98..74732836 100644
--- a/src/auxiliaryFunctions/abs/Makefile.in
+++ b/src/auxiliaryFunctions/abs/Makefile.in
@@ -66,8 +66,10 @@ am_testDoubleAbs_OBJECTS = testDoubleAbs-testDoubleAbs.$(OBJEXT)
testDoubleAbs_OBJECTS = $(am_testDoubleAbs_OBJECTS)
am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \
$(top_builddir)/type/libFloatComplex.la \
+ $(top_builddir)/lib/lapack/libscilapack.la \
$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
- $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la
+ $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
+ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la
testDoubleAbs_DEPENDENCIES = $(am__DEPENDENCIES_1)
testDoubleAbs_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleAbs_CFLAGS) \
@@ -207,9 +209,9 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-libAbs_la_CFLAGS = -I ../../type \
- -I ../includes \
- -I ../../elementaryFunctions/includes
+libAbs_la_CFLAGS = -I $(top_builddir)/type \
+ -I $(top_builddir)/auxiliaryFunctions/includes \
+ -I $(top_builddir)/elementaryFunctions/includes
instdir = $(top_builddir)/lib
pkglib_LTLIBRARIES = libAbs.la
@@ -234,8 +236,10 @@ check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \
check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
$(top_builddir)/type/libFloatComplex.la \
+ $(top_builddir)/lib/lapack/libscilapack.la \
$(top_builddir)/auxiliaryFunctions/abs/libAbs.la \
$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
+ $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
@LIBMATH@