summaryrefslogtreecommitdiff
path: root/src/auxiliaryFunctions
diff options
context:
space:
mode:
Diffstat (limited to 'src/auxiliaryFunctions')
-rw-r--r--src/auxiliaryFunctions/includes/pythag.h3
-rw-r--r--src/auxiliaryFunctions/pythag/Makefile.am5
-rw-r--r--src/auxiliaryFunctions/pythag/Makefile.in6
-rw-r--r--src/auxiliaryFunctions/pythag/cpythags.c1
-rw-r--r--src/auxiliaryFunctions/pythag/zpythags.c1
5 files changed, 12 insertions, 4 deletions
diff --git a/src/auxiliaryFunctions/includes/pythag.h b/src/auxiliaryFunctions/includes/pythag.h
index 424ed2e2..ecf5b11f 100644
--- a/src/auxiliaryFunctions/includes/pythag.h
+++ b/src/auxiliaryFunctions/includes/pythag.h
@@ -13,6 +13,9 @@
#ifndef __PYTHAG_H__
#define __PYTHAG_H__
+#include "floatComplex.h"
+#include "doubleComplex.h"
+#include "addition.h"
#include "sqrt.h"
/*
diff --git a/src/auxiliaryFunctions/pythag/Makefile.am b/src/auxiliaryFunctions/pythag/Makefile.am
index 4f61a033..524a4c6e 100644
--- a/src/auxiliaryFunctions/pythag/Makefile.am
+++ b/src/auxiliaryFunctions/pythag/Makefile.am
@@ -12,7 +12,8 @@
libPythag_la_CFLAGS = -I $(top_builddir)/type \
-I $(top_builddir)/auxiliaryFunctions/includes \
- -I $(top_builddir)/elementaryFunctions/includes
+ -I $(top_builddir)/elementaryFunctions/includes \
+ -I $(top_builddir)/operations/includes
instdir = $(top_builddir)/lib
@@ -33,6 +34,7 @@ HEAD = ../includes/pythag.h
check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \
-I $(top_builddir)/elementaryFunctions/includes \
+ -I $(top_builddir)/operations/includes \
-I $(top_builddir)/type
check_PROGRAMS = testPythag
@@ -46,6 +48,7 @@ testPythag_SOURCES = testPythag.h testPythag.c
testPythag_CFLAGS = $(check_INCLUDES)
testPythag_LDADD = $(top_builddir)/type/libFloatComplex.la \
$(top_builddir)/type/libDoubleComplex.la \
+ $(top_builddir)/operations/addition/libAddition.la \
$(top_builddir)/lib/lapack/libscilapack.la \
$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
diff --git a/src/auxiliaryFunctions/pythag/Makefile.in b/src/auxiliaryFunctions/pythag/Makefile.in
index 3592fcb7..61043f39 100644
--- a/src/auxiliaryFunctions/pythag/Makefile.in
+++ b/src/auxiliaryFunctions/pythag/Makefile.in
@@ -65,6 +65,7 @@ am_testPythag_OBJECTS = testPythag-testPythag.$(OBJEXT)
testPythag_OBJECTS = $(am_testPythag_OBJECTS)
testPythag_DEPENDENCIES = $(top_builddir)/type/libFloatComplex.la \
$(top_builddir)/type/libDoubleComplex.la \
+ $(top_builddir)/operations/addition/libAddition.la \
$(top_builddir)/lib/lapack/libscilapack.la \
$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
@@ -202,7 +203,8 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
libPythag_la_CFLAGS = -I $(top_builddir)/type \
-I $(top_builddir)/auxiliaryFunctions/includes \
- -I $(top_builddir)/elementaryFunctions/includes
+ -I $(top_builddir)/elementaryFunctions/includes \
+ -I $(top_builddir)/operations/includes
instdir = $(top_builddir)/lib
pkglib_LTLIBRARIES = libPythag.la
@@ -219,6 +221,7 @@ HEAD = ../includes/pythag.h
####
check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \
-I $(top_builddir)/elementaryFunctions/includes \
+ -I $(top_builddir)/operations/includes \
-I $(top_builddir)/type
@@ -229,6 +232,7 @@ testPythag_SOURCES = testPythag.h testPythag.c
testPythag_CFLAGS = $(check_INCLUDES)
testPythag_LDADD = $(top_builddir)/type/libFloatComplex.la \
$(top_builddir)/type/libDoubleComplex.la \
+ $(top_builddir)/operations/addition/libAddition.la \
$(top_builddir)/lib/lapack/libscilapack.la \
$(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \
$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
diff --git a/src/auxiliaryFunctions/pythag/cpythags.c b/src/auxiliaryFunctions/pythag/cpythags.c
index d0dcb625..b505195c 100644
--- a/src/auxiliaryFunctions/pythag/cpythags.c
+++ b/src/auxiliaryFunctions/pythag/cpythags.c
@@ -10,7 +10,6 @@
*
*/
-#include "complex.h"
#include "pythag.h"
floatComplex cpythags(floatComplex x, floatComplex y) {
diff --git a/src/auxiliaryFunctions/pythag/zpythags.c b/src/auxiliaryFunctions/pythag/zpythags.c
index ae11e962..c5ac30ad 100644
--- a/src/auxiliaryFunctions/pythag/zpythags.c
+++ b/src/auxiliaryFunctions/pythag/zpythags.c
@@ -10,7 +10,6 @@
*
*/
-#include "complex.h"
#include "pythag.h"
doubleComplex zpythags(doubleComplex x, doubleComplex y) {