summaryrefslogtreecommitdiff
path: root/src/c/signalProcessing/conv
diff options
context:
space:
mode:
Diffstat (limited to 'src/c/signalProcessing/conv')
-rw-r--r--src/c/signalProcessing/conv/Makefile.am52
-rw-r--r--src/c/signalProcessing/conv/Makefile.in54
2 files changed, 53 insertions, 53 deletions
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 \