Changeset 841
- Timestamp:
- Nov 30, 2008, 12:46:12 AM (14 years ago)
- Location:
- plugins/base1/se.lu.thep.wenni/trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
plugins/base1/se.lu.thep.wenni/trunk/base/base1/BaseFileConverter/Makefile.am
r825 r841 4 4 5 5 # Copyright (C) 2005, 2006 Jari Häkkinen 6 # Copyright (C) 2007 Peter Johansson6 # Copyright (C) 2007 2008 Peter Johansson 7 7 # 8 8 # This file is part of WeNNI, … … 24 24 bin_PROGRAMS = BaseFileConverter 25 25 26 AM_CPPFLAGS = $(BASECPPFLAGS) -I@top_srcdir@/lib26 AM_CPPFLAGS += $(BASECPPFLAGS) 27 27 28 LDADD = $(BASELDFLAGS) -L@top_builddir@/$(CPP_TOOLS_LIBPATH) -lc++_tools 28 AM_LDFLAGS = $(BASELDFLAGS) 29 LDADD = $(top_builddir)/$(CPP_TOOLS_LIBPATH)/libc++_tool.la -lbase 29 30 30 31 BaseFileConverter_SOURCES = BaseFileConverter.cc Clone.cc Data.cc Parameter.cc -
plugins/base1/se.lu.thep.wenni/trunk/bin/NNIFileConverter/Makefile.am
r825 r841 4 4 5 5 # Copyright (C) 2005, 2006 Jari Häkkinen 6 # Copyright (C) 2007 Peter Johansson6 # Copyright (C) 2007 2008 Peter Johansson 7 7 # 8 8 # This file is part of WeNNI, … … 24 24 bin_PROGRAMS = NNIFileConverter 25 25 26 AM_CPPFLAGS = -I@top_srcdir@/lib26 AM_CPPFLAGS += $(GSL_CPPFLAGS) -I$(top_srcdir)/lib 27 27 28 LDADD = -L@top_builddir@/$(CPP_TOOLS_LIBPATH) -lc++_tools28 LDADD = $(top_builddir)/$(CPP_TOOLS_LIBPATH)/libc++_tools.la 29 29 30 30 NNIFileConverter_SOURCES = NNIFileConverter.cc Parameter.cc -
plugins/base1/se.lu.thep.wenni/trunk/bin/nni/Makefile.am
r825 r841 4 4 5 5 # Copyright (C) 2005, 2006 Jari Häkkinen 6 # Copyright (C) 2007 Peter Johansson6 # Copyright (C) 2007 2008 Peter Johansson 7 7 # 8 8 # This file is part of WeNNI, … … 24 24 bin_PROGRAMS = nni 25 25 26 AM_CPPFLAGS = -I@top_srcdir@/lib 27 28 LDADD = -L@top_builddir@/$(CPP_TOOLS_LIBPATH) -lc++_tools 26 LDADD = $(top_builddir)/$(CPP_TOOLS_LIBPATH)/libc++_tools.la 29 27 30 28 nni_SOURCES = nni.cc Parameter.cc -
plugins/base1/se.lu.thep.wenni/trunk/configure.ac
r840 r841 41 41 # Set default programming language 42 42 AC_LANG(C++) 43 44 # Let user overide default CXXFLAGS 45 if test "${CXXFLAGS+set}" != set; then 46 CXXFLAGS="" # Setting CXXFLAGS here to prevent expansion in AC_PROG_CXX 47 fi 43 48 44 49 # Checks for programs. … … 50 55 AC_PROG_SED 51 56 52 CXXFLAGS="-Wall -pedantic"53 CPPFLAGS="-DHAVE_INLINE=1"57 AM_CXXFLAGS="-Wall -pedantic" 58 AM_CPPFLAGS="-DHAVE_INLINE=1" 54 59 AC_ARG_ENABLE(debug, 55 60 [ AS_HELP_STRING([--enable-debug], 56 61 [turn on debug options and code]) ], 57 [ CXXFLAGS="$CXXFLAGS -g -O"],58 [ CXXFLAGS="$CXXFLAGS -O3"59 CPPFLAGS="$CPPFLAGS -DNDEBUG -DGSL_RANGE_CHECK_OFF"])62 [AM_CXXFLAGS="$AM_CXXFLAGS -g -O"], 63 [AM_CXXFLAGS="$AM_CXXFLAGS -O3" 64 AM_CPPFLAGS="$AM_CPPFLAGS -DNDEBUG -DGSL_RANGE_CHECK_OFF"]) 60 65 61 66 AC_ARG_ENABLE(state, … … 95 100 OLD_CPPFLAGS=$CPPFLAGS; 96 101 OLD_LDFLAGS=$LDFLAGS; 97 LDFLAGS=" -L$BASEDIR/lib"98 AC_CHECK_LIB([base], [base_finite], [BASELDFLAGS="-L$BASEDIR/lib -lbase"],102 LDFLAGS="$LDFLAGS -L$BASEDIR/lib" 103 AC_CHECK_LIB([base], [base_finite], [BASELDFLAGS="-L$BASEDIR/lib"], 99 104 [AC_MSG_FAILURE([cannot find base library])]) 100 105 CPPFLAGS="-I$BASEDIR/include/cxx $CPPFLAGS" … … 120 125 fi 121 126 122 AC_ARG_WITH(gsl,[AS_HELP_STRING([--with-gsl=DIR], [prefix for gsl files])],123 [CPPFLAGS="-I$withval/include $CPPFLAGS"124 LDFLAGS="-L$withval/lib $LDFLAGS"], [])125 126 127 AC_SEARCH_LIBS([sqrt], [m],, AC_MSG_FAILURE([cannot find math library])) 127 128 AC_SEARCH_LIBS([ATL_ctrsv], [atlas],, 128 129 AC_SEARCH_LIBS(cblas_sdsdot, gslcblas,, 129 130 AC_MSG_FAILURE([cannot find cblas library]))) 131 132 save_LDFLAGS="$LDFLAGS" 133 AC_ARG_WITH(gsl,[AS_HELP_STRING([--with-gsl=DIR], [prefix for gsl files])], 134 [GSL_CPPFLAGS="-I$withval/include"; GSL_LDFLAGS="-L$withval/lib"]) 135 LDFLAGS="$LDFLAGS $GSL_LDFLAGS" 130 136 AC_SEARCH_LIBS([gsl_vector_alloc], [gsl],, 131 137 AC_MSG_FAILURE([cannot find library GSL])) 138 LDFLAGS="$save_LDFLAGS" 139 140 AC_SUBST(GSL_LDFLAGS) 141 AM_CPPFLAGS="-I\$(top_srcdir)/lib $GSL_CPPFLAGS $AM_CPPFLAGS" 142 AC_SUBST(AM_CPPFLAGS) 143 AC_SUBST(AM_CXXFLAGS) 132 144 133 145 CPP_TOOLS_LIBPATH="lib/c++_tools" -
plugins/base1/se.lu.thep.wenni/trunk/lib/c++_tools/Makefile.am
r825 r841 22 22 # along with WeNNI. If not, see <http://www.gnu.org/licenses/>. 23 23 24 AM_CPPFLAGS = -I@top_srcdir@/lib25 26 24 SUBDIRS = gslapi utility 27 25 -
plugins/base1/se.lu.thep.wenni/trunk/lib/c++_tools/gslapi/Makefile.am
r824 r841 28 28 29 29 libgslapi_la_SOURCES = matrix.cc vector.cc 30 31 AM_CPPFLAGS = -I@top_srcdir@/lib -
plugins/base1/se.lu.thep.wenni/trunk/lib/c++_tools/utility/Makefile.am
r824 r841 30 30 libutility_la_SOURCES = \ 31 31 FileIO.cc kNNI.cc NNI.cc stl_utility.cc utility.cc WeNNI.cc 32 33 AM_CPPFLAGS = -I@top_srcdir@/lib
Note: See TracChangeset
for help on using the changeset viewer.