Moving Addition and Subtraction / Disable Inversion for now

8 files changed, 46 insertions, 28 deletions

diff --git a/src/matrixOperations/Makefile.am b/src/matrixOperations/Makefile.am
index 8a970608..5146be2a 100644
--- a/src/matrixOperations/Makefile.am
+++ b/src/matrixOperations/Makefile.am
@@ -11,16 +11,16 @@
 ##
 
 SUBDIRS= 	addition \
-		subtraction \
-		multiplication \
-		division \
 		cat \
-		transpose \
 		division \
-		trace \
-		hilbert \
 		expm \
-		infiniteNorm \
 		eyes \
-		inversion
+		hilbert \
+		infiniteNorm \
+		multiplication \
+		subtraction \
+		trace \
+		transpose
+
+#		inversion
 
diff --git a/src/matrixOperations/Makefile.in b/src/matrixOperations/Makefile.in
index 7ba8250d..50fc20d3 100644
--- a/src/matrixOperations/Makefile.in
+++ b/src/matrixOperations/Makefile.in
@@ -166,18 +166,16 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = addition \
-		subtraction \
-		multiplication \
-		division \
 		cat \
-		transpose \
 		division \
-		trace \
-		hilbert \
 		expm \
-		infiniteNorm \
 		eyes \
-		inversion
+		hilbert \
+		infiniteNorm \
+		multiplication \
+		subtraction \
+		trace \
+		transpose
 
 all: all-recursive
 
@@ -491,6 +489,8 @@ uninstall-am:
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
 	uninstall uninstall-am
 
+
+#		inversion
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/src/matrixOperations/addition/Makefile.am b/src/matrixOperations/addition/Makefile.am
index 08341b76..a83e23d4 100644
--- a/src/matrixOperations/addition/Makefile.am
+++ b/src/matrixOperations/addition/Makefile.am
@@ -11,7 +11,8 @@
 ##
 
 libMatrixAddition_la_CFLAGS =	-I $(top_builddir)/type \
-				-I $(top_builddir)/matrixOperations/includes
+				-I $(top_builddir)/matrixOperations/includes \
+				-I $(top_builddir)/operations/includes
 
 instdir = $(top_builddir)/lib
 
@@ -29,10 +30,12 @@ check_PROGRAMS = 	testMatrixAddition
 
 check_LDADD =		$(top_builddir)/type/libDoubleComplex.la \
 			$(top_builddir)/type/libFloatComplex.la \
+			$(top_builddir)/operations/addition/libAddition.la \
 			libMatrixAddition.la
 
 check_INCLUDES =	-I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes
+			-I $(top_builddir)/matrixOperations/includes \
+			-I $(top_builddir)/operations/includes
 
 testMatrixAddition_SOURCES = testMatrixAddition.c
 testMatrixAddition_LDADD = $(check_LDADD)
diff --git a/src/matrixOperations/addition/Makefile.in b/src/matrixOperations/addition/Makefile.in
index a5366ebd..4e4d2ac4 100644
--- a/src/matrixOperations/addition/Makefile.in
+++ b/src/matrixOperations/addition/Makefile.in
@@ -200,7 +200,8 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 libMatrixAddition_la_CFLAGS = -I $(top_builddir)/type \
-				-I $(top_builddir)/matrixOperations/includes
+				-I $(top_builddir)/matrixOperations/includes \
+				-I $(top_builddir)/operations/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libMatrixAddition.la
@@ -213,10 +214,12 @@ libMatrixAddition_la_SOURCES = $(HEAD) \
 
 check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
 			$(top_builddir)/type/libFloatComplex.la \
+			$(top_builddir)/operations/addition/libAddition.la \
 			libMatrixAddition.la
 
 check_INCLUDES = -I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes
+			-I $(top_builddir)/matrixOperations/includes \
+			-I $(top_builddir)/operations/includes
 
 testMatrixAddition_SOURCES = testMatrixAddition.c
 testMatrixAddition_LDADD = $(check_LDADD)
diff --git a/src/matrixOperations/multiplication/Makefile.am b/src/matrixOperations/multiplication/Makefile.am
index 0ba9fd5b..2e88893f 100644
--- a/src/matrixOperations/multiplication/Makefile.am
+++ b/src/matrixOperations/multiplication/Makefile.am
@@ -11,7 +11,8 @@
 ##
 
 libMatrixMultiplication_la_CFLAGS =	-I $(top_builddir)/type \
-					-I $(top_builddir)/matrixOperations/includes
+					-I $(top_builddir)/matrixOperations/includes \
+					-I $(top_builddir)/operations/includes
 
 instdir = $(top_builddir)/lib
 
