From 9095bd3f97a694a4af6fa2239ce02fe4b0236308 Mon Sep 17 00:00:00 2001
From: jofret
Date: Tue, 9 Sep 2008 12:20:41 +0000
Subject: Moving addition and subtraction / svn:ignore prop update

---
 src/elementaryFunctions/conj/Makefile.am | 15 ++++++++-------
 src/elementaryFunctions/conj/Makefile.in | 13 +++++++------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/elementaryFunctions/conj/Makefile.am b/src/elementaryFunctions/conj/Makefile.am
index 78878d4a..22a85a74 100644
--- a/src/elementaryFunctions/conj/Makefile.am
+++ b/src/elementaryFunctions/conj/Makefile.am
@@ -11,7 +11,7 @@
 ##
 
 libConj_la_CFLAGS =	-I $(top_builddir)/type \
-				-I ../includes
+			-I ../includes
 
 instdir = $(top_builddir)/lib
 
@@ -20,16 +20,17 @@ pkglib_LTLIBRARIES = libConj.la
 HEAD = ../includes/conj.h
 
 libConj_la_SOURCES = 	$(HEAD) \
-				cconja.c \
-				zconja.c \
-                zconjs.c \
-                cconjs.c  
+			cconja.c \
+			zconja.c \
+			zconjs.c \
+	                cconjs.c
 
 check_PROGRAMS = 	testConj
 
-check_LDADD =   libConj.la \
-            $(top_builddir)/type/libDoubleComplex.la \
+check_LDADD =   	libConj.la \
+			$(top_builddir)/type/libDoubleComplex.la \
 			$(top_builddir)/type/libFloatComplex.la \
+			$(top_builddir)/operations/addition/libAddition.la \
 			$(top_builddir)/lib/lapack/libscilapack.la \
 			$(top_builddir)/elementaryFunctions/atan/libAtan.la \
 			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
diff --git a/src/elementaryFunctions/conj/Makefile.in b/src/elementaryFunctions/conj/Makefile.in
index 30bdc2e3..e0072212 100644
--- a/src/elementaryFunctions/conj/Makefile.in
+++ b/src/elementaryFunctions/conj/Makefile.in
@@ -194,20 +194,21 @@ target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 libConj_la_CFLAGS = -I $(top_builddir)/type \
-				-I ../includes
+			-I ../includes
 
 instdir = $(top_builddir)/lib
 pkglib_LTLIBRARIES = libConj.la
 HEAD = ../includes/conj.h
 libConj_la_SOURCES = $(HEAD) \
-				cconja.c \
-				zconja.c \
-                zconjs.c \
-                cconjs.c  
+			cconja.c \
+			zconja.c \
+			zconjs.c \
+	                cconjs.c
 
 check_LDADD = libConj.la \
-            $(top_builddir)/type/libDoubleComplex.la \
+			$(top_builddir)/type/libDoubleComplex.la \
 			$(top_builddir)/type/libFloatComplex.la \
+			$(top_builddir)/operations/addition/libAddition.la \
 			$(top_builddir)/lib/lapack/libscilapack.la \
 			$(top_builddir)/elementaryFunctions/atan/libAtan.la \
 			$(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \
-- 
cgit