diff options
author | jofret | 2007-02-23 17:07:39 +0000 |
---|---|---|
committer | jofret | 2007-02-23 17:07:39 +0000 |
commit | 870f1db45dae6e6d137b83bb4a4e5e9b47e73b89 (patch) | |
tree | 03c8aef4774ae44af3ba89781c47f6303bad42da /src/elementaryFunctions/acos | |
parent | 9d6ec22d29413e2b662acd523c1171a2228f13f6 (diff) | |
download | scilab2c-870f1db45dae6e6d137b83bb4a4e5e9b47e73b89.tar.gz scilab2c-870f1db45dae6e6d137b83bb4a4e5e9b47e73b89.tar.bz2 scilab2c-870f1db45dae6e6d137b83bb4a4e5e9b47e73b89.zip |
* src/elementaryFunctions/includes :
Add includes directory for profiling functions.
* src/elementaryFunctions/*/*.h :
Moving headers to includes.
* src/elementaryFunctions/*/*.c :
Better dependancies with includes.
* src/elementaryFunctions/*/Makedile :
Changing includes / headers / link.
Diffstat (limited to 'src/elementaryFunctions/acos')
-rw-r--r-- | src/elementaryFunctions/acos/Makefile | 10 | ||||
-rw-r--r-- | src/elementaryFunctions/acos/acos.h | 57 | ||||
-rw-r--r-- | src/elementaryFunctions/acos/cacosa.c | 6 | ||||
-rw-r--r-- | src/elementaryFunctions/acos/cacoss.c | 4 | ||||
-rw-r--r-- | src/elementaryFunctions/acos/dacosa.c | 5 | ||||
-rw-r--r-- | src/elementaryFunctions/acos/sacosa.c | 5 | ||||
-rw-r--r-- | src/elementaryFunctions/acos/zacosa.c | 6 | ||||
-rw-r--r-- | src/elementaryFunctions/acos/zacoss.c | 4 |
8 files changed, 17 insertions, 80 deletions
diff --git a/src/elementaryFunctions/acos/Makefile b/src/elementaryFunctions/acos/Makefile index 78456138..b6acc97f 100644 --- a/src/elementaryFunctions/acos/Makefile +++ b/src/elementaryFunctions/acos/Makefile @@ -5,7 +5,7 @@ ## Made by Bruno JOFRET <bruno.jofret@inria.fr> ## ## Started on Fri Jan 5 10:19:16 2007 jofret -## Last update Wed Jan 31 11:59:19 2007 jofret +## Last update Fri Feb 23 16:38:02 2007 jofret ## ## Copyright INRIA 2007 ## @@ -14,9 +14,9 @@ NAME = ../../lib/libAcos.a RM = rm -f CC = gcc -INCLUDE = ../../type -LINK = ../../lib -CFLAGS = -Werror -Wall -pedantic -ansi -I $(INCLUDE) -L $(LINK) $(STANDARD) +INCLUDE = -I ../../type -I ../includes +LINK = -L ../../lib +CFLAGS = -Werror -Wall -pedantic -ansi $(INCLUDE) $(LINK) $(STANDARD) AR = ar cru RANLIB = ranlib @@ -29,7 +29,7 @@ SRC = sacoss.c \ cacosa.c \ zacosa.c -HEAD = acos.h +HEAD = ../includes/acos.h OBJ = $(SRC:.c=.o) all: $(NAME) diff --git a/src/elementaryFunctions/acos/acos.h b/src/elementaryFunctions/acos/acos.h deleted file mode 100644 index 2f45482c..00000000 --- a/src/elementaryFunctions/acos/acos.h +++ /dev/null @@ -1,57 +0,0 @@ -/* -** -*- C -*- -** -** acos.h -** Made by Bruno JOFRET <bruno.jofret@inria.fr> -** -** Started on Fri Jan 5 10:20:35 2007 jofret -** Last update Fri Jan 5 10:21:28 2007 jofret -** -** Copyright INRIA 2007 -*/ - -/* -** Compute ArcCosine for different types . -*/ - -/* -** \brief Float ArcCosine function -*/ -float sacoss(float); - -/* -** \brief Double ArcCosine function -*/ -double dacoss(double); - -/* -** \brief Float Complex ArcCosine function -*/ -floatComplex cacoss(floatComplex); - -/* -** \brief Double Complex ArcCosine function -*/ -doubleComplex zacoss(doubleComplex); - -/* -** \brief Float Matrix ArcCosine function -*/ -void sacosa(float*, int, float*, int, int); - -/* -** \brief Double Matrix ArcCosine function -*/ -void dacosa(double*, int, double*, int, int); - -/* -** \brief Float Complex Matrix ArcCosine function -*/ -void cacosa(floatComplex*, int, floatComplex*, int, int); - -/* -** \brief Double Complex Matrix ArcCosine function -*/ -void zacosa(doubleComplex*, int, doubleComplex*, int, int); - - diff --git a/src/elementaryFunctions/acos/cacosa.c b/src/elementaryFunctions/acos/cacosa.c index 3db39792..b7e6dc51 100644 --- a/src/elementaryFunctions/acos/cacosa.c +++ b/src/elementaryFunctions/acos/cacosa.c @@ -5,14 +5,12 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Fri Jan 5 10:23:49 2007 jofret -** Last update Wed Jan 31 11:16:23 2007 jofret +** Last update Fri Feb 23 16:37:20 2007 jofret ** ** Copyright INRIA 2007 */ -#include "floatComplex.h" - -floatComplex cacoss(floatComplex); +#include "acos.h" void cacosa(floatComplex* x, int strideX, floatComplex* y, int strideY, int size) { int i = 0; diff --git a/src/elementaryFunctions/acos/cacoss.c b/src/elementaryFunctions/acos/cacoss.c index 61a90bd3..ed174fda 100644 --- a/src/elementaryFunctions/acos/cacoss.c +++ b/src/elementaryFunctions/acos/cacoss.c @@ -5,12 +5,12 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Fri Jan 5 11:29:45 2007 jofret -** Last update Wed Jan 31 11:16:14 2007 jofret +** Last update Fri Feb 23 16:37:08 2007 jofret ** ** Copyright INRIA 2007 */ -#include "floatComplex.h" +#include "acos.h" floatComplex cacoss(floatComplex z) { /* FIXME: Dummy... */ diff --git a/src/elementaryFunctions/acos/dacosa.c b/src/elementaryFunctions/acos/dacosa.c index ba3aff1c..a6d9e484 100644 --- a/src/elementaryFunctions/acos/dacosa.c +++ b/src/elementaryFunctions/acos/dacosa.c @@ -5,13 +5,12 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Fri Jan 5 11:29:20 2007 jofret -** Last update Fri Jan 5 11:29:30 2007 jofret +** Last update Fri Feb 23 16:36:57 2007 jofret ** ** Copyright INRIA 2007 */ - -double dacoss(double); +#include "acos.h" void dacosa(double* x, int strideX, double* y, int strideY, int size) { int i = 0; diff --git a/src/elementaryFunctions/acos/sacosa.c b/src/elementaryFunctions/acos/sacosa.c index f33fc4da..30a47651 100644 --- a/src/elementaryFunctions/acos/sacosa.c +++ b/src/elementaryFunctions/acos/sacosa.c @@ -5,13 +5,12 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Fri Jan 5 10:25:57 2007 jofret -** Last update Fri Jan 5 10:26:07 2007 jofret +** Last update Fri Feb 23 16:36:44 2007 jofret ** ** Copyright INRIA 2007 */ - -float sacoss(float); +#include "acos.h" void sacosa(float* x, int strideX, float* y, int strideY, int size) { int i = 0; diff --git a/src/elementaryFunctions/acos/zacosa.c b/src/elementaryFunctions/acos/zacosa.c index 3bad836c..13866008 100644 --- a/src/elementaryFunctions/acos/zacosa.c +++ b/src/elementaryFunctions/acos/zacosa.c @@ -5,14 +5,12 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Fri Jan 5 10:25:14 2007 jofret -** Last update Wed Jan 31 11:15:58 2007 jofret +** Last update Fri Feb 23 16:36:26 2007 jofret ** ** Copyright INRIA 2007 */ -#include "doubleComplex.h" - -doubleComplex zacoss(doubleComplex); +#include "acos.h" void zacosa(doubleComplex* x, int strideX, doubleComplex* y, int strideY, int size) { int i = 0; diff --git a/src/elementaryFunctions/acos/zacoss.c b/src/elementaryFunctions/acos/zacoss.c index 8cbc4c60..908b55e2 100644 --- a/src/elementaryFunctions/acos/zacoss.c +++ b/src/elementaryFunctions/acos/zacoss.c @@ -5,12 +5,12 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Fri Jan 5 10:24:38 2007 jofret -** Last update Wed Jan 31 11:15:51 2007 jofret +** Last update Fri Feb 23 16:36:16 2007 jofret ** ** Copyright INRIA 2007 */ -#include "doubleComplex.h" +#include "acos.h" doubleComplex zacoss(doubleComplex z) { /* FIXME: Dummy... */ |