From d43acba8455e7f34dc897a6210757e8ee20baa61 Mon Sep 17 00:00:00 2001 From: jofret Date: Tue, 9 Sep 2008 12:29:14 +0000 Subject: Addition and Subtraction / svn:ignore property change --- src/matrixOperations/expm/Makefile.am | 21 +++++++++++++-------- src/matrixOperations/expm/Makefile.in | 20 ++++++++++++-------- 2 files changed, 25 insertions(+), 16 deletions(-) (limited to 'src/matrixOperations') diff --git a/src/matrixOperations/expm/Makefile.am b/src/matrixOperations/expm/Makefile.am index 985c50d4..b42fec16 100644 --- a/src/matrixOperations/expm/Makefile.am +++ b/src/matrixOperations/expm/Makefile.am @@ -12,9 +12,10 @@ libMatrixExponential_la_CFLAGS = -I $(top_builddir)/type \ -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/includes \ - -I $(top_builddir)/elementaryFunctions/includes + -I $(top_builddir)/auxiliaryFunctions/includes \ + -I $(top_builddir)/includes \ + -I $(top_builddir)/elementaryFunctions/includes \ + -I $(top_builddir)/operations/includes instdir = $(top_builddir)/lib @@ -26,13 +27,15 @@ libMatrixExponential_la_SOURCES = $(HEAD) \ dexpma.c \ zexpma.c \ sexpma.c \ - cexpma.c + cexpma.c check_PROGRAMS = testMatrixExponential check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/type/libFloatComplex.la \ + $(top_builddir)/operations/addition/libAddition.la \ + $(top_builddir)/operations/subtraction/libSubtraction.la \ $(top_builddir)/matrixOperations/division/libMatrixDivision.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/sign/libSign.la \ @@ -62,10 +65,12 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ libMatrixExponential.la check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/includes \ - -I $(top_builddir)/elementaryFunctions/includes + -I $(top_builddir)/matrixOperations/includes \ + -I $(top_builddir)/auxiliaryFunctions/includes \ + -I $(top_builddir)/includes \ + -I $(top_builddir)/elementaryFunctions/includes \ + -I $(top_builddir)/operations/includes + testMatrixExponential_SOURCES = testMatrixExponential.c testMatrixExponential_LDADD = $(check_LDADD) diff --git a/src/matrixOperations/expm/Makefile.in b/src/matrixOperations/expm/Makefile.in index 08c1ba60..08e45b1f 100644 --- a/src/matrixOperations/expm/Makefile.in +++ b/src/matrixOperations/expm/Makefile.in @@ -204,9 +204,10 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ libMatrixExponential_la_CFLAGS = -I $(top_builddir)/type \ -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/includes \ - -I $(top_builddir)/elementaryFunctions/includes + -I $(top_builddir)/auxiliaryFunctions/includes \ + -I $(top_builddir)/includes \ + -I $(top_builddir)/elementaryFunctions/includes \ + -I $(top_builddir)/operations/includes instdir = $(top_builddir)/lib pkglib_LTLIBRARIES = libMatrixExponential.la @@ -215,10 +216,12 @@ libMatrixExponential_la_SOURCES = $(HEAD) \ dexpma.c \ zexpma.c \ sexpma.c \ - cexpma.c + cexpma.c check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/type/libFloatComplex.la \ + $(top_builddir)/operations/addition/libAddition.la \ + $(top_builddir)/operations/subtraction/libSubtraction.la \ $(top_builddir)/matrixOperations/division/libMatrixDivision.la \ $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ $(top_builddir)/auxiliaryFunctions/sign/libSign.la \ @@ -248,10 +251,11 @@ check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ libMatrixExponential.la check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/includes \ - -I $(top_builddir)/elementaryFunctions/includes + -I $(top_builddir)/matrixOperations/includes \ + -I $(top_builddir)/auxiliaryFunctions/includes \ + -I $(top_builddir)/includes \ + -I $(top_builddir)/elementaryFunctions/includes \ + -I $(top_builddir)/operations/includes testMatrixExponential_SOURCES = testMatrixExponential.c testMatrixExponential_LDADD = $(check_LDADD) -- cgit