summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/auxiliaryFunctions/find/Makefile6
-rw-r--r--src/auxiliaryFunctions/find/cfinda.c5
-rw-r--r--src/auxiliaryFunctions/find/dfinda.c4
-rw-r--r--src/auxiliaryFunctions/find/sfinda.c4
-rw-r--r--src/auxiliaryFunctions/find/zfinda.c5
-rw-r--r--src/auxiliaryFunctions/includes/find.h6
-rw-r--r--src/auxiliaryFunctions/includes/isEmpty.h8
-rw-r--r--src/auxiliaryFunctions/isempty/Makefile6
-rw-r--r--src/auxiliaryFunctions/isempty/cisEmptya.c9
-rw-r--r--src/auxiliaryFunctions/isempty/disEmptya.c8
-rw-r--r--src/auxiliaryFunctions/isempty/sisEmptya.c8
-rw-r--r--src/auxiliaryFunctions/isempty/zisEmptya.c9
-rw-r--r--src/auxiliaryFunctions/sign/Makefile10
13 files changed, 42 insertions, 46 deletions
diff --git a/src/auxiliaryFunctions/find/Makefile b/src/auxiliaryFunctions/find/Makefile
index ab3bb60e..8c8a7293 100644
--- a/src/auxiliaryFunctions/find/Makefile
+++ b/src/auxiliaryFunctions/find/Makefile
@@ -5,7 +5,7 @@
## Made by Bruno JOFRET <bruno.jofret@inria.fr>
##
## Started on Thu Nov 30 16:33:40 2006 jofret
-## Last update Wed Feb 14 14:07:02 2007 jofret
+## Last update Fri Feb 23 17:55:33 2007 jofret
##
## Copyright INRIA 2006
##
@@ -14,7 +14,7 @@ NAME = ../../lib/libFind.a
RM = rm -f
CC = gcc
-INCLUDE = -I ../../type -I ../../misc
+INCLUDE = -I ../../type -I ../../includes -I ../includes
LINK = -L ../../lib
CFLAGS = -Werror -Wall -pedantic -ansi $(INCLUDE) $(LINK) $(STANDARD)
AR = ar cru
@@ -25,7 +25,7 @@ SRC = sfinda.c \
cfinda.c \
zfinda.c
-HEAD = find.h
+HEAD = ../includes/find.h
OBJ = $(SRC:.c=.o)
all: $(NAME)
diff --git a/src/auxiliaryFunctions/find/cfinda.c b/src/auxiliaryFunctions/find/cfinda.c
index 19a9667f..d4dcc09e 100644
--- a/src/auxiliaryFunctions/find/cfinda.c
+++ b/src/auxiliaryFunctions/find/cfinda.c
@@ -5,13 +5,12 @@
** Made by Bruno JOFRET <bruno.jofret@inria.fr>
**
** Started on Tue Feb 13 16:46:42 2007 jofret
-** Last update Wed Feb 14 17:09:19 2007 jofret
+** Last update Fri Feb 23 17:56:35 2007 jofret
**
** Copyright INRIA 2007
*/
-#include "floatComplex.h"
-#include "notFound.h"
+#include "find.h"
int cfinda(floatComplex* z, int size) {
/* FIXME : Dummy !! */
diff --git a/src/auxiliaryFunctions/find/dfinda.c b/src/auxiliaryFunctions/find/dfinda.c
index 8241a792..cc2f363b 100644
--- a/src/auxiliaryFunctions/find/dfinda.c
+++ b/src/auxiliaryFunctions/find/dfinda.c
@@ -5,12 +5,12 @@
** Made by Bruno JOFRET <bruno.jofret@inria.fr>
**
** Started on Tue Feb 13 16:52:23 2007 jofret
-** Last update Tue Feb 13 17:13:40 2007 jofret
+** Last update Fri Feb 23 17:56:24 2007 jofret
**
** Copyright INRIA 2007
*/
-#include "notFound.h"
+#include "find.h"
int dfinda(double* x, int size) {
/* FIXME : Dummy !! */
diff --git a/src/auxiliaryFunctions/find/sfinda.c b/src/auxiliaryFunctions/find/sfinda.c
index aab853c6..bb726d38 100644
--- a/src/auxiliaryFunctions/find/sfinda.c
+++ b/src/auxiliaryFunctions/find/sfinda.c
@@ -5,12 +5,12 @@
** Made by Bruno JOFRET <bruno.jofret@inria.fr>
**
** Started on Tue Feb 13 16:53:03 2007 jofret
-** Last update Tue Feb 13 17:13:30 2007 jofret
+** Last update Fri Feb 23 17:56:15 2007 jofret
**
** Copyright INRIA 2007
*/
-#include "notFound.h"
+#include "find.h"
int sfinda(float* x, int size) {
/* FIXME : Dummy !! */
diff --git a/src/auxiliaryFunctions/find/zfinda.c b/src/auxiliaryFunctions/find/zfinda.c
index e43cfa84..85cb421e 100644
--- a/src/auxiliaryFunctions/find/zfinda.c
+++ b/src/auxiliaryFunctions/find/zfinda.c
@@ -5,13 +5,12 @@
** Made by Bruno JOFRET <bruno.jofret@inria.fr>
**
** Started on Tue Feb 13 16:51:44 2007 jofret
-** Last update Tue Feb 13 17:15:42 2007 jofret
+** Last update Fri Feb 23 17:56:02 2007 jofret
**
** Copyright INRIA 2007
*/
-#include "doubleComplex.h"
-#include "notFound.h"
+#include "find.h"
int zfinda(doubleComplex* z, int size) {
/* FIXME : Dummy !! */
diff --git a/src/auxiliaryFunctions/includes/find.h b/src/auxiliaryFunctions/includes/find.h
index 80309109..79b81f38 100644
--- a/src/auxiliaryFunctions/includes/find.h
+++ b/src/auxiliaryFunctions/includes/find.h
@@ -5,7 +5,7 @@
** Made by Bruno JOFRET <bruno.jofret@inria.fr>
**
** Started on Thu Feb 8 10:12:17 2007 jofret
-** Last update Tue Feb 13 17:06:30 2007 jofret
+** Last update Fri Feb 23 17:57:04 2007 jofret
**
** Copyright INRIA 2007
*/
@@ -13,6 +13,10 @@
#ifndef __FIND_H__
#define __FIND_H__
+#include "floatComplex.h"
+#include "doubleComplex.h"
+#include "notFound.h"
+
/*
** \brief Float Find function
*/
diff --git a/src/auxiliaryFunctions/includes/isEmpty.h b/src/auxiliaryFunctions/includes/isEmpty.h
index 40a9ad3e..5c434779 100644
--- a/src/auxiliaryFunctions/includes/isEmpty.h
+++ b/src/auxiliaryFunctions/includes/isEmpty.h
@@ -5,7 +5,7 @@
** Made by Bruno JOFRET <bruno.jofret@inria.fr>
**
** Started on Thu Feb 8 10:12:17 2007 jofret
-** Last update Wed Feb 14 14:43:53 2007 jofret
+** Last update Fri Feb 23 18:01:52 2007 jofret
**
** Copyright INRIA 2007
*/
@@ -13,7 +13,11 @@
#ifndef __IS_EMPTY_H__
#define __IS_EMPTY_H__
-#include <bool.h>
+#include <stdbool.h>
+
+#include "floatComplex.h"
+#include "doubleComplex.h"
+#include "notFound.h"
/*
** \brief Float Is Empty function
diff --git a/src/auxiliaryFunctions/isempty/Makefile b/src/auxiliaryFunctions/isempty/Makefile
index 85aff443..6786b33e 100644
--- a/src/auxiliaryFunctions/isempty/Makefile
+++ b/src/auxiliaryFunctions/isempty/Makefile
@@ -5,7 +5,7 @@
## Made by Bruno JOFRET <bruno.jofret@inria.fr>
##
## Started on Thu Nov 30 16:33:40 2006 jofret
-## Last update Wed Feb 14 14:38:13 2007 jofret
+## Last update Fri Feb 23 17:59:01 2007 jofret
##
## Copyright INRIA 2006
##
@@ -14,7 +14,7 @@ NAME = ../../lib/libIsEmpty.a
RM = rm -f
CC = gcc
-INCLUDE = -I ../../type -I ../../misc
+INCLUDE = -I ../../type -I ../../includes -I ../includes
LINK = -L ../../lib
CFLAGS = -Werror -Wall -pedantic -ansi $(INCLUDE) $(LINK) $(STANDARD)
AR = ar cru
@@ -25,7 +25,7 @@ SRC = sisEmptya.c \
cisEmptya.c \
zisEmptya.c
-HEAD = isEmpty.h
+HEAD = ../includes/isEmpty.h
OBJ = $(SRC:.c=.o)
all: $(NAME)
diff --git a/src/auxiliaryFunctions/isempty/cisEmptya.c b/src/auxiliaryFunctions/isempty/cisEmptya.c
index bbaa71ea..3d40e10f 100644
--- a/src/auxiliaryFunctions/isempty/cisEmptya.c
+++ b/src/auxiliaryFunctions/isempty/cisEmptya.c
@@ -5,16 +5,13 @@
** Made by Bruno JOFRET <bruno.jofret@inria.fr>
**
** Started on Wed Feb 14 15:33:30 2007 jofret
-** Last update Wed Feb 14 15:35:29 2007 jofret
+** Last update Fri Feb 23 18:01:22 2007 jofret
**
** Copyright INRIA 2007
*/
-#include <stdbool.h>
-#include "notFound.h"
-#include "floatComplex.h"
-
-int cfinda(floatComplex*, int);
+#include "isEmpty.h"
+#include "find.h"
bool cisEmptya(floatComplex* x, int size) {
if (cfinda(x, size) == NOT_FOUND) {
diff --git a/src/auxiliaryFunctions/isempty/disEmptya.c b/src/auxiliaryFunctions/isempty/disEmptya.c
index 985d057e..5871e1ca 100644
--- a/src/auxiliaryFunctions/isempty/disEmptya.c
+++ b/src/auxiliaryFunctions/isempty/disEmptya.c
@@ -5,15 +5,13 @@
** Made by Bruno JOFRET <bruno.jofret@inria.fr>
**
** Started on Wed Feb 14 15:29:27 2007 jofret
-** Last update Thu Feb 15 16:35:20 2007 jofret
+** Last update Fri Feb 23 18:00:53 2007 jofret
**
** Copyright INRIA 2007
*/
-#include <stdbool.h>
-#include "notFound.h"
-
-int dfinda(double*, int);
+#include "isEmpty.h"
+#include "find.h"
bool disEmptya(double* x, int size) {
if (dfinda(x, size) == NOT_FOUND) {
diff --git a/src/auxiliaryFunctions/isempty/sisEmptya.c b/src/auxiliaryFunctions/isempty/sisEmptya.c
index c98fce46..e69a2fac 100644
--- a/src/auxiliaryFunctions/isempty/sisEmptya.c
+++ b/src/auxiliaryFunctions/isempty/sisEmptya.c
@@ -5,15 +5,13 @@
** Made by Bruno JOFRET <bruno.jofret@inria.fr>
**
** Started on Wed Feb 14 14:59:33 2007 jofret
-** Last update Thu Feb 15 16:53:35 2007 jofret
+** Last update Fri Feb 23 18:00:31 2007 jofret
**
** Copyright INRIA 2007
*/
-#include <stdbool.h>
-#include "notFound.h"
-
-extern int sfinda(float*, int);
+#include "isEmpty.h"
+#include "find.h"
bool sisEmptya(float* x, int size) {
if (sfinda(x, size) == NOT_FOUND) {
diff --git a/src/auxiliaryFunctions/isempty/zisEmptya.c b/src/auxiliaryFunctions/isempty/zisEmptya.c
index 02e0ce53..65617be3 100644
--- a/src/auxiliaryFunctions/isempty/zisEmptya.c
+++ b/src/auxiliaryFunctions/isempty/zisEmptya.c
@@ -5,16 +5,13 @@
** Made by Bruno JOFRET <bruno.jofret@inria.fr>
**
** Started on Wed Feb 14 15:34:28 2007 jofret
-** Last update Wed Feb 14 15:40:02 2007 jofret
+** Last update Fri Feb 23 17:59:54 2007 jofret
**
** Copyright INRIA 2007
*/
-#include <stdbool.h>
-#include "notFound.h"
-#include "doubleComplex.h"
-
-int zfinda(doubleComplex*, int);
+#include "isEmpty.h"
+#include "find.h"
bool zisEmptya(doubleComplex* x, int size) {
if (zfinda(x, size) == NOT_FOUND) {
diff --git a/src/auxiliaryFunctions/sign/Makefile b/src/auxiliaryFunctions/sign/Makefile
index d6d1dd7d..0d3450c8 100644
--- a/src/auxiliaryFunctions/sign/Makefile
+++ b/src/auxiliaryFunctions/sign/Makefile
@@ -5,7 +5,7 @@
## Made by Bruno JOFRET <bruno.jofret@inria.fr>
##
## Started on Thu Nov 30 16:33:40 2006 jofret
-## Last update Thu Feb 8 10:11:59 2007 jofret
+## Last update Fri Feb 23 17:54:40 2007 jofret
##
## Copyright INRIA 2006
##
@@ -14,16 +14,16 @@ NAME = ../../lib/libSign.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
SRC = ssigns.c \
dsigns.c
-HEAD = sign.h
+HEAD = ../includes/sign.h
OBJ = $(SRC:.c=.o)
all: $(NAME)