@@ -29,11 +30,13 @@ check_PROGRAMS = 	testMatrixMultiplication
 
 check_LDADD =		$(top_builddir)/type/libDoubleComplex.la \
 			$(top_builddir)/type/libFloatComplex.la \
+			$(top_builddir)/operations/addition/libAddition.la \
 			$(top_builddir)/lib/blas/libsciblas.la \
 			libMatrixMultiplication.la
 
 check_INCLUDES =	-I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes
+			-I $(top_builddir)/matrixOperations/includes \
+			-I $(top_builddir)/operations/includes
 
 testMatrixMultiplication_SOURCES = 	testFloatMatrixMultiplication.c \
 					testDoubleMatrixMultiplication.c
diff --git a/src/matrixOperations/multiplication/Makefile.in b/src/matrixOperations/multiplication/Makefile.in
index 38f9fce4..50ed8661 100644
--- a/src/matrixOperations/multiplication/Makefile.in
+++ b/src/matrixOperations/multiplication/Makefile.in
@@ -204,7 +204,8 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 libMatrixMultiplication_la_CFLAGS = -I $(top_builddir)/type \
-					-I $(top_builddir)/matrixOperations/includes
+					-I $(top_builddir)/matrixOperations/includes \
+					-I $(top_builddir)/operations/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libMatrixMultiplication.la
@@ -217,11 +218,13 @@ libMatrixMultiplication_la_SOURCES = $(HEAD) \
 
 check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
 			$(top_builddir)/type/libFloatComplex.la \
+			$(top_builddir)/operations/addition/libAddition.la \
 			$(top_builddir)/lib/blas/libsciblas.la \
 			libMatrixMultiplication.la
 
 check_INCLUDES = -I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes
+			-I $(top_builddir)/matrixOperations/includes \
+			-I $(top_builddir)/operations/includes
 
 testMatrixMultiplication_SOURCES = testFloatMatrixMultiplication.c \
 					testDoubleMatrixMultiplication.c
diff --git a/src/matrixOperations/subtraction/Makefile.am b/src/matrixOperations/subtraction/Makefile.am
index e86f1d84..56968dad 100644
--- a/src/matrixOperations/subtraction/Makefile.am
+++ b/src/matrixOperations/subtraction/Makefile.am
@@ -11,7 +11,8 @@
 ##
 
 libMatrixSubtraction_la_CFLAGS =	-I $(top_builddir)/type \
-					-I $(top_builddir)/matrixOperations/includes
+					-I $(top_builddir)/matrixOperations/includes \
+					-I $(top_builddir)/operations/includes
 
 instdir = $(top_builddir)/lib
 
@@ -29,10 +30,12 @@ check_PROGRAMS = 	testMatrixSubtraction
 
 check_LDADD =		$(top_builddir)/type/libDoubleComplex.la \
 			$(top_builddir)/type/libFloatComplex.la \
+			$(top_builddir)/operations/subtraction/libSubtraction.la \
 			libMatrixSubtraction.la
 
 check_INCLUDES =	-I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes
+			-I $(top_builddir)/matrixOperations/includes \
+			-I $(top_builddir)/operations/includes
 
 testMatrixSubtraction_SOURCES = testMatrixSubtraction.c
 testMatrixSubtraction_LDADD = $(check_LDADD)
diff --git a/src/matrixOperations/subtraction/Makefile.in b/src/matrixOperations/subtraction/Makefile.in
index 706d9897..61e1dfbe 100644
--- a/src/matrixOperations/subtraction/Makefile.in
+++ b/src/matrixOperations/subtraction/Makefile.in
@@ -203,7 +203,8 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 libMatrixSubtraction_la_CFLAGS = -I $(top_builddir)/type \
-					-I $(top_builddir)/matrixOperations/includes
+					-I $(top_builddir)/matrixOperations/includes \
+					-I $(top_builddir)/operations/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libMatrixSubtraction.la
@@ -216,10 +217,12 @@ libMatrixSubtraction_la_SOURCES = $(HEAD) \
 
 check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
 			$(top_builddir)/type/libFloatComplex.la \
+			$(top_builddir)/operations/subtraction/libSubtraction.la \
 			libMatrixSubtraction.la
 
 check_INCLUDES = -I $(top_builddir)/type \
-			-I $(top_builddir)/matrixOperations/includes
+			-I $(top_builddir)/matrixOperations/includes \
+			-I $(top_builddir)/operations/includes
 
 testMatrixSubtraction_SOURCES = testMatrixSubtraction.c
 testMatrixSubtraction_LDADD = $(check_LDADD)