diff options
author | jofret | 2009-04-28 09:16:15 +0000 |
---|---|---|
committer | jofret | 2009-04-28 09:16:15 +0000 |
commit | 287461d8ab1a3aa5370e4701c12678ec78b2f44e (patch) | |
tree | dd5670184264b1928817b543f9cfbdac10a9dc34 /src | |
parent | 8e9c9741e9af54ce2bf119efc419b73df40edca6 (diff) | |
download | scilab2c-287461d8ab1a3aa5370e4701c12678ec78b2f44e.tar.gz scilab2c-287461d8ab1a3aa5370e4701c12678ec78b2f44e.tar.bz2 scilab2c-287461d8ab1a3aa5370e4701c12678ec78b2f44e.zip |
Update Autotools with new PATH
Diffstat (limited to 'src')
27 files changed, 356 insertions, 346 deletions
diff --git a/src/c/auxiliaryFunctions/Makefile.in b/src/c/auxiliaryFunctions/Makefile.in index d2e28b65..9415687a 100644 --- a/src/c/auxiliaryFunctions/Makefile.in +++ b/src/c/auxiliaryFunctions/Makefile.in @@ -31,7 +31,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -subdir = auxiliaryFunctions +subdir = src/c/auxiliaryFunctions DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -199,9 +199,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign auxiliaryFunctions/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/auxiliaryFunctions/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign auxiliaryFunctions/Makefile + $(AUTOMAKE) --foreign src/c/auxiliaryFunctions/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/c/auxiliaryFunctions/abs/Makefile.am b/src/c/auxiliaryFunctions/abs/Makefile.am index 88240c22..5ed377e4 100644 --- a/src/c/auxiliaryFunctions/abs/Makefile.am +++ b/src/c/auxiliaryFunctions/abs/Makefile.am @@ -10,9 +10,9 @@ ## ## -libAbs_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/elementaryFunctions/includes +libAbs_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/elementaryFunctions/includes instdir = $(top_builddir)/lib @@ -35,18 +35,18 @@ HEAD = ../includes/abs.h # Checking Part #### -check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/elementaryFunctions/includes \ - -I $(top_builddir)/type +check_INCLUDES = -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/elementaryFunctions/includes \ + -I $(top_builddir)/src/c/type -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/operations/addition/libAddition.la \ - $(top_builddir)/lib/lapack/libscilapack.la \ - $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la \ +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \ + $(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \ + $(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ @LIBMATH@ check_PROGRAMS = testFloatAbs testDoubleAbs diff --git a/src/c/auxiliaryFunctions/abs/Makefile.in b/src/c/auxiliaryFunctions/abs/Makefile.in index dcd9e3a8..4973a343 100644 --- a/src/c/auxiliaryFunctions/abs/Makefile.in +++ b/src/c/auxiliaryFunctions/abs/Makefile.in @@ -34,7 +34,7 @@ build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = testFloatAbs$(EXEEXT) testDoubleAbs$(EXEEXT) TESTS = testFloatAbs$(EXEEXT) testDoubleAbs$(EXEEXT) -subdir = auxiliaryFunctions/abs +subdir = src/c/auxiliaryFunctions/abs DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -64,14 +64,14 @@ libAbs_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ am_testDoubleAbs_OBJECTS = testDoubleAbs-testDoubleAbs.$(OBJEXT) testDoubleAbs_OBJECTS = $(am_testDoubleAbs_OBJECTS) -am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/operations/addition/libAddition.la \ - $(top_builddir)/lib/lapack/libscilapack.la \ - $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la +am__DEPENDENCIES_1 = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \ + $(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \ + $(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la testDoubleAbs_DEPENDENCIES = $(am__DEPENDENCIES_1) testDoubleAbs_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleAbs_CFLAGS) \ @@ -219,9 +219,9 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -libAbs_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/elementaryFunctions/includes +libAbs_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/elementaryFunctions/includes instdir = $(top_builddir)/lib pkglib_LTLIBRARIES = libAbs.la @@ -240,18 +240,18 @@ HEAD = ../includes/abs.h #### # Checking Part #### -check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/elementaryFunctions/includes \ - -I $(top_builddir)/type - -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/operations/addition/libAddition.la \ - $(top_builddir)/lib/lapack/libscilapack.la \ - $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la \ +check_INCLUDES = -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/elementaryFunctions/includes \ + -I $(top_builddir)/src/c/type + +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \ + $(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \ + $(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ @LIBMATH@ @@ -277,9 +277,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign auxiliaryFunctions/abs/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/auxiliaryFunctions/abs/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign auxiliaryFunctions/abs/Makefile + $(AUTOMAKE) --foreign src/c/auxiliaryFunctions/abs/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/c/auxiliaryFunctions/conj/Makefile.am b/src/c/auxiliaryFunctions/conj/Makefile.am index 766a7082..d3719bfb 100644 --- a/src/c/auxiliaryFunctions/conj/Makefile.am +++ b/src/c/auxiliaryFunctions/conj/Makefile.am @@ -10,7 +10,7 @@ ## ## -libConj_la_CFLAGS = -I $(top_builddir)/type \ +libConj_la_CFLAGS = -I $(top_builddir)/src/c/type \ -I ../includes instdir = $(top_builddir)/lib @@ -28,10 +28,10 @@ libConj_la_SOURCES = $(HEAD) \ check_PROGRAMS = testConj check_LDADD = libConj.la \ - $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/operations/addition/libAddition.la - + $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la + check_INCLUDES = -I $(top_builddir)/type \ diff --git a/src/c/auxiliaryFunctions/conj/Makefile.in b/src/c/auxiliaryFunctions/conj/Makefile.in index b4e7773e..703f2c3b 100644 --- a/src/c/auxiliaryFunctions/conj/Makefile.in +++ b/src/c/auxiliaryFunctions/conj/Makefile.in @@ -34,7 +34,7 @@ build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = testConj$(EXEEXT) TESTS = testConj$(EXEEXT) -subdir = auxiliaryFunctions/conj +subdir = src/c/auxiliaryFunctions/conj DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -201,7 +201,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -libConj_la_CFLAGS = -I $(top_builddir)/type \ +libConj_la_CFLAGS = -I $(top_builddir)/src/c/type \ -I ../includes instdir = $(top_builddir)/lib @@ -214,9 +214,9 @@ libConj_la_SOURCES = $(HEAD) \ cconjs.c check_LDADD = libConj.la \ - $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/operations/addition/libAddition.la + $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la check_INCLUDES = -I $(top_builddir)/type \ -I ../includes @@ -237,9 +237,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign auxiliaryFunctions/conj/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/auxiliaryFunctions/conj/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign auxiliaryFunctions/conj/Makefile + $(AUTOMAKE) --foreign src/c/auxiliaryFunctions/conj/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/c/auxiliaryFunctions/find/Makefile.am b/src/c/auxiliaryFunctions/find/Makefile.am index 751d8f69..622cc20b 100644 --- a/src/c/auxiliaryFunctions/find/Makefile.am +++ b/src/c/auxiliaryFunctions/find/Makefile.am @@ -31,8 +31,8 @@ HEAD = ../includes/find.h \ # Checking Part #### -check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/type +check_INCLUDES = -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/type check_PROGRAMS = testFind @@ -43,7 +43,7 @@ TESTS = testFind # testFind_SOURCES = testFind.h testFind.c testFind_CFLAGS = $(check_INCLUDES) -testFind_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/auxiliaryFunctions/find/libFind.la \ +testFind_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/auxiliaryFunctions/find/libFind.la \ @LIBMATH@ diff --git a/src/c/auxiliaryFunctions/find/Makefile.in b/src/c/auxiliaryFunctions/find/Makefile.in index a6195b37..3d3999ad 100644 --- a/src/c/auxiliaryFunctions/find/Makefile.in +++ b/src/c/auxiliaryFunctions/find/Makefile.in @@ -34,7 +34,7 @@ build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = testFind$(EXEEXT) TESTS = testFind$(EXEEXT) -subdir = auxiliaryFunctions/find +subdir = src/c/auxiliaryFunctions/find DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -59,9 +59,10 @@ am_libFind_la_OBJECTS = $(am__objects_1) $(am__objects_2) libFind_la_OBJECTS = $(am_libFind_la_OBJECTS) am_testFind_OBJECTS = testFind-testFind.$(OBJEXT) testFind_OBJECTS = $(am_testFind_OBJECTS) -testFind_DEPENDENCIES = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/auxiliaryFunctions/find/libFind.la +testFind_DEPENDENCIES = \ + $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/auxiliaryFunctions/find/libFind.la testFind_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(testFind_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ @@ -218,8 +219,8 @@ HEAD = ../includes/find.h \ #### # Checking Part #### -check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/type +check_INCLUDES = -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/type # @@ -227,9 +228,9 @@ check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \ # testFind_SOURCES = testFind.h testFind.c testFind_CFLAGS = $(check_INCLUDES) -testFind_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/auxiliaryFunctions/find/libFind.la \ +testFind_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/auxiliaryFunctions/find/libFind.la \ @LIBMATH@ all: all-am @@ -245,9 +246,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign auxiliaryFunctions/find/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/auxiliaryFunctions/find/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign auxiliaryFunctions/find/Makefile + $(AUTOMAKE) --foreign src/c/auxiliaryFunctions/find/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/c/auxiliaryFunctions/find2d/Makefile.am b/src/c/auxiliaryFunctions/find2d/Makefile.am index 5cec551a..c1c2f2ad 100644 --- a/src/c/auxiliaryFunctions/find2d/Makefile.am +++ b/src/c/auxiliaryFunctions/find2d/Makefile.am @@ -11,7 +11,7 @@ ## AM_CFLAGS = -I ../../type \ - -I $(top_builddir)/auxiliaryFunctions/includes + -I $(top_builddir)/src/c/auxiliaryFunctions/includes instdir = $(top_builddir)/lib @@ -30,8 +30,8 @@ HEAD = ../includes/find2d.h # Checking Part #### -check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/type +check_INCLUDES = -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/type check_PROGRAMS = testFind2d @@ -42,7 +42,7 @@ TESTS = testFind2d # testFind2d_SOURCES = testFind2d.h testFind2d.c testFind2d_CFLAGS = $(check_INCLUDES) -testFind2d_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/auxiliaryFunctions/find2d/libFind2d.la \ +testFind2d_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/auxiliaryFunctions/find2d/libFind2d.la \ @LIBMATH@ diff --git a/src/c/auxiliaryFunctions/find2d/Makefile.in b/src/c/auxiliaryFunctions/find2d/Makefile.in index d1471def..cc938859 100644 --- a/src/c/auxiliaryFunctions/find2d/Makefile.in +++ b/src/c/auxiliaryFunctions/find2d/Makefile.in @@ -34,7 +34,7 @@ build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = testFind2d$(EXEEXT) TESTS = testFind2d$(EXEEXT) -subdir = auxiliaryFunctions/find2d +subdir = src/c/auxiliaryFunctions/find2d DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -59,9 +59,10 @@ am_libFind2d_la_OBJECTS = $(am__objects_1) $(am__objects_2) libFind2d_la_OBJECTS = $(am_libFind2d_la_OBJECTS) am_testFind2d_OBJECTS = testFind2d-testFind2d.$(OBJEXT) testFind2d_OBJECTS = $(am_testFind2d_OBJECTS) -testFind2d_DEPENDENCIES = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/auxiliaryFunctions/find2d/libFind2d.la +testFind2d_DEPENDENCIES = \ + $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/auxiliaryFunctions/find2d/libFind2d.la testFind2d_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testFind2d_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -201,7 +202,7 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CFLAGS = -I ../../type \ - -I $(top_builddir)/auxiliaryFunctions/includes + -I $(top_builddir)/src/c/auxiliaryFunctions/includes instdir = $(top_builddir)/lib pkglib_LTLIBRARIES = libFind2d.la @@ -216,8 +217,8 @@ HEAD = ../includes/find2d.h #### # Checking Part #### -check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/type +check_INCLUDES = -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/type # @@ -225,9 +226,9 @@ check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \ # testFind2d_SOURCES = testFind2d.h testFind2d.c testFind2d_CFLAGS = $(check_INCLUDES) -testFind2d_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/auxiliaryFunctions/find2d/libFind2d.la \ +testFind2d_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/auxiliaryFunctions/find2d/libFind2d.la \ @LIBMATH@ all: all-am @@ -243,9 +244,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign auxiliaryFunctions/find2d/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/auxiliaryFunctions/find2d/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign auxiliaryFunctions/find2d/Makefile + $(AUTOMAKE) --foreign src/c/auxiliaryFunctions/find2d/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/c/auxiliaryFunctions/frexp/Makefile.am b/src/c/auxiliaryFunctions/frexp/Makefile.am index ffb4d9ee..a9e2b0f3 100644 --- a/src/c/auxiliaryFunctions/frexp/Makefile.am +++ b/src/c/auxiliaryFunctions/frexp/Makefile.am @@ -10,11 +10,11 @@ ## ## -libFrexp_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/includes \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/elementaryFunctions/includes \ - -I $(top_builddir)/auxiliaryFunctions/includes +libFrexp_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/includes \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/elementaryFunctions/includes \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes instdir = $(top_builddir)/lib @@ -23,39 +23,39 @@ pkglib_LTLIBRARIES = libFrexp.la HEAD = ../includes/frexp.h libFrexp_la_SOURCES = $(HEAD) \ - sfrexps.c \ - dfrexps.c + sfrexps.c \ + dfrexps.c check_PROGRAMS = testFrexp -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/operations/addition/libAddition.la \ - $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/sign/libSign.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ - $(top_builddir)/auxiliaryFunctions/frexp/libFrexp.la \ - $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ - $(top_builddir)/elementaryFunctions/exp/libExp.la \ - $(top_builddir)/elementaryFunctions/cos/libCos.la \ - $(top_builddir)/elementaryFunctions/pow/libPow.la \ - $(top_builddir)/elementaryFunctions/log/libLog.la \ - $(top_builddir)/elementaryFunctions/log1p/libLog1p.la \ - $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la\ - $(top_builddir)/elementaryFunctions/cosh/libCosh.la \ - $(top_builddir)/elementaryFunctions/sin/libSin.la \ - $(top_builddir)/elementaryFunctions/sinh/libSinh.la \ - $(top_builddir)/elementaryFunctions/pow/libPow.la \ - $(top_builddir)/lib/lapack/libscilapack.la \ - $(top_builddir)/lib/blas/libsciblas.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la \ +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \ + $(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \ + $(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/src/c/auxiliaryFunctions/frexp/libFrexp.la \ + $(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \ + $(top_builddir)/src/c/elementaryFunctions/exp/libExp.la \ + $(top_builddir)/src/c/elementaryFunctions/cos/libCos.la \ + $(top_builddir)/src/c/elementaryFunctions/pow/libPow.la \ + $(top_builddir)/src/c/elementaryFunctions/log/libLog.la \ + $(top_builddir)/src/c/elementaryFunctions/log1p/libLog1p.la \ + $(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.la\ + $(top_builddir)/src/c/elementaryFunctions/cosh/libCosh.la \ + $(top_builddir)/src/c/elementaryFunctions/sin/libSin.la \ + $(top_builddir)/src/c/elementaryFunctions/sinh/libSinh.la \ + $(top_builddir)/src/c/elementaryFunctions/pow/libPow.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/fortran/blas/libsciblas.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ libFrexp.la -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/includes \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/elementaryFunctions/includes \ - -I $(top_builddir)/auxiliaryFunctions/includes +check_INCLUDES = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/includes \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/elementaryFunctions/includes \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes diff --git a/src/c/auxiliaryFunctions/frexp/Makefile.in b/src/c/auxiliaryFunctions/frexp/Makefile.in index d2182356..646457b3 100644 --- a/src/c/auxiliaryFunctions/frexp/Makefile.in +++ b/src/c/auxiliaryFunctions/frexp/Makefile.in @@ -34,7 +34,7 @@ build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = testFrexp$(EXEEXT) TESTS = testFrexp$(EXEEXT) -subdir = auxiliaryFunctions/frexp +subdir = src/c/auxiliaryFunctions/frexp DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -201,47 +201,47 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -libFrexp_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/includes \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/elementaryFunctions/includes \ - -I $(top_builddir)/auxiliaryFunctions/includes +libFrexp_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/includes \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/elementaryFunctions/includes \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes instdir = $(top_builddir)/lib pkglib_LTLIBRARIES = libFrexp.la HEAD = ../includes/frexp.h libFrexp_la_SOURCES = $(HEAD) \ - sfrexps.c \ - dfrexps.c - -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/operations/addition/libAddition.la \ - $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/sign/libSign.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ - $(top_builddir)/auxiliaryFunctions/frexp/libFrexp.la \ - $(top_builddir)/elementaryFunctions/sqrt/libSqrt.la \ - $(top_builddir)/elementaryFunctions/exp/libExp.la \ - $(top_builddir)/elementaryFunctions/cos/libCos.la \ - $(top_builddir)/elementaryFunctions/pow/libPow.la \ - $(top_builddir)/elementaryFunctions/log/libLog.la \ - $(top_builddir)/elementaryFunctions/log1p/libLog1p.la \ - $(top_builddir)/elementaryFunctions/lnp1m1/libLnp1m1.la\ - $(top_builddir)/elementaryFunctions/cosh/libCosh.la \ - $(top_builddir)/elementaryFunctions/sin/libSin.la \ - $(top_builddir)/elementaryFunctions/sinh/libSinh.la \ - $(top_builddir)/elementaryFunctions/pow/libPow.la \ - $(top_builddir)/lib/lapack/libscilapack.la \ - $(top_builddir)/lib/blas/libsciblas.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la \ + sfrexps.c \ + dfrexps.c + +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \ + $(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \ + $(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/src/c/auxiliaryFunctions/frexp/libFrexp.la \ + $(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \ + $(top_builddir)/src/c/elementaryFunctions/exp/libExp.la \ + $(top_builddir)/src/c/elementaryFunctions/cos/libCos.la \ + $(top_builddir)/src/c/elementaryFunctions/pow/libPow.la \ + $(top_builddir)/src/c/elementaryFunctions/log/libLog.la \ + $(top_builddir)/src/c/elementaryFunctions/log1p/libLog1p.la \ + $(top_builddir)/src/c/elementaryFunctions/lnp1m1/libLnp1m1.la\ + $(top_builddir)/src/c/elementaryFunctions/cosh/libCosh.la \ + $(top_builddir)/src/c/elementaryFunctions/sin/libSin.la \ + $(top_builddir)/src/c/elementaryFunctions/sinh/libSinh.la \ + $(top_builddir)/src/c/elementaryFunctions/pow/libPow.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/fortran/blas/libsciblas.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ libFrexp.la -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/includes \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/elementaryFunctions/includes \ - -I $(top_builddir)/auxiliaryFunctions/includes +check_INCLUDES = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/includes \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/elementaryFunctions/includes \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes testFrexp_SOURCES = testFrexp.c testFrexp_LDADD = $(check_LDADD) @@ -259,9 +259,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign auxiliaryFunctions/frexp/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/auxiliaryFunctions/frexp/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign auxiliaryFunctions/frexp/Makefile + $(AUTOMAKE) --foreign src/c/auxiliaryFunctions/frexp/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/c/auxiliaryFunctions/isempty/Makefile.am b/src/c/auxiliaryFunctions/isempty/Makefile.am index a7c0c0cf..20908ad4 100644 --- a/src/c/auxiliaryFunctions/isempty/Makefile.am +++ b/src/c/auxiliaryFunctions/isempty/Makefile.am @@ -25,8 +25,8 @@ HEAD = ../includes/isempty.h # Checking Part #### -check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/type +check_INCLUDES = -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/type check_PROGRAMS = testIsEmpty @@ -37,8 +37,8 @@ TESTS = testIsEmpty # testIsEmpty_SOURCES = testIsEmpty.h testIsEmpty.c testIsEmpty_CFLAGS = $(check_INCLUDES) -testIsEmpty_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/auxiliaryFunctions/isempty/libIsempty.la \ - $(top_builddir)/auxiliaryFunctions/find/libFind.la \ +testIsEmpty_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/auxiliaryFunctions/isempty/libIsempty.la \ + $(top_builddir)/src/c/auxiliaryFunctions/find/libFind.la \ @LIBMATH@ diff --git a/src/c/auxiliaryFunctions/isempty/Makefile.in b/src/c/auxiliaryFunctions/isempty/Makefile.in index 7847bb0e..d40ce690 100644 --- a/src/c/auxiliaryFunctions/isempty/Makefile.in +++ b/src/c/auxiliaryFunctions/isempty/Makefile.in @@ -34,7 +34,7 @@ build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = testIsEmpty$(EXEEXT) TESTS = testIsEmpty$(EXEEXT) -subdir = auxiliaryFunctions/isempty +subdir = src/c/auxiliaryFunctions/isempty DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -61,10 +61,11 @@ libIsempty_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ am_testIsEmpty_OBJECTS = testIsEmpty-testIsEmpty.$(OBJEXT) testIsEmpty_OBJECTS = $(am_testIsEmpty_OBJECTS) -testIsEmpty_DEPENDENCIES = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/auxiliaryFunctions/isempty/libIsempty.la \ - $(top_builddir)/auxiliaryFunctions/find/libFind.la +testIsEmpty_DEPENDENCIES = \ + $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/auxiliaryFunctions/isempty/libIsempty.la \ + $(top_builddir)/src/c/auxiliaryFunctions/find/libFind.la testIsEmpty_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testIsEmpty_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -214,8 +215,8 @@ HEAD = ../includes/isempty.h #### # Checking Part #### -check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/type +check_INCLUDES = -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/type # @@ -223,10 +224,10 @@ check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \ # testIsEmpty_SOURCES = testIsEmpty.h testIsEmpty.c testIsEmpty_CFLAGS = $(check_INCLUDES) -testIsEmpty_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/auxiliaryFunctions/isempty/libIsempty.la \ - $(top_builddir)/auxiliaryFunctions/find/libFind.la \ +testIsEmpty_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/auxiliaryFunctions/isempty/libIsempty.la \ + $(top_builddir)/src/c/auxiliaryFunctions/find/libFind.la \ @LIBMATH@ all: all-am @@ -242,9 +243,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign auxiliaryFunctions/isempty/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/auxiliaryFunctions/isempty/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign auxiliaryFunctions/isempty/Makefile + $(AUTOMAKE) --foreign src/c/auxiliaryFunctions/isempty/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/c/auxiliaryFunctions/isnan/Makefile.am b/src/c/auxiliaryFunctions/isnan/Makefile.am index ed770b96..dbe87924 100644 --- a/src/c/auxiliaryFunctions/isnan/Makefile.am +++ b/src/c/auxiliaryFunctions/isnan/Makefile.am @@ -30,8 +30,8 @@ HEAD = ../includes/isnan.h # Checking Part #### -check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/type +check_INCLUDES = -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/type check_PROGRAMS = testIsnan @@ -42,7 +42,7 @@ TESTS = testIsnan # testIsnan_SOURCES = testIsNan.h testIsNan.c testIsnan_CFLAGS = $(check_INCLUDES) -testIsnan_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/auxiliaryFunctions/isnan/libIsnan.la \ +testIsnan_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/auxiliaryFunctions/isnan/libIsnan.la \ @LIBMATH@ diff --git a/src/c/auxiliaryFunctions/isnan/Makefile.in b/src/c/auxiliaryFunctions/isnan/Makefile.in index 71d8ba2a..f7aea60d 100644 --- a/src/c/auxiliaryFunctions/isnan/Makefile.in +++ b/src/c/auxiliaryFunctions/isnan/Makefile.in @@ -34,7 +34,7 @@ build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = testIsnan$(EXEEXT) TESTS = testIsnan$(EXEEXT) -subdir = auxiliaryFunctions/isnan +subdir = src/c/auxiliaryFunctions/isnan DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -63,9 +63,10 @@ libIsnan_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ am_testIsnan_OBJECTS = testIsnan-testIsNan.$(OBJEXT) testIsnan_OBJECTS = $(am_testIsnan_OBJECTS) -testIsnan_DEPENDENCIES = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/auxiliaryFunctions/isnan/libIsnan.la +testIsnan_DEPENDENCIES = \ + $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/auxiliaryFunctions/isnan/libIsnan.la testIsnan_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testIsnan_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -220,8 +221,8 @@ HEAD = ../includes/isnan.h #### # Checking Part #### -check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/type +check_INCLUDES = -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/type # @@ -229,9 +230,9 @@ check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \ # testIsnan_SOURCES = testIsNan.h testIsNan.c testIsnan_CFLAGS = $(check_INCLUDES) -testIsnan_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/auxiliaryFunctions/isnan/libIsnan.la \ +testIsnan_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/auxiliaryFunctions/isnan/libIsnan.la \ @LIBMATH@ all: all-am @@ -247,9 +248,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign auxiliaryFunctions/isnan/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/auxiliaryFunctions/isnan/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign auxiliaryFunctions/isnan/Makefile + $(AUTOMAKE) --foreign src/c/auxiliaryFunctions/isnan/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/c/auxiliaryFunctions/length/Makefile.am b/src/c/auxiliaryFunctions/length/Makefile.am index bc6f6472..dfe0a983 100644 --- a/src/c/auxiliaryFunctions/length/Makefile.am +++ b/src/c/auxiliaryFunctions/length/Makefile.am @@ -25,8 +25,8 @@ HEAD = ../includes/length.h # Checking Part #### -check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/type +check_INCLUDES = -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/type check_PROGRAMS = testLength @@ -37,7 +37,7 @@ TESTS = testLength # testLength_SOURCES = testLength.h testLength.c testLength_CFLAGS = $(check_INCLUDES) -testLength_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/auxiliaryFunctions/length/libLength.la \ +testLength_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/auxiliaryFunctions/length/libLength.la \ @LIBMATH@ diff --git a/src/c/auxiliaryFunctions/length/Makefile.in b/src/c/auxiliaryFunctions/length/Makefile.in index 28f835be..95871d4f 100644 --- a/src/c/auxiliaryFunctions/length/Makefile.in +++ b/src/c/auxiliaryFunctions/length/Makefile.in @@ -34,7 +34,7 @@ build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = testLength$(EXEEXT) TESTS = testLength$(EXEEXT) -subdir = auxiliaryFunctions/length +subdir = src/c/auxiliaryFunctions/length DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -61,9 +61,10 @@ libLength_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ am_testLength_OBJECTS = testLength-testLength.$(OBJEXT) testLength_OBJECTS = $(am_testLength_OBJECTS) -testLength_DEPENDENCIES = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/auxiliaryFunctions/length/libLength.la +testLength_DEPENDENCIES = \ + $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/auxiliaryFunctions/length/libLength.la testLength_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testLength_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -213,8 +214,8 @@ HEAD = ../includes/length.h #### # Checking Part #### -check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/type +check_INCLUDES = -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/type # @@ -222,9 +223,9 @@ check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \ # testLength_SOURCES = testLength.h testLength.c testLength_CFLAGS = $(check_INCLUDES) -testLength_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/auxiliaryFunctions/length/libLength.la \ +testLength_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/auxiliaryFunctions/length/libLength.la \ @LIBMATH@ all: all-am @@ -240,9 +241,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign auxiliaryFunctions/length/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/auxiliaryFunctions/length/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign auxiliaryFunctions/length/Makefile + $(AUTOMAKE) --foreign src/c/auxiliaryFunctions/length/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/c/auxiliaryFunctions/pythag/Makefile.am b/src/c/auxiliaryFunctions/pythag/Makefile.am index 1d68e54a..4cf06ea4 100644 --- a/src/c/auxiliaryFunctions/pythag/Makefile.am +++ b/src/c/auxiliaryFunctions/pythag/Makefile.am @@ -10,10 +10,10 @@ ## ## -libPythag_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/elementaryFunctions/includes \ - -I $(top_builddir)/operations/includes +libPythag_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/elementaryFunctions/includes \ + -I $(top_builddir)/src/c/operations/includes instdir = $(top_builddir)/lib @@ -32,10 +32,10 @@ HEAD = ../includes/pythag.h # Checking Part #### -check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/elementaryFunctions/includes \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/type +check_INCLUDES = -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/elementaryFunctions/includes \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/type check_PROGRAMS = testPythag @@ -46,13 +46,13 @@ TESTS = testPythag # 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 \ - $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la \ +testPythag_LDADD = $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \ + $(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \ + $(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ @LIBMATH@ diff --git a/src/c/auxiliaryFunctions/pythag/Makefile.in b/src/c/auxiliaryFunctions/pythag/Makefile.in index 6acb8ea5..d49005e0 100644 --- a/src/c/auxiliaryFunctions/pythag/Makefile.in +++ b/src/c/auxiliaryFunctions/pythag/Makefile.in @@ -34,7 +34,7 @@ build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = testPythag$(EXEEXT) TESTS = testPythag$(EXEEXT) -subdir = auxiliaryFunctions/pythag +subdir = src/c/auxiliaryFunctions/pythag DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -63,15 +63,16 @@ libPythag_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ 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 \ - $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la +testPythag_DEPENDENCIES = \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \ + $(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \ + $(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la testPythag_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testPythag_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -210,10 +211,10 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ 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)/operations/includes +libPythag_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/elementaryFunctions/includes \ + -I $(top_builddir)/src/c/operations/includes instdir = $(top_builddir)/lib pkglib_LTLIBRARIES = libPythag.la @@ -228,10 +229,10 @@ HEAD = ../includes/pythag.h #### # Checking Part #### -check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/elementaryFunctions/includes \ - -I $(top_builddir)/operations/includes \ - -I $(top_builddir)/type +check_INCLUDES = -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/elementaryFunctions/includes \ + -I $(top_builddir)/src/c/operations/includes \ + -I $(top_builddir)/src/c/type # @@ -239,15 +240,15 @@ check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \ # 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 \ - $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la \ +testPythag_LDADD = $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \ + $(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \ + $(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ @LIBMATH@ all: all-am @@ -263,9 +264,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign auxiliaryFunctions/pythag/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/auxiliaryFunctions/pythag/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign auxiliaryFunctions/pythag/Makefile + $(AUTOMAKE) --foreign src/c/auxiliaryFunctions/pythag/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/c/auxiliaryFunctions/rand/Makefile.am b/src/c/auxiliaryFunctions/rand/Makefile.am index 26421b2b..5a7edb4e 100644 --- a/src/c/auxiliaryFunctions/rand/Makefile.am +++ b/src/c/auxiliaryFunctions/rand/Makefile.am @@ -34,8 +34,8 @@ HEAD = ../includes/rand.h # Checking Part #### -check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/type +check_INCLUDES = -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/type check_PROGRAMS = testRand @@ -46,7 +46,7 @@ TESTS = testRand # testRand_SOURCES = testRand.h testRand.c testRand_CFLAGS = $(check_INCLUDES) -testRand_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/auxiliaryFunctions/rand/libRand.la \ +testRand_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/auxiliaryFunctions/rand/libRand.la \ @LIBMATH@ diff --git a/src/c/auxiliaryFunctions/rand/Makefile.in b/src/c/auxiliaryFunctions/rand/Makefile.in index 1b3806f7..37cb7fb8 100644 --- a/src/c/auxiliaryFunctions/rand/Makefile.in +++ b/src/c/auxiliaryFunctions/rand/Makefile.in @@ -34,7 +34,7 @@ build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = testRand$(EXEEXT) TESTS = testRand$(EXEEXT) -subdir = auxiliaryFunctions/rand +subdir = src/c/auxiliaryFunctions/rand DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -64,9 +64,10 @@ libRand_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ am_testRand_OBJECTS = testRand-testRand.$(OBJEXT) testRand_OBJECTS = $(am_testRand_OBJECTS) -testRand_DEPENDENCIES = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/auxiliaryFunctions/rand/libRand.la +testRand_DEPENDENCIES = \ + $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/auxiliaryFunctions/rand/libRand.la testRand_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(testRand_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ @@ -225,8 +226,8 @@ HEAD = ../includes/rand.h #### # Checking Part #### -check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/type +check_INCLUDES = -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/type # @@ -234,9 +235,9 @@ check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \ # testRand_SOURCES = testRand.h testRand.c testRand_CFLAGS = $(check_INCLUDES) -testRand_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/auxiliaryFunctions/rand/libRand.la \ +testRand_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/auxiliaryFunctions/rand/libRand.la \ @LIBMATH@ all: all-am @@ -252,9 +253,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign auxiliaryFunctions/rand/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/auxiliaryFunctions/rand/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign auxiliaryFunctions/rand/Makefile + $(AUTOMAKE) --foreign src/c/auxiliaryFunctions/rand/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/c/auxiliaryFunctions/sign/Makefile.am b/src/c/auxiliaryFunctions/sign/Makefile.am index bbe1993f..4060373a 100644 --- a/src/c/auxiliaryFunctions/sign/Makefile.am +++ b/src/c/auxiliaryFunctions/sign/Makefile.am @@ -10,9 +10,9 @@ ## ## -libSign_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/elementaryFunctions/includes \ - -I $(top_builddir)/auxiliaryFunctions/includes +libSign_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/elementaryFunctions/includes \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes instdir = $(top_builddir)/lib @@ -35,9 +35,9 @@ HEAD = ../includes/sign.h # Checking Part #### -check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \ - -I $(top_builddir)/type \ - -I $(top_builddir)/auxiliaryFunctions/includes +check_INCLUDES = -I $(top_builddir)/src/c/elementaryFunctions/includes \ + -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes check_PROGRAMS = testSign @@ -48,13 +48,13 @@ TESTS = testSign # testSign_SOURCES = testSign.h testSign.c testSign_CFLAGS = $(check_INCLUDES) -testSign_LDADD = $(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/sqrt/libSqrt.la \ - $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ - $(top_builddir)/auxiliaryFunctions/sign/libSign.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la \ +testSign_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \ + $(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \ + $(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ @LIBMATH@ diff --git a/src/c/auxiliaryFunctions/sign/Makefile.in b/src/c/auxiliaryFunctions/sign/Makefile.in index 01d90898..0cbfc56d 100644 --- a/src/c/auxiliaryFunctions/sign/Makefile.in +++ b/src/c/auxiliaryFunctions/sign/Makefile.in @@ -34,7 +34,7 @@ build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = testSign$(EXEEXT) TESTS = testSign$(EXEEXT) -subdir = auxiliaryFunctions/sign +subdir = src/c/auxiliaryFunctions/sign DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -64,15 +64,16 @@ libSign_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ am_testSign_OBJECTS = testSign-testSign.$(OBJEXT) testSign_OBJECTS = $(am_testSign_OBJECTS) -testSign_DEPENDENCIES = $(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/sqrt/libSqrt.la \ - $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ - $(top_builddir)/auxiliaryFunctions/sign/libSign.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la +testSign_DEPENDENCIES = \ + $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \ + $(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \ + $(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la testSign_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(testSign_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ @@ -211,9 +212,9 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -libSign_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/elementaryFunctions/includes \ - -I $(top_builddir)/auxiliaryFunctions/includes +libSign_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/elementaryFunctions/includes \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes instdir = $(top_builddir)/lib pkglib_LTLIBRARIES = libSign.la @@ -232,9 +233,9 @@ HEAD = ../includes/sign.h #### # Checking Part #### -check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \ - -I $(top_builddir)/type \ - -I $(top_builddir)/auxiliaryFunctions/includes +check_INCLUDES = -I $(top_builddir)/src/c/elementaryFunctions/includes \ + -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/auxiliaryFunctions/includes # @@ -242,15 +243,15 @@ check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \ # testSign_SOURCES = testSign.h testSign.c testSign_CFLAGS = $(check_INCLUDES) -testSign_LDADD = $(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/sqrt/libSqrt.la \ - $(top_builddir)/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/auxiliaryFunctions/pythag/libPythag.la \ - $(top_builddir)/auxiliaryFunctions/sign/libSign.la \ - $(top_builddir)/operations/multiplication/libMultiplication.la \ +testSign_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/operations/addition/libAddition.la \ + $(top_builddir)/src/fortran/lapack/libscilapack.la \ + $(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \ + $(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \ + $(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \ + $(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \ + $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ @LIBMATH@ all: all-am @@ -266,9 +267,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign auxiliaryFunctions/sign/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/auxiliaryFunctions/sign/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign auxiliaryFunctions/sign/Makefile + $(AUTOMAKE) --foreign src/c/auxiliaryFunctions/sign/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/c/auxiliaryFunctions/size/Makefile.am b/src/c/auxiliaryFunctions/size/Makefile.am index dbb55823..fc642211 100644 --- a/src/c/auxiliaryFunctions/size/Makefile.am +++ b/src/c/auxiliaryFunctions/size/Makefile.am @@ -25,8 +25,8 @@ HEAD = ../includes/size.h # Checking Part #### -check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/type +check_INCLUDES = -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/type check_PROGRAMS = testSize @@ -37,7 +37,7 @@ TESTS = testSize # testSize_SOURCES = testSize.h testSize.c testSize_CFLAGS = $(check_INCLUDES) -testSize_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/auxiliaryFunctions/size/libSize.la \ +testSize_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/auxiliaryFunctions/size/libSize.la \ @LIBMATH@ diff --git a/src/c/auxiliaryFunctions/size/Makefile.in b/src/c/auxiliaryFunctions/size/Makefile.in index 1e91ca72..a4789188 100644 --- a/src/c/auxiliaryFunctions/size/Makefile.in +++ b/src/c/auxiliaryFunctions/size/Makefile.in @@ -34,7 +34,7 @@ build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = testSize$(EXEEXT) TESTS = testSize$(EXEEXT) -subdir = auxiliaryFunctions/size +subdir = src/c/auxiliaryFunctions/size DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -61,9 +61,10 @@ libSize_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ am_testSize_OBJECTS = testSize-testSize.$(OBJEXT) testSize_OBJECTS = $(am_testSize_OBJECTS) -testSize_DEPENDENCIES = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/auxiliaryFunctions/size/libSize.la +testSize_DEPENDENCIES = \ + $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/auxiliaryFunctions/size/libSize.la testSize_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(testSize_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ @@ -213,8 +214,8 @@ HEAD = ../includes/size.h #### # Checking Part #### -check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/type +check_INCLUDES = -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/type # @@ -222,9 +223,9 @@ check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \ # testSize_SOURCES = testSize.h testSize.c testSize_CFLAGS = $(check_INCLUDES) -testSize_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/auxiliaryFunctions/size/libSize.la \ +testSize_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/auxiliaryFunctions/size/libSize.la \ @LIBMATH@ all: all-am @@ -240,9 +241,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign auxiliaryFunctions/size/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/auxiliaryFunctions/size/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign auxiliaryFunctions/size/Makefile + $(AUTOMAKE) --foreign src/c/auxiliaryFunctions/size/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/src/c/auxiliaryFunctions/type/Makefile.am b/src/c/auxiliaryFunctions/type/Makefile.am index c4cf0e7f..792315a0 100644 --- a/src/c/auxiliaryFunctions/type/Makefile.am +++ b/src/c/auxiliaryFunctions/type/Makefile.am @@ -25,8 +25,8 @@ HEAD = ../includes/type.h # Checking Part #### -check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/type +check_INCLUDES = -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/type check_PROGRAMS = testType @@ -37,7 +37,7 @@ TESTS = testType # testType_SOURCES = testType.h testType.c testType_CFLAGS = $(check_INCLUDES) -testType_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/auxiliaryFunctions/type/libType.la \ +testType_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/auxiliaryFunctions/type/libType.la \ @LIBMATH@ diff --git a/src/c/auxiliaryFunctions/type/Makefile.in b/src/c/auxiliaryFunctions/type/Makefile.in index 4ed00bc8..b255959b 100644 --- a/src/c/auxiliaryFunctions/type/Makefile.in +++ b/src/c/auxiliaryFunctions/type/Makefile.in @@ -34,7 +34,7 @@ build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = testType$(EXEEXT) TESTS = testType$(EXEEXT) -subdir = auxiliaryFunctions/type +subdir = src/c/auxiliaryFunctions/type DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -61,9 +61,10 @@ libType_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ am_testType_OBJECTS = testType-testType.$(OBJEXT) testType_OBJECTS = $(am_testType_OBJECTS) -testType_DEPENDENCIES = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/auxiliaryFunctions/type/libType.la +testType_DEPENDENCIES = \ + $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/auxiliaryFunctions/type/libType.la testType_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(testType_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ @@ -213,8 +214,8 @@ HEAD = ../includes/type.h #### # Checking Part #### -check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \ - -I $(top_builddir)/type +check_INCLUDES = -I $(top_builddir)/src/c/auxiliaryFunctions/includes \ + -I $(top_builddir)/src/c/type # @@ -222,9 +223,9 @@ check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \ # testType_SOURCES = testType.h testType.c testType_CFLAGS = $(check_INCLUDES) -testType_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/auxiliaryFunctions/type/libType.la \ +testType_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ + $(top_builddir)/src/c/auxiliaryFunctions/type/libType.la \ @LIBMATH@ all: all-am @@ -240,9 +241,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign auxiliaryFunctions/type/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/auxiliaryFunctions/type/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign auxiliaryFunctions/type/Makefile + $(AUTOMAKE) --foreign src/c/auxiliaryFunctions/type/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ |