diff options
Diffstat (limited to 'src/matrixOperations/Makefile.am')
| -rw-r--r-- | src/matrixOperations/Makefile.am | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/src/matrixOperations/Makefile.am b/src/matrixOperations/Makefile.am index 2f57f7fc..1cc9266c 100644 --- a/src/matrixOperations/Makefile.am +++ b/src/matrixOperations/Makefile.am @@ -18,39 +18,42 @@ instdir = $(top_builddir)/lib pkglib_LTLIBRARIES = libMatrixOperations.la libMatrixOperations_la_SOURCES = $(ADDITIONHEAD) $(ADDITIONSRC) \ - $(SUBTRACTIONHEAD) $(SUBTRACTIONSRC) #\ - #$(MULTIPLICATIONHEAD) $(MULTIPLICATIONSRC) #\ + $(SUBTRACTIONHEAD) $(SUBTRACTIONSRC) \ + $(MULTIPLICATIONHEAD) $(MULTIPLICATIONSRC) #\ #$(DIVISIONHEAD) $(DIVISIONSRC) check_PROGRAMS = testMatrixAddition \ - testMatrixSubtraction #\ - #testMatrixDivision #\ - #testMatrixMultiplication + testMatrixSubtraction \ + testMatrixMultiplication #\ + #testMatrixDivision check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la + $(top_builddir)/type/libFloatComplex.la \ + $(top_builddir)/lib/blas/libsciblas.la \ + libMatrixOperations.la check_INCLUDES = -I $(top_builddir)/type \ -I . testMatrixAddition_SOURCES = testMatrixAddition.c -testMatrixAddition_LDADD = $(check_LDADD) libMatrixOperations.la +testMatrixAddition_LDADD = $(check_LDADD) testMatrixAddition_CFLAGS = $(check_INCLUDES) testMatrixSubtraction_SOURCES = testMatrixSubtraction.c -testMatrixSubtraction_LDADD = $(check_LDADD) libMatrixOperations.la +testMatrixSubtraction_LDADD = $(check_LDADD) testMatrixSubtraction_CFLAGS = $(check_INCLUDES) -#testMatrixMultiplication_SOURCES = testMatrixMultiplication.c -#testMatrixMultiplication_LDADD = $(check_LDADD) libMatrixOperations.la +testMatrixMultiplication_SOURCES = testMatrixMultiplication.c +testMatrixMultiplication_LDADD = $(check_LDADD) +testMatrixMultiplication_CFLAGS = $(check_INCLUDES) #testMatrixDivision_SOURCES = testMatrixAddition.c #testMatrixDivision_LDADD = libMatrixOperations.la TESTS = testMatrixAddition \ - testMatrixSubtraction #\ - #testMatrixMultiplication #\ + testMatrixSubtraction \ + testMatrixMultiplication #\ #testMatrixDivision @@ -60,8 +63,8 @@ ADDITIONSRC = matrixAddition.c SUBTRACTIONHEAD = matrixSubtraction.h SUBTRACTIONSRC = matrixSubtraction.c -#MULTIPLICATIONHEAD = matrixMultiplication.h -#MULTIPLICATIONSRC = matrixMultiplication.c +MULTIPLICATIONHEAD = matrixMultiplication.h +MULTIPLICATIONSRC = matrixMultiplication.c #DIVISIONHEAD = matrixDivision.h #DIVISIONSRC = matrixDivision.c |