diff options
Diffstat (limited to 'src')
31 files changed, 628 insertions, 628 deletions
diff --git a/src/c/operations/Makefile.in b/src/c/operations/Makefile.in index a6d3a0c8..deaeaea6 100644 --- a/src/c/operations/Makefile.in +++ b/src/c/operations/Makefile.in @@ -31,7 +31,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = operations +subdir = src/c/operations DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -191,9 +191,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign operations/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/operations/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign operations/Makefile + $(AUTOMAKE) --foreign src/c/operations/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/c/operations/addition/Makefile.am b/src/c/operations/addition/Makefile.am index bbb06064..147b9050 100644 --- a/src/c/operations/addition/Makefile.am +++ b/src/c/operations/addition/Makefile.am @@ -10,8 +10,8 @@ ## ## -libAddition_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/operations/includes +libAddition_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/operations/includes instdir = $(top_builddir)/lib diff --git a/src/c/operations/addition/Makefile.in b/src/c/operations/addition/Makefile.in index 9ef44902..9cd19335 100644 --- a/src/c/operations/addition/Makefile.in +++ b/src/c/operations/addition/Makefile.in @@ -34,7 +34,7 @@ build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = testAddition$(EXEEXT) TESTS = testAddition$(EXEEXT) -subdir = operations/addition +subdir = src/c/operations/addition DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -204,8 +204,8 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -libAddition_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/operations/includes +libAddition_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/operations/includes instdir = $(top_builddir)/lib pkglib_LTLIBRARIES = libAddition.la @@ -243,9 +243,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign operations/addition/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/operations/addition/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign operations/addition/Makefile + $(AUTOMAKE) --foreign src/c/operations/addition/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/c/operations/division/Makefile.am b/src/c/operations/division/Makefile.am index 85db8691..20cae2f5 100644 --- a/src/c/operations/division/Makefile.am +++ b/src/c/operations/division/Makefile.am @@ -10,9 +10,9 @@ ## ## -libDivision_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/operations/includes +libDivision_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/operations/includes instdir = $(top_builddir)/lib @@ -41,24 +41,24 @@ libDivision_la_SOURCES = $(HEAD) \ check_PROGRAMS = testLDivision \ testRDivision -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la \ - $(top_builddir)/auxiliaryFunctions/conj/libConj.la \ +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ + $(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \ libDivision.la -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/operations/includes +check_INCLUDES = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/operations/includes -testLDivision_SOURCES = testLDivision.c +testLDivision_SOURCES = testLDivision.c testLDivision_LDADD = $(check_LDADD) testLDivision_CFLAGS = $(check_INCLUDES) -testRDivision_SOURCES = testRDivision.c +testRDivision_SOURCES = testRDivision.c testRDivision_LDADD = $(check_LDADD) testRDivision_CFLAGS = $(check_INCLUDES) TESTS = testLDivision \ - testRDivision + testRDivision diff --git a/src/c/operations/division/Makefile.in b/src/c/operations/division/Makefile.in index 3d8653c8..e9e34b1a 100644 --- a/src/c/operations/division/Makefile.in +++ b/src/c/operations/division/Makefile.in @@ -34,7 +34,7 @@ build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = testLDivision$(EXEEXT) testRDivision$(EXEEXT) TESTS = testLDivision$(EXEEXT) testRDivision$(EXEEXT) -subdir = operations/division +subdir = src/c/operations/division DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -216,9 +216,9 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -libDivision_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/operations/includes +libDivision_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/operations/includes instdir = $(top_builddir)/lib pkglib_LTLIBRARIES = libDivision.la @@ -241,19 +241,19 @@ libDivision_la_SOURCES = $(HEAD) \ cldiva.c \ zldiva.c -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la \ - $(top_builddir)/auxiliaryFunctions/conj/libConj.la \ +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ + $(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \ libDivision.la -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/operations/includes +check_INCLUDES = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/operations/includes -testLDivision_SOURCES = testLDivision.c +testLDivision_SOURCES = testLDivision.c testLDivision_LDADD = $(check_LDADD) testLDivision_CFLAGS = $(check_INCLUDES) -testRDivision_SOURCES = testRDivision.c +testRDivision_SOURCES = testRDivision.c testRDivision_LDADD = $(check_LDADD) testRDivision_CFLAGS = $(check_INCLUDES) all: all-am @@ -269,9 +269,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign operations/division/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/operations/division/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign operations/division/Makefile + $(AUTOMAKE) --foreign src/c/operations/division/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/c/operations/multiplication/Makefile.am b/src/c/operations/multiplication/Makefile.am index 30ceba9d..8bdcfd82 100644 --- a/src/c/operations/multiplication/Makefile.am +++ b/src/c/operations/multiplication/Makefile.am @@ -10,8 +10,8 @@ ## ## -libMultiplication_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/operations/includes +libMultiplication_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/operations/includes instdir = $(top_builddir)/lib @@ -29,16 +29,16 @@ libMultiplication_la_SOURCES = $(HEAD) \ cmula.c \ zmula.c \ ctimess.c \ - ztimess.c + ztimess.c check_PROGRAMS = testMultiplication -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ libMultiplication.la -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/operations/includes +check_INCLUDES = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/operations/includes testMultiplication_SOURCES = testMultiplication.c testMultiplication_LDADD = $(check_LDADD) diff --git a/src/c/operations/multiplication/Makefile.in b/src/c/operations/multiplication/Makefile.in index eb1771cd..0a273d41 100644 --- a/src/c/operations/multiplication/Makefile.in +++ b/src/c/operations/multiplication/Makefile.in @@ -34,7 +34,7 @@ build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = testMultiplication$(EXEEXT) TESTS = testMultiplication$(EXEEXT) -subdir = operations/multiplication +subdir = src/c/operations/multiplication DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -211,8 +211,8 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -libMultiplication_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/operations/includes +libMultiplication_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/operations/includes instdir = $(top_builddir)/lib pkglib_LTLIBRARIES = libMultiplication.la @@ -227,14 +227,14 @@ libMultiplication_la_SOURCES = $(HEAD) \ cmula.c \ zmula.c \ ctimess.c \ - ztimess.c + ztimess.c -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ libMultiplication.la -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/operations/includes +check_INCLUDES = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/operations/includes testMultiplication_SOURCES = testMultiplication.c testMultiplication_LDADD = $(check_LDADD) @@ -252,9 +252,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign operations/multiplication/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/operations/multiplication/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign operations/multiplication/Makefile + $(AUTOMAKE) --foreign src/c/operations/multiplication/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/c/operations/subtraction/Makefile.am b/src/c/operations/subtraction/Makefile.am index 1a93167c..724bbe32 100644 --- a/src/c/operations/subtraction/Makefile.am +++ b/src/c/operations/subtraction/Makefile.am @@ -10,8 +10,8 @@ ## ## -libSubtraction_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/operations/includes +libSubtraction_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/operations/includes instdir = $(top_builddir)/lib @@ -31,12 +31,12 @@ libSubtraction_la_SOURCES = $(HEAD) \ check_PROGRAMS = testSubtraction -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ libSubtraction.la -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/operations/includes +check_INCLUDES = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/operations/includes testSubtraction_SOURCES = testSubtraction.c testSubtraction_LDADD = $(check_LDADD) diff --git a/src/c/operations/subtraction/Makefile.in b/src/c/operations/subtraction/Makefile.in index a98765c6..f87efe71 100644 --- a/src/c/operations/subtraction/Makefile.in +++ b/src/c/operations/subtraction/Makefile.in @@ -34,7 +34,7 @@ build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = testSubtraction$(EXEEXT) TESTS = testSubtraction$(EXEEXT) -subdir = operations/subtraction +subdir = src/c/operations/subtraction DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -206,8 +206,8 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -libSubtraction_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/operations/includes +libSubtraction_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/operations/includes instdir = $(top_builddir)/lib pkglib_LTLIBRARIES = libSubtraction.la @@ -222,12 +222,12 @@ libSubtraction_la_SOURCES = $(HEAD) \ cdiffa.c \ zdiffa.c -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ libSubtraction.la -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/operations/includes +check_INCLUDES = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/operations/includes testSubtraction_SOURCES = testSubtraction.c testSubtraction_LDADD = $(check_LDADD) @@ -245,9 +245,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign operations/subtraction/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/operations/subtraction/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign operations/subtraction/Makefile + $(AUTOMAKE) --foreign src/c/operations/subtraction/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/c/signalProcessing/Makefile.in b/src/c/signalProcessing/Makefile.in index 80366b27..0cbdabf6 100644 --- a/src/c/signalProcessing/Makefile.in +++ b/src/c/signalProcessing/Makefile.in @@ -31,7 +31,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = signalProcessing +subdir = src/c/signalProcessing DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -196,9 +196,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign signalProcessing/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/signalProcessing/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign signalProcessing/Makefile + $(AUTOMAKE) --foreign src/c/signalProcessing/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/c/signalProcessing/conv/Makefile.am b/src/c/signalProcessing/conv/Makefile.am index 5599b11e..1e61c4a6 100644 --- a/src/c/signalProcessing/conv/Makefile.am +++ b/src/c/signalProcessing/conv/Makefile.am @@ -13,9 +13,9 @@ -libConv_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/signalProcessing/includes +libConv_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/signalProcessing/includes instdir = $(top_builddir)/lib @@ -24,38 +24,38 @@ instdir = $(top_builddir)/lib pkglib_LTLIBRARIES = libConv.la HEAD = ../includes/conv.h - + libConv_la_SOURCES = $(HEAD) \ - sconva.c \ - dconva.c \ - cconva.c \ - zconva.c + sconva.c \ + dconva.c \ + cconva.c \ + zconva.c ############### #### Check #### ############### -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la \ - $(top_builddir)/signalProcessing/ifft/libIfft.la \ - $(top_builddir)/signalProcessing/fft/libFft.la \ - $(top_builddir)/lib/lapack/libscilapack.la \ - $(top_builddir)/lib/blas/libsciblas.la \ - $(top_builddir)/operations/addition/libAddition.la \ - $(top_builddir)/operations/subtraction/libSubtraction.la \ - $(top_builddir)/matrixOperations/zeros/libMatrixZeros.la \ - libConv.la - - -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/signalProcessing/fft \ - -I $(top_builddir)/signalProcessing/ifft \ - -I $(top_builddir)/signalProcessing/includes +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ + $(top_builddir)/src/c/signalProcessing/ifft/libIfft.la \ + $(top_builddir)/src/c/signalProcessing/fft/libFft.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/fortran/blas/libsciblas.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/c/operations/subtraction/libSubtraction.la \ + $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la \ + libConv.la + + +check_INCLUDES = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/signalProcessing/fft \ + -I $(top_builddir)/src/c/signalProcessing/ifft \ + -I $(top_builddir)/src/c/signalProcessing/includes check_PROGRAMS = testFloatConv testDoubleConv diff --git a/src/c/signalProcessing/conv/Makefile.in b/src/c/signalProcessing/conv/Makefile.in index a66762a8..85dad52b 100644 --- a/src/c/signalProcessing/conv/Makefile.in +++ b/src/c/signalProcessing/conv/Makefile.in @@ -34,7 +34,7 @@ build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = testFloatConv$(EXEEXT) testDoubleConv$(EXEEXT) TESTS = testFloatConv$(EXEEXT) testDoubleConv$(EXEEXT) -subdir = signalProcessing/conv +subdir = src/c/signalProcessing/conv DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -209,40 +209,40 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -libConv_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/signalProcessing/includes +libConv_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/signalProcessing/includes instdir = $(top_builddir)/lib pkglib_LTLIBRARIES = libConv.la HEAD = ../includes/conv.h libConv_la_SOURCES = $(HEAD) \ - sconva.c \ - dconva.c \ - cconva.c \ - zconva.c + sconva.c \ + dconva.c \ + cconva.c \ + zconva.c ############### #### Check #### ############### -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la \ - $(top_builddir)/signalProcessing/ifft/libIfft.la \ - $(top_builddir)/signalProcessing/fft/libFft.la \ - $(top_builddir)/lib/lapack/libscilapack.la \ - $(top_builddir)/lib/blas/libsciblas.la \ - $(top_builddir)/operations/addition/libAddition.la \ - $(top_builddir)/operations/subtraction/libSubtraction.la \ - $(top_builddir)/matrixOperations/zeros/libMatrixZeros.la \ - libConv.la - -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/signalProcessing/fft \ - -I $(top_builddir)/signalProcessing/ifft \ - -I $(top_builddir)/signalProcessing/includes +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ + $(top_builddir)/src/c/signalProcessing/ifft/libIfft.la \ + $(top_builddir)/src/c/signalProcessing/fft/libFft.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/fortran/blas/libsciblas.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/c/operations/subtraction/libSubtraction.la \ + $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la \ + libConv.la + +check_INCLUDES = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/signalProcessing/fft \ + -I $(top_builddir)/src/c/signalProcessing/ifft \ + -I $(top_builddir)/src/c/signalProcessing/includes testDoubleConv_SOURCES = testDoubleConv.c testDoubleConv_LDADD = $(check_LDADD) @@ -263,9 +263,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign signalProcessing/conv/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/signalProcessing/conv/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign signalProcessing/conv/Makefile + $(AUTOMAKE) --foreign src/c/signalProcessing/conv/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/c/signalProcessing/conv2d/Makefile.am b/src/c/signalProcessing/conv2d/Makefile.am index 0dd407cd..ac53db68 100644 --- a/src/c/signalProcessing/conv2d/Makefile.am +++ b/src/c/signalProcessing/conv2d/Makefile.am @@ -13,9 +13,9 @@ -libConv2d_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/signalProcessing/includes +libConv2d_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/signalProcessing/includes instdir = $(top_builddir)/lib @@ -23,30 +23,30 @@ instdir = $(top_builddir)/lib pkglib_LTLIBRARIES = libConv2d.la -HEAD = ../includes/conv2d.h +HEAD = ../includes/conv2d.h libConv2d_la_SOURCES = $(HEAD) \ - sconv2da.c \ - dconv2da.c \ - cconv2da.c \ - zconv2da.c + sconv2da.c \ + dconv2da.c \ + cconv2da.c \ + zconv2da.c ############### #### Check #### ############### -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la \ - $(top_builddir)/operations/addition/libAddition.la \ - libConv2d.la - +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + libConv2d.la -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/signalProcessing/includes + +check_INCLUDES = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/signalProcessing/includes check_PROGRAMS = testFloatConv2d testDoubleConv2d diff --git a/src/c/signalProcessing/conv2d/Makefile.in b/src/c/signalProcessing/conv2d/Makefile.in index f927daec..4571ae66 100644 --- a/src/c/signalProcessing/conv2d/Makefile.in +++ b/src/c/signalProcessing/conv2d/Makefile.in @@ -34,7 +34,7 @@ build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = testFloatConv2d$(EXEEXT) testDoubleConv2d$(EXEEXT) TESTS = testFloatConv2d$(EXEEXT) testDoubleConv2d$(EXEEXT) -subdir = signalProcessing/conv2d +subdir = src/c/signalProcessing/conv2d DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -212,32 +212,32 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -libConv2d_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/signalProcessing/includes +libConv2d_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/signalProcessing/includes instdir = $(top_builddir)/lib pkglib_LTLIBRARIES = libConv2d.la -HEAD = ../includes/conv2d.h +HEAD = ../includes/conv2d.h libConv2d_la_SOURCES = $(HEAD) \ - sconv2da.c \ - dconv2da.c \ - cconv2da.c \ - zconv2da.c + sconv2da.c \ + dconv2da.c \ + cconv2da.c \ + zconv2da.c ############### #### Check #### ############### -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la \ - $(top_builddir)/operations/addition/libAddition.la \ - libConv2d.la +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + libConv2d.la -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/signalProcessing/includes +check_INCLUDES = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/signalProcessing/includes testDoubleConv2d_SOURCES = testDoubleConv2d.c testDoubleConv2d_LDADD = $(check_LDADD) @@ -258,9 +258,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign signalProcessing/conv2d/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/signalProcessing/conv2d/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign signalProcessing/conv2d/Makefile + $(AUTOMAKE) --foreign src/c/signalProcessing/conv2d/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/c/signalProcessing/crossCorr/Makefile.am b/src/c/signalProcessing/crossCorr/Makefile.am index c24390be..d9521e94 100644 --- a/src/c/signalProcessing/crossCorr/Makefile.am +++ b/src/c/signalProcessing/crossCorr/Makefile.am @@ -13,9 +13,9 @@ -libCrossCorr_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/signalProcessing/includes +libCrossCorr_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/signalProcessing/includes instdir = $(top_builddir)/lib @@ -23,32 +23,32 @@ instdir = $(top_builddir)/lib pkglib_LTLIBRARIES = libCrossCorr.la -HEAD = ../includes/crossCorr.h +HEAD = ../includes/crossCorr.h libCrossCorr_la_SOURCES = $(HEAD) \ - scrossCorra.c \ - dcrossCorra.c \ - ccrossCorra.c \ - zcrossCorra.c + scrossCorra.c \ + dcrossCorra.c \ + ccrossCorra.c \ + zcrossCorra.c ############### #### Check #### ############### -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/auxiliaryFunctions/conj/libConj.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la \ - $(top_builddir)/operations/addition/libAddition.la \ - $(top_builddir)/signalProcessing/conv2d/libConv2d.la \ +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/c/signalProcessing/conv2d/libConv2d.la \ libCrossCorr.la - -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/signalProcessing/includes + +check_INCLUDES = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/signalProcessing/includes check_PROGRAMS = testFloatCrossCorr testDoubleCrossCorr diff --git a/src/c/signalProcessing/crossCorr/Makefile.in b/src/c/signalProcessing/crossCorr/Makefile.in index 89610629..0f6aa8a6 100644 --- a/src/c/signalProcessing/crossCorr/Makefile.in +++ b/src/c/signalProcessing/crossCorr/Makefile.in @@ -35,7 +35,7 @@ host_triplet = @host@ check_PROGRAMS = testFloatCrossCorr$(EXEEXT) \ testDoubleCrossCorr$(EXEEXT) TESTS = testFloatCrossCorr$(EXEEXT) testDoubleCrossCorr$(EXEEXT) -subdir = signalProcessing/crossCorr +subdir = src/c/signalProcessing/crossCorr DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -215,34 +215,34 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -libCrossCorr_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/signalProcessing/includes +libCrossCorr_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/signalProcessing/includes instdir = $(top_builddir)/lib pkglib_LTLIBRARIES = libCrossCorr.la -HEAD = ../includes/crossCorr.h +HEAD = ../includes/crossCorr.h libCrossCorr_la_SOURCES = $(HEAD) \ - scrossCorra.c \ - dcrossCorra.c \ - ccrossCorra.c \ - zcrossCorra.c + scrossCorra.c \ + dcrossCorra.c \ + ccrossCorra.c \ + zcrossCorra.c ############### #### Check #### ############### -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/auxiliaryFunctions/conj/libConj.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la \ - $(top_builddir)/operations/addition/libAddition.la \ - $(top_builddir)/signalProcessing/conv2d/libConv2d.la \ +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/c/signalProcessing/conv2d/libConv2d.la \ libCrossCorr.la -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/signalProcessing/includes +check_INCLUDES = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/signalProcessing/includes testDoubleCrossCorr_SOURCES = testDoubleCrossCorr.c testDoubleCrossCorr_LDADD = $(check_LDADD) @@ -263,9 +263,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign signalProcessing/crossCorr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/signalProcessing/crossCorr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign signalProcessing/crossCorr/Makefile + $(AUTOMAKE) --foreign src/c/signalProcessing/crossCorr/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/c/signalProcessing/fft/Makefile.am b/src/c/signalProcessing/fft/Makefile.am index 2c6c184c..07b10b4f 100644 --- a/src/c/signalProcessing/fft/Makefile.am +++ b/src/c/signalProcessing/fft/Makefile.am @@ -13,11 +13,11 @@ libFft_la_CFLAGS = -I . \ - -I $(top_builddir)/type \ - -I $(top_builddir)/signalProcessing/includes \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/auxiliaryFunctions/includes + -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/signalProcessing/includes \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/matrixOperations/includes \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes instdir = $(top_builddir)/lib @@ -45,21 +45,21 @@ SRC = zfftma.c \ #### check_INCLUDES = -I . \ - -I $(top_builddir)/type \ - -I $(top_builddir)/signalProcessing/includes \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/operations/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)/lib/blas/libsciblas.la \ - $(top_builddir)/signalProcessing/fft/libFft.la \ - $(top_builddir)/operations/addition/libAddition.la \ - $(top_builddir)/operations/subtraction/libSubtraction.la \ - $(top_builddir)/matrixOperations/zeros/libMatrixZeros.la \ + -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/signalProcessing/includes \ + -I $(top_builddir)/src/c/matrixOperations/includes \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes + + +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/fortran/blas/libsciblas.la \ + $(top_builddir)/src/c/signalProcessing/fft/libFft.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/c/operations/subtraction/libSubtraction.la \ + $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la \ @LIBMATH@ check_PROGRAMS = testFloatFft testDoubleFft testMatFft diff --git a/src/c/signalProcessing/fft/Makefile.in b/src/c/signalProcessing/fft/Makefile.in index 0939f306..6408f077 100644 --- a/src/c/signalProcessing/fft/Makefile.in +++ b/src/c/signalProcessing/fft/Makefile.in @@ -36,7 +36,7 @@ check_PROGRAMS = testFloatFft$(EXEEXT) testDoubleFft$(EXEEXT) \ testMatFft$(EXEEXT) TESTS = testFloatFft$(EXEEXT) testDoubleFft$(EXEEXT) \ testMatFft$(EXEEXT) -subdir = signalProcessing/fft +subdir = src/c/signalProcessing/fft DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -67,14 +67,14 @@ libFft_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ am_testDoubleFft_OBJECTS = testDoubleFft-testDoubleFft.$(OBJEXT) testDoubleFft_OBJECTS = $(am_testDoubleFft_OBJECTS) -am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/lib/lapack/libscilapack.la \ - $(top_builddir)/lib/blas/libsciblas.la \ - $(top_builddir)/signalProcessing/fft/libFft.la \ - $(top_builddir)/operations/addition/libAddition.la \ - $(top_builddir)/operations/subtraction/libSubtraction.la \ - $(top_builddir)/matrixOperations/zeros/libMatrixZeros.la +am__DEPENDENCIES_1 = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/fortran/blas/libsciblas.la \ + $(top_builddir)/src/c/signalProcessing/fft/libFft.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/c/operations/subtraction/libSubtraction.la \ + $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la testDoubleFft_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoubleFft_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleFft_CFLAGS) \ @@ -229,11 +229,11 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ libFft_la_CFLAGS = -I . \ - -I $(top_builddir)/type \ - -I $(top_builddir)/signalProcessing/includes \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/auxiliaryFunctions/includes + -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/signalProcessing/includes \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/matrixOperations/includes \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes instdir = $(top_builddir)/lib pkglib_LTLIBRARIES = libFft.la @@ -258,20 +258,20 @@ SRC = zfftma.c \ # Checking Part #### check_INCLUDES = -I . \ - -I $(top_builddir)/type \ - -I $(top_builddir)/signalProcessing/includes \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/operations/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)/lib/blas/libsciblas.la \ - $(top_builddir)/signalProcessing/fft/libFft.la \ - $(top_builddir)/operations/addition/libAddition.la \ - $(top_builddir)/operations/subtraction/libSubtraction.la \ - $(top_builddir)/matrixOperations/zeros/libMatrixZeros.la \ + -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/signalProcessing/includes \ + -I $(top_builddir)/src/c/matrixOperations/includes \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes + +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/fortran/blas/libsciblas.la \ + $(top_builddir)/src/c/signalProcessing/fft/libFft.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/c/operations/subtraction/libSubtraction.la \ + $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la \ @LIBMATH@ @@ -300,9 +300,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign signalProcessing/fft/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/signalProcessing/fft/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign signalProcessing/fft/Makefile + $(AUTOMAKE) --foreign src/c/signalProcessing/fft/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/c/signalProcessing/fftshift/Makefile.am b/src/c/signalProcessing/fftshift/Makefile.am index f74be23f..22ced909 100644 --- a/src/c/signalProcessing/fftshift/Makefile.am +++ b/src/c/signalProcessing/fftshift/Makefile.am @@ -13,8 +13,8 @@ -libFftShift_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/signalProcessing/includes +libFftShift_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/signalProcessing/includes instdir = $(top_builddir)/lib @@ -22,9 +22,9 @@ instdir = $(top_builddir)/lib pkglib_LTLIBRARIES = libFftShift.la -HEAD = ../includes/fftshift.h +HEAD = ../includes/fftshift.h -libFftShift_la_SOURCES = $(HEAD) \ +libFftShift_la_SOURCES = $(HEAD) \ sfftshifta.c \ dfftshifta.c \ cfftshifta.c \ @@ -43,14 +43,14 @@ libFftShift_la_SOURCES = $(HEAD) \ #### Check #### ############### -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - libFftShift.la - +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + libFftShift.la -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/signalProcessing/includes + +check_INCLUDES = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/signalProcessing/includes check_PROGRAMS = testFloatFftShift testDoubleFftShift diff --git a/src/c/signalProcessing/fftshift/Makefile.in b/src/c/signalProcessing/fftshift/Makefile.in index 064dad23..a96563a1 100644 --- a/src/c/signalProcessing/fftshift/Makefile.in +++ b/src/c/signalProcessing/fftshift/Makefile.in @@ -35,7 +35,7 @@ host_triplet = @host@ check_PROGRAMS = testFloatFftShift$(EXEEXT) \ testDoubleFftShift$(EXEEXT) TESTS = testFloatFftShift$(EXEEXT) testDoubleFftShift$(EXEEXT) -subdir = signalProcessing/fftshift +subdir = src/c/signalProcessing/fftshift DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -223,12 +223,12 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -libFftShift_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/signalProcessing/includes +libFftShift_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/signalProcessing/includes instdir = $(top_builddir)/lib pkglib_LTLIBRARIES = libFftShift.la -HEAD = ../includes/fftshift.h +HEAD = ../includes/fftshift.h libFftShift_la_SOURCES = $(HEAD) \ sfftshifta.c \ dfftshifta.c \ @@ -247,12 +247,12 @@ libFftShift_la_SOURCES = $(HEAD) \ ############### #### Check #### ############### -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - libFftShift.la +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + libFftShift.la -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/signalProcessing/includes +check_INCLUDES = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/signalProcessing/includes testDoubleFftShift_SOURCES = testDoubleFftShift.c testDoubleFftShift_LDADD = $(check_LDADD) @@ -273,9 +273,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign signalProcessing/fftshift/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/signalProcessing/fftshift/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign signalProcessing/fftshift/Makefile + $(AUTOMAKE) --foreign src/c/signalProcessing/fftshift/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/c/signalProcessing/hilbert/Makefile.am b/src/c/signalProcessing/hilbert/Makefile.am index fc392a33..86226104 100644 --- a/src/c/signalProcessing/hilbert/Makefile.am +++ b/src/c/signalProcessing/hilbert/Makefile.am @@ -13,9 +13,9 @@ -libHilbert_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/signalProcessing/includes +libHilbert_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/signalProcessing/includes instdir = $(top_builddir)/lib @@ -24,38 +24,38 @@ instdir = $(top_builddir)/lib pkglib_LTLIBRARIES = libHilbert.la HEAD = ../includes/hilbert.h - + libHilbert_la_SOURCES = $(HEAD) \ - shilberta.c \ - dhilberta.c \ - shilberts.c \ - dhilberts.c + shilberta.c \ + dhilberta.c \ + shilberts.c \ + dhilberts.c ############### #### Check #### ############### -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la \ - $(top_builddir)/signalProcessing/ifft/libIfft.la \ - $(top_builddir)/signalProcessing/fft/libFft.la \ - $(top_builddir)/lib/lapack/libscilapack.la \ - $(top_builddir)/lib/blas/libsciblas.la \ - $(top_builddir)/operations/addition/libAddition.la \ - $(top_builddir)/operations/subtraction/libSubtraction.la \ - $(top_builddir)/matrixOperations/zeros/libMatrixZeros.la \ - $(top_builddir)/signalProcessing/hilbert/libHilbert.la - - -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/signalProcessing/fft \ - -I $(top_builddir)/signalProcessing/ifft \ - -I $(top_builddir)/signalProcessing/includes +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ + $(top_builddir)/src/c/signalProcessing/ifft/libIfft.la \ + $(top_builddir)/src/c/signalProcessing/fft/libFft.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/fortran//blas/libsciblas.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/c/operations/subtraction/libSubtraction.la \ + $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la \ + $(top_builddir)/src/c/signalProcessing/hilbert/libHilbert.la + + +check_INCLUDES = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/signalProcessing/fft \ + -I $(top_builddir)/src/c/signalProcessing/ifft \ + -I $(top_builddir)/src/c/signalProcessing/includes check_PROGRAMS = testHilbert diff --git a/src/c/signalProcessing/hilbert/Makefile.in b/src/c/signalProcessing/hilbert/Makefile.in index 049d8ef6..9fab29d4 100644 --- a/src/c/signalProcessing/hilbert/Makefile.in +++ b/src/c/signalProcessing/hilbert/Makefile.in @@ -34,7 +34,7 @@ build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = testHilbert$(EXEEXT) TESTS = testHilbert$(EXEEXT) -subdir = signalProcessing/hilbert +subdir = src/c/signalProcessing/hilbert DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -202,40 +202,40 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -libHilbert_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/signalProcessing/includes +libHilbert_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/signalProcessing/includes instdir = $(top_builddir)/lib pkglib_LTLIBRARIES = libHilbert.la HEAD = ../includes/hilbert.h libHilbert_la_SOURCES = $(HEAD) \ - shilberta.c \ - dhilberta.c \ - shilberts.c \ - dhilberts.c + shilberta.c \ + dhilberta.c \ + shilberts.c \ + dhilberts.c ############### #### Check #### ############### -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la \ - $(top_builddir)/signalProcessing/ifft/libIfft.la \ - $(top_builddir)/signalProcessing/fft/libFft.la \ - $(top_builddir)/lib/lapack/libscilapack.la \ - $(top_builddir)/lib/blas/libsciblas.la \ - $(top_builddir)/operations/addition/libAddition.la \ - $(top_builddir)/operations/subtraction/libSubtraction.la \ - $(top_builddir)/matrixOperations/zeros/libMatrixZeros.la \ - $(top_builddir)/signalProcessing/hilbert/libHilbert.la - -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/signalProcessing/fft \ - -I $(top_builddir)/signalProcessing/ifft \ - -I $(top_builddir)/signalProcessing/includes +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ + $(top_builddir)/src/c/signalProcessing/ifft/libIfft.la \ + $(top_builddir)/src/c/signalProcessing/fft/libFft.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/fortran//blas/libsciblas.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/c/operations/subtraction/libSubtraction.la \ + $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la \ + $(top_builddir)/src/c/signalProcessing/hilbert/libHilbert.la + +check_INCLUDES = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/signalProcessing/fft \ + -I $(top_builddir)/src/c/signalProcessing/ifft \ + -I $(top_builddir)/src/c/signalProcessing/includes testHilbert_SOURCES = testHilbert.c testHilbert_LDADD = $(check_LDADD) @@ -253,9 +253,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign signalProcessing/hilbert/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/signalProcessing/hilbert/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign signalProcessing/hilbert/Makefile + $(AUTOMAKE) --foreign src/c/signalProcessing/hilbert/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/c/signalProcessing/ifft/Makefile.am b/src/c/signalProcessing/ifft/Makefile.am index c68980c1..2afc2287 100644 --- a/src/c/signalProcessing/ifft/Makefile.am +++ b/src/c/signalProcessing/ifft/Makefile.am @@ -13,11 +13,11 @@ libIfft_la_CFLAGS = -I . \ - -I $(top_builddir)/type \ - -I $(top_builddir)/signalProcessing/includes \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/auxiliaryFunctions/includes + -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/signalProcessing/includes \ + -I $(top_builddir)/src/c/matrixOperations/includes \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes instdir = $(top_builddir)/lib @@ -29,8 +29,8 @@ HEAD = ../includes/ifft.h \ fft_internal.h SRC = zifftma.c \ - cifftma.c \ - difft2.c \ + cifftma.c \ + difft2.c \ difftbi.c \ difftmx.c \ ifft842.c \ @@ -38,7 +38,7 @@ SRC = zifftma.c \ ir4tx.c \ ir8tx.c\ difftma.c \ - sifftma.c + sifftma.c #### @@ -46,21 +46,21 @@ SRC = zifftma.c \ #### check_INCLUDES = -I . \ - -I $(top_builddir)/type \ - -I $(top_builddir)/signalProcessing/includes \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/operations/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)/lib/blas/libsciblas.la \ - $(top_builddir)/signalProcessing/ifft/libIfft.la \ - $(top_builddir)/matrixOperations/zeros/libMatrixZeros.la \ - $(top_builddir)/operations/addition/libAddition.la \ - $(top_builddir)/operations/subtraction/libSubtraction.la \ + -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/signalProcessing/includes \ + -I $(top_builddir)/src/c/matrixOperations/includes \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes + + +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/fortran/blas/libsciblas.la \ + $(top_builddir)/src/c/signalProcessing/ifft/libIfft.la \ + $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/c/operations/subtraction/libSubtraction.la \ @LIBMATH@ check_PROGRAMS = testFloatIfft testDoubleIfft testMatIfft diff --git a/src/c/signalProcessing/ifft/Makefile.in b/src/c/signalProcessing/ifft/Makefile.in index 890931af..3de210b4 100644 --- a/src/c/signalProcessing/ifft/Makefile.in +++ b/src/c/signalProcessing/ifft/Makefile.in @@ -36,7 +36,7 @@ check_PROGRAMS = testFloatIfft$(EXEEXT) testDoubleIfft$(EXEEXT) \ testMatIfft$(EXEEXT) TESTS = testFloatIfft$(EXEEXT) testDoubleIfft$(EXEEXT) \ testMatIfft$(EXEEXT) -subdir = signalProcessing/ifft +subdir = src/c/signalProcessing/ifft DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -68,14 +68,14 @@ libIfft_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ am_testDoubleIfft_OBJECTS = testDoubleIfft-testDoubleIfft.$(OBJEXT) testDoubleIfft_OBJECTS = $(am_testDoubleIfft_OBJECTS) -am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/lib/lapack/libscilapack.la \ - $(top_builddir)/lib/blas/libsciblas.la \ - $(top_builddir)/signalProcessing/ifft/libIfft.la \ - $(top_builddir)/matrixOperations/zeros/libMatrixZeros.la \ - $(top_builddir)/operations/addition/libAddition.la \ - $(top_builddir)/operations/subtraction/libSubtraction.la +am__DEPENDENCIES_1 = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/fortran/blas/libsciblas.la \ + $(top_builddir)/src/c/signalProcessing/ifft/libIfft.la \ + $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/c/operations/subtraction/libSubtraction.la testDoubleIfft_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoubleIfft_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleIfft_CFLAGS) \ @@ -230,11 +230,11 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ libIfft_la_CFLAGS = -I . \ - -I $(top_builddir)/type \ - -I $(top_builddir)/signalProcessing/includes \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/auxiliaryFunctions/includes + -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/signalProcessing/includes \ + -I $(top_builddir)/src/c/matrixOperations/includes \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes instdir = $(top_builddir)/lib pkglib_LTLIBRARIES = libIfft.la @@ -243,8 +243,8 @@ HEAD = ../includes/ifft.h \ fft_internal.h SRC = zifftma.c \ - cifftma.c \ - difft2.c \ + cifftma.c \ + difft2.c \ difftbi.c \ difftmx.c \ ifft842.c \ @@ -252,27 +252,27 @@ SRC = zifftma.c \ ir4tx.c \ ir8tx.c\ difftma.c \ - sifftma.c + sifftma.c #### # Checking Part #### check_INCLUDES = -I . \ - -I $(top_builddir)/type \ - -I $(top_builddir)/signalProcessing/includes \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/operations/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)/lib/blas/libsciblas.la \ - $(top_builddir)/signalProcessing/ifft/libIfft.la \ - $(top_builddir)/matrixOperations/zeros/libMatrixZeros.la \ - $(top_builddir)/operations/addition/libAddition.la \ - $(top_builddir)/operations/subtraction/libSubtraction.la \ + -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/signalProcessing/includes \ + -I $(top_builddir)/src/c/matrixOperations/includes \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes + +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/fortran/blas/libsciblas.la \ + $(top_builddir)/src/c/signalProcessing/ifft/libIfft.la \ + $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/c/operations/subtraction/libSubtraction.la \ @LIBMATH@ @@ -301,9 +301,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign signalProcessing/ifft/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/signalProcessing/ifft/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign signalProcessing/ifft/Makefile + $(AUTOMAKE) --foreign src/c/signalProcessing/ifft/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/c/signalProcessing/lev/Makefile.am b/src/c/signalProcessing/lev/Makefile.am index 58bbb4ab..69157125 100644 --- a/src/c/signalProcessing/lev/Makefile.am +++ b/src/c/signalProcessing/lev/Makefile.am @@ -13,12 +13,12 @@ -libLev_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/elementaryFunctions/includes \ - -I $(top_builddir)/signalProcessing/includes +libLev_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/matrixOperations/includes \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/elementaryFunctions/includes \ + -I $(top_builddir)/src/c/signalProcessing/includes instdir = $(top_builddir)/lib @@ -30,11 +30,11 @@ HEAD = ../includes/lev.h libLev_la_SOURCES = $(HEAD) \ - dleva.c\ - sleva.c\ - zleva.c\ - cleva.c\ - dleva2.c + dleva.c\ + sleva.c\ + zleva.c\ + cleva.c\ + dleva2.c ############### @@ -43,25 +43,25 @@ libLev_la_SOURCES = $(HEAD) \ check_PROGRAMS = testDoubleLev testFloatLev -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/lib/blas/libsciblas.la \ - $(top_builddir)/lib/lapack/libscilapack.la \ - $(top_builddir)/auxiliaryFunctions/conj/libConj.la \ - $(top_builddir)/operations/addition/libAddition.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la \ - $(top_builddir)/operations/subtraction/libSubtraction.la \ - $(top_builddir)/operations/division/libDivision.la \ - $(top_builddir)/signalProcessing/lev/libLev.la \ - @LIBMATH@ - - -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/signalProcessing/includes \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/auxiliaryFunctions/includes - +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/fortran/blas/libsciblas.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ + $(top_builddir)/src/c/operations/subtraction/libSubtraction.la \ + $(top_builddir)/src/c/operations/division/libDivision.la \ + $(top_builddir)/src/c/signalProcessing/lev/libLev.la \ + @LIBMATH@ + + +check_INCLUDES = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/signalProcessing/includes \ + -I $(top_builddir)/src/c/matrixOperations/includes \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes + testDoubleLev_SOURCES = testDoubleLev.c diff --git a/src/c/signalProcessing/lev/Makefile.in b/src/c/signalProcessing/lev/Makefile.in index 96e52b3a..ca2c4df3 100644 --- a/src/c/signalProcessing/lev/Makefile.in +++ b/src/c/signalProcessing/lev/Makefile.in @@ -34,7 +34,7 @@ build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = testDoubleLev$(EXEEXT) testFloatLev$(EXEEXT) TESTS = testDoubleLev$(EXEEXT) testFloatLev$(EXEEXT) -subdir = signalProcessing/lev +subdir = src/c/signalProcessing/lev DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -63,16 +63,16 @@ libLev_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ am_testDoubleLev_OBJECTS = testDoubleLev-testDoubleLev.$(OBJEXT) testDoubleLev_OBJECTS = $(am_testDoubleLev_OBJECTS) -am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/lib/blas/libsciblas.la \ - $(top_builddir)/lib/lapack/libscilapack.la \ - $(top_builddir)/auxiliaryFunctions/conj/libConj.la \ - $(top_builddir)/operations/addition/libAddition.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la \ - $(top_builddir)/operations/subtraction/libSubtraction.la \ - $(top_builddir)/operations/division/libDivision.la \ - $(top_builddir)/signalProcessing/lev/libLev.la +am__DEPENDENCIES_1 = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/fortran/blas/libsciblas.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ + $(top_builddir)/src/c/operations/subtraction/libSubtraction.la \ + $(top_builddir)/src/c/operations/division/libDivision.la \ + $(top_builddir)/src/c/signalProcessing/lev/libLev.la testDoubleLev_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoubleLev_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleLev_CFLAGS) \ @@ -220,40 +220,40 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -libLev_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/elementaryFunctions/includes \ - -I $(top_builddir)/signalProcessing/includes +libLev_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/matrixOperations/includes \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/elementaryFunctions/includes \ + -I $(top_builddir)/src/c/signalProcessing/includes instdir = $(top_builddir)/lib pkglib_LTLIBRARIES = libLev.la HEAD = ../includes/lev.h libLev_la_SOURCES = $(HEAD) \ - dleva.c\ - sleva.c\ - zleva.c\ - cleva.c\ - dleva2.c - -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/lib/blas/libsciblas.la \ - $(top_builddir)/lib/lapack/libscilapack.la \ - $(top_builddir)/auxiliaryFunctions/conj/libConj.la \ - $(top_builddir)/operations/addition/libAddition.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la \ - $(top_builddir)/operations/subtraction/libSubtraction.la \ - $(top_builddir)/operations/division/libDivision.la \ - $(top_builddir)/signalProcessing/lev/libLev.la \ - @LIBMATH@ - -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/signalProcessing/includes \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/auxiliaryFunctions/includes + dleva.c\ + sleva.c\ + zleva.c\ + cleva.c\ + dleva2.c + +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/fortran/blas/libsciblas.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ + $(top_builddir)/src/c/operations/subtraction/libSubtraction.la \ + $(top_builddir)/src/c/operations/division/libDivision.la \ + $(top_builddir)/src/c/signalProcessing/lev/libLev.la \ + @LIBMATH@ + +check_INCLUDES = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/signalProcessing/includes \ + -I $(top_builddir)/src/c/matrixOperations/includes \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes testDoubleLev_SOURCES = testDoubleLev.c testDoubleLev_LDADD = $(check_LDADD) @@ -274,9 +274,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign signalProcessing/lev/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/signalProcessing/lev/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign signalProcessing/lev/Makefile + $(AUTOMAKE) --foreign src/c/signalProcessing/lev/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/c/signalProcessing/levin/Makefile.am b/src/c/signalProcessing/levin/Makefile.am index bd8336d0..3e6de02f 100644 --- a/src/c/signalProcessing/levin/Makefile.am +++ b/src/c/signalProcessing/levin/Makefile.am @@ -13,13 +13,13 @@ -libLevin_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/elementaryFunctions/includes \ - -I $(top_builddir)/signalProcessing/includes \ - -I $(top_builddir)/signalProcessing/levin +libLevin_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/matrixOperations/includes \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/elementaryFunctions/includes \ + -I $(top_builddir)/src/c/signalProcessing/includes \ + -I $(top_builddir)/src/c/signalProcessing/levin instdir = $(top_builddir)/lib @@ -42,26 +42,26 @@ libLevin_la_SOURCES = $(HEAD) \ check_PROGRAMS = testDoubleLevin testFloatLevin -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/lib/blas/libsciblas.la \ - $(top_builddir)/lib/lapack/libscilapack.la \ - $(top_builddir)/matrixOperations/inversion/libMatrixInversion.la \ - $(top_builddir)/matrixOperations/multiplication/libMatrixMultiplication.la \ - $(top_builddir)/matrixOperations/zeros/libMatrixZeros.la \ - $(top_builddir)/signalProcessing/levin/libLevin.la \ - $(top_builddir)/operations/addition/libAddition.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la \ - $(top_builddir)/operations/subtraction/libSubtraction.la \ +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/fortran/blas/libsciblas.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/c/matrixOperations/inversion/libMatrixInversion.la \ + $(top_builddir)/src/c/matrixOperations/multiplication/libMatrixMultiplication.la \ + $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la \ + $(top_builddir)/src/c/signalProcessing/levin/libLevin.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ + $(top_builddir)/src/c/operations/subtraction/libSubtraction.la \ @LIBMATH@ -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/signalProcessing/includes \ - -I $(top_builddir)/signalProcessing/levin +check_INCLUDES = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/matrixOperations/includes \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/signalProcessing/includes \ + -I $(top_builddir)/src/c/signalProcessing/levin testDoubleLevin_SOURCES = testDoubleLevin.c diff --git a/src/c/signalProcessing/levin/Makefile.in b/src/c/signalProcessing/levin/Makefile.in index d19326b5..05f09651 100644 --- a/src/c/signalProcessing/levin/Makefile.in +++ b/src/c/signalProcessing/levin/Makefile.in @@ -34,7 +34,7 @@ build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = testDoubleLevin$(EXEEXT) testFloatLevin$(EXEEXT) TESTS = testDoubleLevin$(EXEEXT) testFloatLevin$(EXEEXT) -subdir = signalProcessing/levin +subdir = src/c/signalProcessing/levin DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -63,17 +63,17 @@ libLevin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ am_testDoubleLevin_OBJECTS = \ testDoubleLevin-testDoubleLevin.$(OBJEXT) testDoubleLevin_OBJECTS = $(am_testDoubleLevin_OBJECTS) -am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/lib/blas/libsciblas.la \ - $(top_builddir)/lib/lapack/libscilapack.la \ - $(top_builddir)/matrixOperations/inversion/libMatrixInversion.la \ - $(top_builddir)/matrixOperations/multiplication/libMatrixMultiplication.la \ - $(top_builddir)/matrixOperations/zeros/libMatrixZeros.la \ - $(top_builddir)/signalProcessing/levin/libLevin.la \ - $(top_builddir)/operations/addition/libAddition.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la \ - $(top_builddir)/operations/subtraction/libSubtraction.la +am__DEPENDENCIES_1 = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/fortran/blas/libsciblas.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/c/matrixOperations/inversion/libMatrixInversion.la \ + $(top_builddir)/src/c/matrixOperations/multiplication/libMatrixMultiplication.la \ + $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la \ + $(top_builddir)/src/c/signalProcessing/levin/libLevin.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ + $(top_builddir)/src/c/operations/subtraction/libSubtraction.la testDoubleLevin_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoubleLevin_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleLevin_CFLAGS) \ @@ -221,13 +221,13 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -libLevin_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/elementaryFunctions/includes \ - -I $(top_builddir)/signalProcessing/includes \ - -I $(top_builddir)/signalProcessing/levin +libLevin_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/matrixOperations/includes \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/elementaryFunctions/includes \ + -I $(top_builddir)/src/c/signalProcessing/includes \ + -I $(top_builddir)/src/c/signalProcessing/levin instdir = $(top_builddir)/lib pkglib_LTLIBRARIES = libLevin.la @@ -237,25 +237,25 @@ libLevin_la_SOURCES = $(HEAD) \ slevina.c \ dlevina.c -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/lib/blas/libsciblas.la \ - $(top_builddir)/lib/lapack/libscilapack.la \ - $(top_builddir)/matrixOperations/inversion/libMatrixInversion.la \ - $(top_builddir)/matrixOperations/multiplication/libMatrixMultiplication.la \ - $(top_builddir)/matrixOperations/zeros/libMatrixZeros.la \ - $(top_builddir)/signalProcessing/levin/libLevin.la \ - $(top_builddir)/operations/addition/libAddition.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la \ - $(top_builddir)/operations/subtraction/libSubtraction.la \ +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/fortran/blas/libsciblas.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/c/matrixOperations/inversion/libMatrixInversion.la \ + $(top_builddir)/src/c/matrixOperations/multiplication/libMatrixMultiplication.la \ + $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la \ + $(top_builddir)/src/c/signalProcessing/levin/libLevin.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ + $(top_builddir)/src/c/operations/subtraction/libSubtraction.la \ @LIBMATH@ -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/signalProcessing/includes \ - -I $(top_builddir)/signalProcessing/levin +check_INCLUDES = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/matrixOperations/includes \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/signalProcessing/includes \ + -I $(top_builddir)/src/c/signalProcessing/levin testDoubleLevin_SOURCES = testDoubleLevin.c testDoubleLevin_LDADD = $(check_LDADD) @@ -276,9 +276,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign signalProcessing/levin/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/signalProcessing/levin/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign signalProcessing/levin/Makefile + $(AUTOMAKE) --foreign src/c/signalProcessing/levin/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/c/signalProcessing/lpc2cep/Makefile.am b/src/c/signalProcessing/lpc2cep/Makefile.am index 6ab64984..c5c8dd1e 100644 --- a/src/c/signalProcessing/lpc2cep/Makefile.am +++ b/src/c/signalProcessing/lpc2cep/Makefile.am @@ -13,12 +13,12 @@ -libLpc2cep_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/elementaryFunctions/includes \ - -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/signalProcessing/includes +libLpc2cep_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/elementaryFunctions/includes \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/matrixOperations/includes \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/signalProcessing/includes instdir = $(top_builddir)/lib @@ -30,10 +30,10 @@ HEAD = ../includes/lpc2cep.h libLpc2cep_la_SOURCES = $(HEAD) \ - slpc2cepa.c \ - dlpc2cepa.c \ - clpc2cepa.c \ - zlpc2cepa.c + slpc2cepa.c \ + dlpc2cepa.c \ + clpc2cepa.c \ + zlpc2cepa.c ############### @@ -42,39 +42,39 @@ libLpc2cep_la_SOURCES = $(HEAD) \ check_PROGRAMS = testDoubleLpc2cep testFloatLpc2cep -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/lib/lapack/libscilapack.la \ - $(top_builddir)/lib/blas/libsciblas.la \ - $(top_builddir)/elementaryFunctions/log/libLog.la \ - $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ - $(top_builddir)/elementaryFunctions/log1p/libLog1p.la \ - $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ - $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/conj/libConj.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ - $(top_builddir)/auxiliaryFunctions/sign/libSign.la \ - $(top_builddir)/operations/addition/libAddition.la \ - $(top_builddir)/operations/subtraction/libSubtraction.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la \ - $(top_builddir)/matrixOperations/multiplication/libMatrixMultiplication.la \ - $(top_builddir)/matrixOperations/transpose/libMatrixTranspose.la \ - $(top_builddir)/matrixOperations/inversion/libMatrixInversion.la \ - $(top_builddir)/matrixOperations/logm/libLogm.la\ - $(top_builddir)/matrixOperations/spec2/libSpec2.la\ - $(top_builddir)/matrixOperations/zeros/libMatrixZeros.la\ - $(top_builddir)/signalProcessing/fft/libFft.la \ - $(top_builddir)/signalProcessing/ifft/libIfft.la \ - $(top_builddir)/signalProcessing/lpc2cep/libLpc2cep.la \ - @LIBMATH@ - - -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/elementaryFunctions/includes \ - -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/signalProcessing/includes +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/fortran/blas/libsciblas.la \ + $(top_builddir)/src/c/elementaryFunctions/log/libLog.la \ + $(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \ + $(top_builddir)/src/c/elementaryFunctions/log1p/libLog1p.la \ + $(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.la \ + $(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \ + $(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \ + $(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/c/operations/subtraction/libSubtraction.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ + $(top_builddir)/src/c/matrixOperations/multiplication/libMatrixMultiplication.la \ + $(top_builddir)/src/c/matrixOperations/transpose/libMatrixTranspose.la \ + $(top_builddir)/src/c/matrixOperations/inversion/libMatrixInversion.la \ + $(top_builddir)/src/c/matrixOperations/logm/libLogm.la\ + $(top_builddir)/src/c/matrixOperations/spec2/libSpec2.la\ + $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la\ + $(top_builddir)/src/c/signalProcessing/fft/libFft.la \ + $(top_builddir)/src/c/signalProcessing/ifft/libIfft.la \ + $(top_builddir)/src/c/signalProcessing/lpc2cep/libLpc2cep.la \ + @LIBMATH@ + + +check_INCLUDES = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/elementaryFunctions/includes \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/matrixOperations/includes \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/signalProcessing/includes testDoubleLpc2cep_SOURCES = testDoubleLpc2cep.c diff --git a/src/c/signalProcessing/lpc2cep/Makefile.in b/src/c/signalProcessing/lpc2cep/Makefile.in index 4b5d87c1..dc4b5433 100644 --- a/src/c/signalProcessing/lpc2cep/Makefile.in +++ b/src/c/signalProcessing/lpc2cep/Makefile.in @@ -34,7 +34,7 @@ build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = testDoubleLpc2cep$(EXEEXT) testFloatLpc2cep$(EXEEXT) TESTS = testDoubleLpc2cep$(EXEEXT) testFloatLpc2cep$(EXEEXT) -subdir = signalProcessing/lpc2cep +subdir = src/c/signalProcessing/lpc2cep DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -64,30 +64,30 @@ libLpc2cep_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ am_testDoubleLpc2cep_OBJECTS = \ testDoubleLpc2cep-testDoubleLpc2cep.$(OBJEXT) testDoubleLpc2cep_OBJECTS = $(am_testDoubleLpc2cep_OBJECTS) -am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/lib/lapack/libscilapack.la \ - $(top_builddir)/lib/blas/libsciblas.la \ - $(top_builddir)/elementaryFunctions/log/libLog.la \ - $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ - $(top_builddir)/elementaryFunctions/log1p/libLog1p.la \ - $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ - $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/conj/libConj.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ - $(top_builddir)/auxiliaryFunctions/sign/libSign.la \ - $(top_builddir)/operations/addition/libAddition.la \ - $(top_builddir)/operations/subtraction/libSubtraction.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la \ - $(top_builddir)/matrixOperations/multiplication/libMatrixMultiplication.la \ - $(top_builddir)/matrixOperations/transpose/libMatrixTranspose.la \ - $(top_builddir)/matrixOperations/inversion/libMatrixInversion.la \ - $(top_builddir)/matrixOperations/logm/libLogm.la \ - $(top_builddir)/matrixOperations/spec2/libSpec2.la \ - $(top_builddir)/matrixOperations/zeros/libMatrixZeros.la \ - $(top_builddir)/signalProcessing/fft/libFft.la \ - $(top_builddir)/signalProcessing/ifft/libIfft.la \ - $(top_builddir)/signalProcessing/lpc2cep/libLpc2cep.la +am__DEPENDENCIES_1 = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/fortran/blas/libsciblas.la \ + $(top_builddir)/src/c/elementaryFunctions/log/libLog.la \ + $(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \ + $(top_builddir)/src/c/elementaryFunctions/log1p/libLog1p.la \ + $(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.la \ + $(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \ + $(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \ + $(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/c/operations/subtraction/libSubtraction.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ + $(top_builddir)/src/c/matrixOperations/multiplication/libMatrixMultiplication.la \ + $(top_builddir)/src/c/matrixOperations/transpose/libMatrixTranspose.la \ + $(top_builddir)/src/c/matrixOperations/inversion/libMatrixInversion.la \ + $(top_builddir)/src/c/matrixOperations/logm/libLogm.la \ + $(top_builddir)/src/c/matrixOperations/spec2/libSpec2.la \ + $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la \ + $(top_builddir)/src/c/signalProcessing/fft/libFft.la \ + $(top_builddir)/src/c/signalProcessing/ifft/libIfft.la \ + $(top_builddir)/src/c/signalProcessing/lpc2cep/libLpc2cep.la testDoubleLpc2cep_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoubleLpc2cep_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -237,54 +237,54 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -libLpc2cep_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/elementaryFunctions/includes \ - -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/signalProcessing/includes +libLpc2cep_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/elementaryFunctions/includes \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/matrixOperations/includes \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/signalProcessing/includes instdir = $(top_builddir)/lib pkglib_LTLIBRARIES = libLpc2cep.la HEAD = ../includes/lpc2cep.h libLpc2cep_la_SOURCES = $(HEAD) \ - slpc2cepa.c \ - dlpc2cepa.c \ - clpc2cepa.c \ - zlpc2cepa.c - -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/lib/lapack/libscilapack.la \ - $(top_builddir)/lib/blas/libsciblas.la \ - $(top_builddir)/elementaryFunctions/log/libLog.la \ - $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ - $(top_builddir)/elementaryFunctions/log1p/libLog1p.la \ - $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la \ - $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/conj/libConj.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ - $(top_builddir)/auxiliaryFunctions/sign/libSign.la \ - $(top_builddir)/operations/addition/libAddition.la \ - $(top_builddir)/operations/subtraction/libSubtraction.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la \ - $(top_builddir)/matrixOperations/multiplication/libMatrixMultiplication.la \ - $(top_builddir)/matrixOperations/transpose/libMatrixTranspose.la \ - $(top_builddir)/matrixOperations/inversion/libMatrixInversion.la \ - $(top_builddir)/matrixOperations/logm/libLogm.la\ - $(top_builddir)/matrixOperations/spec2/libSpec2.la\ - $(top_builddir)/matrixOperations/zeros/libMatrixZeros.la\ - $(top_builddir)/signalProcessing/fft/libFft.la \ - $(top_builddir)/signalProcessing/ifft/libIfft.la \ - $(top_builddir)/signalProcessing/lpc2cep/libLpc2cep.la \ - @LIBMATH@ - -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/elementaryFunctions/includes \ - -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/matrixOperations/includes \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/signalProcessing/includes + slpc2cepa.c \ + dlpc2cepa.c \ + clpc2cepa.c \ + zlpc2cepa.c + +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/fortran/blas/libsciblas.la \ + $(top_builddir)/src/c/elementaryFunctions/log/libLog.la \ + $(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \ + $(top_builddir)/src/c/elementaryFunctions/log1p/libLog1p.la \ + $(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.la \ + $(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \ + $(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \ + $(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/c/operations/subtraction/libSubtraction.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ + $(top_builddir)/src/c/matrixOperations/multiplication/libMatrixMultiplication.la \ + $(top_builddir)/src/c/matrixOperations/transpose/libMatrixTranspose.la \ + $(top_builddir)/src/c/matrixOperations/inversion/libMatrixInversion.la \ + $(top_builddir)/src/c/matrixOperations/logm/libLogm.la\ + $(top_builddir)/src/c/matrixOperations/spec2/libSpec2.la\ + $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la\ + $(top_builddir)/src/c/signalProcessing/fft/libFft.la \ + $(top_builddir)/src/c/signalProcessing/ifft/libIfft.la \ + $(top_builddir)/src/c/signalProcessing/lpc2cep/libLpc2cep.la \ + @LIBMATH@ + +check_INCLUDES = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/elementaryFunctions/includes \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/matrixOperations/includes \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/signalProcessing/includes testDoubleLpc2cep_SOURCES = testDoubleLpc2cep.c testDoubleLpc2cep_LDADD = $(check_LDADD) @@ -305,9 +305,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign signalProcessing/lpc2cep/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/signalProcessing/lpc2cep/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign signalProcessing/lpc2cep/Makefile + $(AUTOMAKE) --foreign src/c/signalProcessing/lpc2cep/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/c/type/Makefile.in b/src/c/type/Makefile.in index bc3d185e..5040c108 100644 --- a/src/c/type/Makefile.in +++ b/src/c/type/Makefile.in @@ -34,7 +34,7 @@ build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = testDoubleComplex$(EXEEXT) testFloatComplex$(EXEEXT) TESTS = testDoubleComplex$(EXEEXT) testFloatComplex$(EXEEXT) -subdir = type +subdir = src/c/type DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -234,9 +234,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign type/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/type/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign type/Makefile + $(AUTOMAKE) --foreign src/c/type/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ |