Changeset 821


Ignore:
Timestamp:
Nov 25, 2008, 5:38:07 PM (13 years ago)
Author:
Jari Häkkinen
Message:

Build of stand-alone and base1 modes work. base2 still to be finalized.

Location:
plugins/base1/se.lu.thep.wenni/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • plugins/base1/se.lu.thep.wenni/trunk/base/base1/BaseFileConverter/Makefile.am

    r324 r821  
    2626bin_PROGRAMS = BaseFileConverter
    2727
    28 AM_CPPFLAGS = -I@top_srcdir@/lib
     28AM_CPPFLAGS = $(BASECPPFLAGS) -I@top_srcdir@/lib
    2929
    30 LDADD = -L@top_builddir@/$(CPP_TOOLS_LIBPATH) -lc++_tools
     30LDADD = $(BASELDFLAGS) -L@top_builddir@/$(CPP_TOOLS_LIBPATH) -lc++_tools
    3131
    3232BaseFileConverter_SOURCES = BaseFileConverter.cc Clone.cc Data.cc Parameter.cc
  • plugins/base1/se.lu.thep.wenni/trunk/base/base2/Makefile.am

    r334 r821  
    2727BUILDDIR = $(TOPBUILDDIR)/$(SUBDIR)
    2828
    29 JAVA = RunBinaryPlugin.java WeNNI.java
     29JAVA = WeNNI.java
    3030CLASS = $(JAVA:.java=.class)
    3131JAR  = WeNNI.jar
  • plugins/base1/se.lu.thep.wenni/trunk/configure.ac

    r411 r821  
    55# Copyright (C) 2005, 2006 Jari Häkkinen, Peter Johansson
    66# Copyright (C) 2007 Peter Johansson
     7# Copyright (C) 2008 Jari Häkkinen
    78#
    89# This file is part of WeNNI,
     
    3940AM_CONFIG_HEADER([config.h])
    4041AM_INIT_AUTOMAKE
     42
     43# Set default programming language
     44AC_LANG(C++)
    4145
    4246# Checks for programs.
     
    7983
    8084AC_ARG_WITH(basedir,[AS_HELP_STRING([--with-basedir=DIR]),
    81                      root directory for base installation]],
     85                     [root directory for base installation])],
    8286            [BASEDIR=$withval],[BASEDIR=/usr/local/base])
    83 AC_SUBST(BASEDIR)       
    8487
    8588AC_ARG_WITH(plugindir,[AS_HELP_STRING([--with-plugindir=DIR],
     
    9295             fi])
    9396
    94 
    9597if (test x$state = xbase1); then
    96   LDFLAGS="-L$BASEDIR/BASE-plugindevkit/bogus_base/lib"
    97   AC_SEARCH_LIBS([base_finite], [base], ,
    98                  [AC_MSG_FAILURE([cannot find base library])])
    99   CPPFLAGS="-I$BASEDIR/BASE-plugindevkit/bogus_base/include/cxx $CPPFLAGS"
    100   AC_CHECK_HEADERS([basefile.h])
     98  OLD_CPPFLAGS=$CPPFLAGS;
     99  OLD_LDFLAGS=$LDFLAGS;
     100  LDFLAGS="-L$BASEDIR/lib"
     101  AC_CHECK_LIB([base], [base_finite], [BASELDFLAGS="-L$BASEDIR/lib -lbase"],
     102               [AC_MSG_FAILURE([cannot find base library])])
     103  CPPFLAGS="-I$BASEDIR/include/cxx $CPPFLAGS"
     104  AC_CHECK_HEADERS([basefile.h],[BASECPPFLAGS=-I$BASEDIR/include/cxx],
     105               [AC_MSG_FAILURE([cannot find base header files])])
    101106  bindir="$PLUGINDIR"
     107  CPPFLAGS=$OLD_CPPFLAGS;
     108  LDFLAGS=$OLD_LDFLAGS;
     109  AC_SUBST(BASECPPFLAGS)
     110  AC_SUBST(BASELDFLAGS)
    102111fi
    103112if (test x$state = xbase2); then
     
    109118  JAVACFLAGS="$BASEDIR/www/WEB-INF/lib/BASE2CorePlugins.jar:$JAVACFLAGS" 
    110119  bindir="$PLUGINDIR"
     120  AC_SUBST(JAVACFLAGS)
    111121fi
    112 AC_SUBST(JAVACFLAGS)
    113 
    114122
    115123AC_ARG_WITH(gsl,[AS_HELP_STRING([--with-gsl=DIR], [prefix for gsl files])],
     
    165173AC_MSG_NOTICE([ The following libs and flags will be used:])
    166174AC_MSG_NOTICE([ +++++++++++++++++++++++++++++++++++++++++++++++])
    167 AC_MSG_NOTICE([  CPPFLAGS=\"$CPPFLAGS\"])
    168 AC_MSG_NOTICE([  CXXFLAGS=\"$CXXFLAGS\"])
    169 AC_MSG_NOTICE([  LDFLAGS=\"$LDFLAGS\"])
     175AC_MSG_NOTICE([  CPPFLAGS    =\"$CPPFLAGS\"])
     176AC_MSG_NOTICE([  CXXFLAGS    =\"$CXXFLAGS\"])
     177AC_MSG_NOTICE([  LDFLAGS     =\"$LDFLAGS\"])
     178AC_MSG_NOTICE([  LIBS        =\"$LIBS\"])
     179if (test x$state = xbase1); then
     180  AC_MSG_NOTICE([  BASECPPFLAGS=\"$BASECPPFLAGS\"])
     181  AC_MSG_NOTICE([  BASELDFLAGS =\"$BASELDFLAGS\"])
     182fi
    170183if (test x$state = xbase2); then
    171184  AC_MSG_NOTICE([  JAVACFLAGS=\"$JAVACFLAGS\"])
    172185fi
    173 AC_MSG_NOTICE([  LIBS=\"$LIBS\"])
    174186AC_MSG_NOTICE([ +++++++++++++++++++++++++++++++++++++++++++++++])
    175187AC_MSG_NOTICE([])
Note: See TracChangeset for help on using the changeset viewer.