From b785c4a2f3debaeabec429dbeccc6bd958b9bbb5 Mon Sep 17 00:00:00 2001 From: jofret Date: Tue, 28 Apr 2009 09:51:58 +0000 Subject: Update Autotools with new PATH --- src/c/matrixOperations/fill/Makefile.am | 28 ++++++++++++++-------------- src/c/matrixOperations/fill/Makefile.in | 18 +++++++++--------- 2 files changed, 23 insertions(+), 23 deletions(-) (limited to 'src/c/matrixOperations/fill') diff --git a/src/c/matrixOperations/fill/Makefile.am b/src/c/matrixOperations/fill/Makefile.am index 29329a53..e7506e2d 100644 --- a/src/c/matrixOperations/fill/Makefile.am +++ b/src/c/matrixOperations/fill/Makefile.am @@ -10,8 +10,8 @@ ## ## -libMatrixFill_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/matrixOperations/includes +libMatrixFill_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/matrixOperations/includes instdir = $(top_builddir)/lib @@ -19,26 +19,26 @@ pkglib_LTLIBRARIES = libMatrixFill.la HEAD = ../includes/fill.h -libMatrixFill_la_SOURCES = $(HEAD) \ +libMatrixFill_la_SOURCES = $(HEAD) \ sfilla.c \ dfilla.c \ cfilla.c \ zfilla.c - - -############ -## CHECK + + +############ +## CHECK ############ check_PROGRAMS = testDoubleFill testFloatFill -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ libMatrixFill.la -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/matrixOperations/includes +check_INCLUDES = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/matrixOperations/includes testDoubleFill_SOURCES = testDoubleFill.c testDoubleFill_LDADD = $(check_LDADD) @@ -50,6 +50,6 @@ testFloatFill_CFLAGS = $(check_INCLUDES) TESTS = testDoubleFill testFloatFill - - - + + + diff --git a/src/c/matrixOperations/fill/Makefile.in b/src/c/matrixOperations/fill/Makefile.in index 6afc3a49..17a34f78 100644 --- a/src/c/matrixOperations/fill/Makefile.in +++ b/src/c/matrixOperations/fill/Makefile.in @@ -34,7 +34,7 @@ build_triplet = @build@ host_triplet = @host@ check_PROGRAMS = testDoubleFill$(EXEEXT) testFloatFill$(EXEEXT) TESTS = testDoubleFill$(EXEEXT) testFloatFill$(EXEEXT) -subdir = matrixOperations/fill +subdir = src/c/matrixOperations/fill DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -210,8 +210,8 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -libMatrixFill_la_CFLAGS = -I $(top_builddir)/type \ - -I $(top_builddir)/matrixOperations/includes +libMatrixFill_la_CFLAGS = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/matrixOperations/includes instdir = $(top_builddir)/lib pkglib_LTLIBRARIES = libMatrixFill.la @@ -222,12 +222,12 @@ libMatrixFill_la_SOURCES = $(HEAD) \ cfilla.c \ zfilla.c -check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ +check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ + $(top_builddir)/src/c/type/libFloatComplex.la \ libMatrixFill.la -check_INCLUDES = -I $(top_builddir)/type \ - -I $(top_builddir)/matrixOperations/includes +check_INCLUDES = -I $(top_builddir)/src/c/type \ + -I $(top_builddir)/src/c/matrixOperations/includes testDoubleFill_SOURCES = testDoubleFill.c testDoubleFill_LDADD = $(check_LDADD) @@ -248,9 +248,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign matrixOperations/fill/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/matrixOperations/fill/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign matrixOperations/fill/Makefile + $(AUTOMAKE) --foreign src/c/matrixOperations/fill/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ -- cgit