Changeset 833 for trunk

Timestamp:

Apr 9, 2007, 12:09:58 AM (16 years ago)

Author:

Jari Häkkinen

Message:

Addresses #217. Fixed so that 'make distcheck' compiles but tests fail due to data file access.

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• test/Makefile.am (modified) (2 diffs)
• test/data/Makefile.am (added)
• yat/Makefile.am (modified) (1 diff)
• yat/classifier/Makefile.am (modified) (3 diffs)
• yat/random/Makefile.am (modified) (2 diffs)
• yat/regression/Makefile.am (modified) (2 diffs)
• yat/statistics/Makefile.am (modified) (2 diffs)
• yat/utility/Makefile.am (modified) (2 diffs)

trunk/configure.ac

@@ -91 +91 @@
      doc/Makefile
      test/Makefile
+     test/data/Makefile
      yat/Makefile
      yat/classifier/Makefile

trunk/test/Makefile.am

@@ -26 +26 @@
 # 02111-1307, USA.
 
+SUBDIRS = data
+
 TESTS = alignment_test averager_test                  \
   consensus_inputranker_test data_lookup_1d_test  \
@@ -40 +42 @@
 check_PROGRAMS = $(TESTS)
 
-LDADD = @top_srcdir@/$(YAT_LIB_LOCATION)/$(YAT_LIB) \
+LDADD = @top_builddir@/$(YAT_LIB_LOCATION)/$(YAT_LIB) \
     $(GSL_LIB) $(CBLAS_LIB) $(MATH_LIB)
 
-INCLUDES = -I@top_srcdir@
+AM_CPPFLAGS = -I@top_srcdir@
 
 

trunk/yat/Makefile.am

@@ -25 +25 @@
 # 02111-1307, USA.
 
-INCLUDES = @local_includes@
-
 SUBDIRS = classifier random regression statistics utility
 

trunk/yat/classifier/Makefile.am

@@ -4 +4 @@
 
 # Copyright (C) 2005, 2006 Jari Häkkinen, Markus Ringnér, Peter Johansson
-# Copyright (C) 2007 Peter Johansson
+# Copyright (C) 2007 Jari Häkkinen, Peter Johansson
 #
 # This file is part of the yat library, http://lev.thep.lu.se/trac/yat
@@ -22 +22 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
+
+AM_CPPFLAGS = -I@top_srcdir@
 
 noinst_LTLIBRARIES = libclassifier.la
@@ -54 +56 @@
   Target.cc \
   utility.cc
-
 
 include_classifierdir = $(includedir)/yat/classifier

trunk/yat/random/Makefile.am

@@ -3 +3 @@
 ## $Id$
 
-# Copyright (C) 2005, 2006 Jari Häkkinen
+# Copyright (C) 2005, 2006, 2007 Jari Häkkinen
 #
 # This file is part of the yat library, http://lev.thep.lu.se/trac/yat
@@ -22 +22 @@
 # 02111-1307, USA.
 
+AM_CPPFLAGS = -I@top_srcdir@
+
 noinst_LTLIBRARIES = librandom.la
 librandom_la_SOURCES = \

trunk/yat/regression/Makefile.am

@@ -4 +4 @@
 
 # Copyright (C) 2006 Jari Häkkinen
-# Copyright (C) 2007 Peter Johansson
+# Copyright (C) 2007 Jari Häkkinen, Peter Johansson
 #
 # This file is part of the yat library, http://lev.thep.lu.se/trac/yat
@@ -23 +23 @@
 # 02111-1307, USA.
 
+AM_CPPFLAGS = -I@top_srcdir@
+
 noinst_LTLIBRARIES = libregression.la
 libregression_la_SOURCES = KernelBox.cc KernelTriCube.cc Linear.cc  \

trunk/yat/statistics/Makefile.am

@@ -5 +5 @@
 # Copyright (C) 2005 Jari Häkkinen, Peter Johansson
 # Copyright (C) 2006 Jari Häkkinen, Markus Ringnér, Peter Johansson
-# Copyright (C) 2007 Peter Johansson
+# Copyright (C) 2007 Jari Häkkinen, Peter Johansson
 #
 # This file is part of the yat library, http://lev.thep.lu.se/trac/yat
@@ -24 +24 @@
 # 02111-1307, USA.
 
+AM_CPPFLAGS = -I@top_srcdir@
+
 noinst_LTLIBRARIES = libstatistics.la
 libstatistics_la_SOURCES = AUC.cc Averager.cc AveragerPair.cc     \

trunk/yat/utility/Makefile.am

@@ -3 +3 @@
 ## $Id: Makefile.am 281 2005-04-20 16:45:02Z peter $
 
-# Copyright (C) 2005, 2006 Jari Häkkinen, Peter Johansson
-# Copyright (C) 2007 Peter Johansson
+# Copyright (C) 2005, 2006, 2007 Jari Häkkinen, Peter Johansson
 #
 # This file is part of the yat library, http://lev.thep.lu.se/trac/yat
@@ -23 +22 @@
 # 02111-1307, USA.
 
+AM_CPPFLAGS = -I@top_srcdir@
+
 noinst_LTLIBRARIES = libutility.la
 libutility_la_SOURCES = \
   Alignment.cc FileUtil.cc kNNI.cc matrix.cc NNI.cc     \
   PCA.cc stl_utility.cc SVD.cc utility.cc vector.cc WeNNI.cc
-
 
 include_utilitydir = $(includedir)/yat/utility