add and remove some #include and made the modif in the makefile

21 files changed, 16 insertions, 49 deletions

diff --git a/src/signalProcessing/conv/Makefile.am b/src/signalProcessing/conv/Makefile.am
index c5196231..4ab5a6bc 100644
--- a/src/signalProcessing/conv/Makefile.am
+++ b/src/signalProcessing/conv/Makefile.am
@@ -15,8 +15,6 @@
 
 libConv_la_CFLAGS =	-I $(top_builddir)/type \
 			-I $(top_builddir)/operations/includes \
-			-I $(top_builddir)/signalProcessing/fft \
-			-I $(top_builddir)/signalProcessing/ifft \
 			-I $(top_builddir)/signalProcessing/includes
 
 
@@ -25,9 +23,7 @@ instdir = $(top_builddir)/lib
 
 pkglib_LTLIBRARIES = libConv.la
 
-HEAD = ../includes/conv.h \
-       ../fft/fft_internal.h \
-       ../ifft/fft_internal.h 
+HEAD = ../includes/conv.h
 	
 
 
diff --git a/src/signalProcessing/conv/Makefile.in b/src/signalProcessing/conv/Makefile.in
index 8fa120c7..1fea8f10 100644
--- a/src/signalProcessing/conv/Makefile.in
+++ b/src/signalProcessing/conv/Makefile.in
@@ -203,16 +203,11 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 libConv_la_CFLAGS = -I $(top_builddir)/type \
 			-I $(top_builddir)/operations/includes \
-			-I $(top_builddir)/signalProcessing/fft \
-			-I $(top_builddir)/signalProcessing/ifft \
 			-I $(top_builddir)/signalProcessing/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libConv.la
-HEAD = ../includes/conv.h \
-       ../fft/fft_internal.h \
-       ../ifft/fft_internal.h 
-
+HEAD = ../includes/conv.h
 libConv_la_SOURCES = $(HEAD) \
 					sconva.c \
 					dconva.c \
diff --git a/src/signalProcessing/fft/dfft2.c b/src/signalProcessing/fft/dfft2.c
index aff76b29..9aa0bd53 100644
--- a/src/signalProcessing/fft/dfft2.c
+++ b/src/signalProcessing/fft/dfft2.c
@@ -11,8 +11,7 @@
  */
 
 #include "fft_internal.h"
-#include <stdlib.h>
-#include <stdio.h>
+
 void dfft2 ( double* a , double* b , int nseg , int n , int nspn , int isn , int ierr )
 {
 
diff --git a/src/signalProcessing/fft/dfftmx.c b/src/signalProcessing/fft/dfftmx.c
index 3c104ec7..e490ed22 100644
--- a/src/signalProcessing/fft/dfftmx.c
+++ b/src/signalProcessing/fft/dfftmx.c
@@ -10,8 +10,6 @@
  *
  */
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <math.h>
 #include "max.h"
 #include "min.h"
diff --git a/src/signalProcessing/fft/fft842.c b/src/signalProcessing/fft/fft842.c
index e110ba9c..162490fe 100644
--- a/src/signalProcessing/fft/fft842.c
+++ b/src/signalProcessing/fft/fft842.c
@@ -11,7 +11,6 @@
  */
 
 #include "fft_internal.h"
-#include <stdio.h>
 
 
 
diff --git a/src/signalProcessing/fft/r2tx.c b/src/signalProcessing/fft/r2tx.c
index 74039da5..fd459291 100644
--- a/src/signalProcessing/fft/r2tx.c
+++ b/src/signalProcessing/fft/r2tx.c
@@ -11,7 +11,6 @@
  */
 
 #include "fft_internal.h"
-#include <stdio.h>
 /*
 ** radix 2 iteration subroutine
 */
diff --git a/src/signalProcessing/fft/r8tx.c b/src/signalProcessing/fft/r8tx.c
index bae32639..bafb4698 100644
--- a/src/signalProcessing/fft/r8tx.c
+++ b/src/signalProcessing/fft/r8tx.c
@@ -13,7 +13,6 @@
 
 #include "fft_internal.h"
 #include <math.h>
-#include <stdio.h>
 
 
 
diff --git a/src/signalProcessing/fft/zfftma.c b/src/signalProcessing/fft/zfftma.c
index ee7f638f..5cdbf40a 100644
--- a/src/signalProcessing/fft/zfftma.c
+++ b/src/signalProcessing/fft/zfftma.c
@@ -11,13 +11,12 @@
  */
 #define FFT842 1
 #define DFFT2  0
-#include <stdio.h>
+
 #include <math.h>
-#include <stdlib.h>
 #include "fft.h"
 #include "lapack.h"
 #include "fft_internal.h"
-#include <stdio.h>
+
 void zfftma ( doubleComplex* in , int rows, int cols, doubleComplex* out)
 {
 
diff --git a/src/signalProcessing/hilbert/Makefile.am b/src/signalProcessing/hilbert/Makefile.am
index ce64dea3..d4bcbde5 100644
--- a/src/signalProcessing/hilbert/Makefile.am
+++ b/src/signalProcessing/hilbert/Makefile.am
@@ -15,8 +15,6 @@
 
 libHilbert_la_CFLAGS =	-I $(top_builddir)/type \
 			-I $(top_builddir)/operations/includes \
-			-I $(top_builddir)/signalProcessing/fft \
-			-I $(top_builddir)/signalProcessing/ifft \
 			-I $(top_builddir)/signalProcessing/includes
 
 
@@ -25,9 +23,7 @@ instdir = $(top_builddir)/lib
 
 pkglib_LTLIBRARIES = libHilbert.la
 
-HEAD = ../includes/hilbert.h \
-       ../fft/fft_internal.h \
-       ../ifft/fft_internal.h 
+HEAD = ../includes/hilbert.h
 	
 
 
diff --git a/src/signalProcessing/hilbert/Makefile.in b/src/signalProcessing/hilbert/Makefile.in
index adc3359f..9ab83663 100644
--- a/src/signalProcessing/hilbert/Makefile.in
+++ b/src/signalProcessing/hilbert/Makefile.in
@@ -196,16 +196,11 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 libHilbert_la_CFLAGS = -I $(top_builddir)/type \
 			-I $(top_builddir)/operations/includes \
-			-I $(top_builddir)/signalProcessing/fft \
-			-I $(top_builddir)/signalProcessing/ifft \
 			-I $(top_builddir)/signalProcessing/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libHilbert.la
-HEAD = ../includes/hilbert.h \
-       ../fft/fft_internal.h \
-       ../ifft/fft_internal.h 
-
+HEAD = ../includes/hilbert.h
 libHilbert_la_SOURCES = $(HEAD) \
 					shilberta.c \
 					dhilberta.c \
diff --git a/src/signalProcessing/ifft/difft2.c b/src/signalProcessing/ifft/difft2.c
index c89856f2..f8488d3b 100644
--- a/src/signalProcessing/ifft/difft2.c
+++ b/src/signalProcessing/ifft/difft2.c
@@ -11,7 +11,6 @@
  */
 
 #include "ifft_internal.h"
-#include <stdlib.h>
 
 void difft2 ( double* a , double* b , int nseg , int n , int nspn , int isn , int ierr )
 {
diff --git a/src/signalProcessing/ifft/difftmx.c b/src/signalProcessing/ifft/difftmx.c
index a3760cec..29604c49 100644
--- a/src/signalProcessing/ifft/difftmx.c
+++ b/src/signalProcessing/ifft/difftmx.c
@@ -10,8 +10,6 @@
  *
  */
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <math.h>
 #include "max.h"
 #include "min.h"
diff --git a/src/signalProcessing/ifft/ifft842.c b/src/signalProcessing/ifft/ifft842.c
index 41010821..75f6e1ca 100644
--- a/src/signalProcessing/ifft/ifft842.c
+++ b/src/signalProcessing/ifft/ifft842.c
@@ -11,7 +11,6 @@
  */
 
 #include "ifft_internal.h"
-#include <stdio.h>
 
 
 
diff --git a/src/signalProcessing/ifft/ir2tx.c b/src/signalProcessing/ifft/ir2tx.c
index 35174be0..6602f776 100644
--- a/src/signalProcessing/ifft/ir2tx.c
+++ b/src/signalProcessing/ifft/ir2tx.c
@@ -11,7 +11,6 @@
  */
 
 #include "ifft_internal.h"
-#include <stdio.h>
 /*
 ** radix 2 iteration subroutine
 */
diff --git a/src/signalProcessing/ifft/ir8tx.c b/src/signalProcessing/ifft/ir8tx.c
index 6c053c00..f628c1cb 100644
--- a/src/signalProcessing/ifft/ir8tx.c
+++ b/src/signalProcessing/ifft/ir8tx.c
@@ -13,7 +13,6 @@
 
 #include "ifft_internal.h"
 #include <math.h>
-#include <stdio.h>
 
 
 
diff --git a/src/signalProcessing/ifft/testDoubleIfft.c b/src/signalProcessing/ifft/testDoubleIfft.c
index 51e41f9e..3f304789 100644
--- a/src/signalProcessing/ifft/testDoubleIfft.c
+++ b/src/signalProcessing/ifft/testDoubleIfft.c
@@ -12,6 +12,7 @@
 
 #include <assert.h>
 #include <stdio.h>
+#include <math.h>
 #include "ifft.h"
 
 
diff --git a/src/signalProcessing/ifft/testFloatIfft.c b/src/signalProcessing/ifft/testFloatIfft.c
index 55b350e0..af73d6ac 100644
--- a/src/signalProcessing/ifft/testFloatIfft.c
+++ b/src/signalProcessing/ifft/testFloatIfft.c
@@ -13,6 +13,7 @@
 
 #include <assert.h>
 #include <stdio.h>
+#include <math.h>
 #include "ifft.h"
 
 #define ROW    1
diff --git a/src/signalProcessing/ifft/zifftma.c b/src/signalProcessing/ifft/zifftma.c
index e5288597..316d3f5b 100644
--- a/src/signalProcessing/ifft/zifftma.c
+++ b/src/signalProcessing/ifft/zifftma.c
@@ -12,8 +12,11 @@
 #define IFFT842 1
 #define DFFT2  0
 
+#include <math.h>
 #include "ifft.h"
-#include <stdio.h>
+#include "lapack.h"
+#include "ifft_internal.h"
+
 
 void zifftma ( doubleComplex* in , int rows, int cols, doubleComplex* out)
 {
diff --git a/src/signalProcessing/includes/ifft.h b/src/signalProcessing/includes/ifft.h
index 2f857e6e..ba6e8848 100644
--- a/src/signalProcessing/includes/ifft.h
+++ b/src/signalProcessing/includes/ifft.h
@@ -13,12 +13,9 @@
 #ifndef __IFFT_H__
 #define __IFFT_H__
 
-#include <math.h>
 #include "floatComplex.h"
 #include "doubleComplex.h"
-#include "blas.h"
-#include "lapack.h"
-#include "ifft_internal.h"
+
 
 /*
 ** compute the inverse fast fourier transform of a vector
diff --git a/src/signalProcessing/lpc2cep/Makefile.am b/src/signalProcessing/lpc2cep/Makefile.am
index 196d2a98..8eee27a6 100644
--- a/src/signalProcessing/lpc2cep/Makefile.am
+++ b/src/signalProcessing/lpc2cep/Makefile.am
@@ -16,9 +16,7 @@
 libLpc2cep_la_CFLAGS =	-I $(top_builddir)/type \
 			-I $(top_builddir)/matrixOperations/includes \
 			-I $(top_builddir)/operations/includes \
-			-I $(top_builddir)/signalProcessing/includes \
-			-I $(top_builddir)/signalProcessing/fft \
-			-I $(top_builddir)/signalProcessing/ifft
+			-I $(top_builddir)/signalProcessing/includes
 
 
 instdir = $(top_builddir)/lib
diff --git a/src/signalProcessing/lpc2cep/Makefile.in b/src/signalProcessing/lpc2cep/Makefile.in
index 47d614fc..7b3acd49 100644
--- a/src/signalProcessing/lpc2cep/Makefile.in
+++ b/src/signalProcessing/lpc2cep/Makefile.in
@@ -208,9 +208,7 @@ top_srcdir = @top_srcdir@
 libLpc2cep_la_CFLAGS = -I $(top_builddir)/type \
 			-I $(top_builddir)/matrixOperations/includes \
 			-I $(top_builddir)/operations/includes \
-			-I $(top_builddir)/signalProcessing/includes \
-			-I $(top_builddir)/signalProcessing/fft \
-			-I $(top_builddir)/signalProcessing/ifft
+			-I $(top_builddir)/signalProcessing/includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libLpc2cep.la