Changeset 853


Ignore:
Timestamp:
Dec 1, 2008, 11:59:25 PM (13 years ago)
Author:
Jari Häkkinen
Message:

Fixes #152. Added custom target 'install-plugin' that parallels 'install'.

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

Legend:

Unmodified
Added
Removed
  • plugins/base1/se.lu.thep.wenni/trunk/INSTALL

    r844 r853  
    7575    $ `make`
    7676    $ `make check`
    77     $ `make install`
     77    $ `make install-plugin`
    7878
    7979If you have probems check the pre-requisites below.
     
    182182 5. Install files using
    183183
    184     $ `make install`
     184    $ `make install-plugin`
     185
     186    Note! `make install` will install in location `${exec_prefix}/bin`
     187    which maybe something else than the BASE plugin directory.
    185188
    186189 6. Make BASE2 aware of the plugin, see BASE2 documentation
     
    269272 5. Install files using
    270273
    271     $ `make install`
     274    $ `make install-plugin`
     275
     276    Note! `make install` will install in location `${exec_prefix}/bin`
     277    which maybe something else than the BASE plugin directory.
    272278
    273279 6. Make BASE1 aware of the plugin.
     
    349355    $ `make install`
    350356
     357    Note! `make install-plugin` will do the samething as `make install`.
    351358
    352359
  • plugins/base1/se.lu.thep.wenni/trunk/Makefile.am

    r825 r853  
    3636
    3737EXTRA_DIST = TODO
     38
     39install-plugin:
     40  @for i in $(SUBDIRS); do \
     41    (cd $$i; $(MAKE) $(AM_MAKEFLAGS) $@ ) \
     42  done
  • plugins/base1/se.lu.thep.wenni/trunk/base/Makefile.am

    r825 r853  
    44
    55# Copyright (C) 2007 Peter Johansson
     6# Copyright (C) 2008 Jari Häkkinen
    67#
    78# This file is part of WeNNI,
     
    3132endif
    3233
     34install-plugin:
     35  @for i in $(SUBDIRS); do \
     36    (cd $$i; $(MAKE) -w $@ ) \
     37  done
  • plugins/base1/se.lu.thep.wenni/trunk/base/base1/BaseFileConverter/Makefile.am

    r842 r853  
    44
    55# Copyright (C) 2005, 2006 Jari Häkkinen
    6 # Copyright (C) 2007, 2008 Peter Johansson
     6# Copyright (C) 2007 Peter Johansson
     7# Copyright (C) 2008 Jari Häkkinen, Peter Johansson
    78#
    89# This file is part of WeNNI,
     
    3233
    3334EXTRA_DIST = Clone.h Data.h Parameter.h
     35
     36install-plugin: $(PROGRAMS)
     37  @echo Making $@
     38  test -z "$(PLUGINDIR)" || $(MKDIR_P) "$(PLUGINDIR)"
     39  @for i in $(PROGRAMS); do \
     40    ( echo "$(INSTALL) $$i $(PLUGINDIR)" ; $(INSTALL) $$i $(PLUGINDIR) ) \
     41  done
  • plugins/base1/se.lu.thep.wenni/trunk/base/base1/Makefile.am

    r825 r853  
    44
    55# Copyright (C) 2007 Peter Johansson
     6# Copyright (C) 2008 Jari Häkkinen
    67#
    78# This file is part of WeNNI,
     
    2223
    2324SUBDIRS = base_plugin_script BaseFileConverter
     25
     26install-plugin:
     27  @for i in $(SUBDIRS); do \
     28    (cd $$i; $(MAKE) $@ ) \
     29  done
  • plugins/base1/se.lu.thep.wenni/trunk/base/base1/base_plugin_script/Makefile.am

    r834 r853  
    55# Copyright (C) 2005, 2006 Jari Häkkinen
    66# Copyright (C) 2007 Peter Johansson
     7# Copyright (C) 2008 Jari Häkkinen
    78#
    89# This file is part of WeNNI,
     
    2425dist_bin_SCRIPTS = wenni.pl
    2526
     27install-plugin: $(SCRIPTS)
     28  @echo Making $@
     29  test -z "$(PLUGINDIR)" || $(MKDIR_P) "$(PLUGINDIR)"
     30  @for i in $(SCRIPTS); do \
     31    ( echo "$(INSTALL) $$i $(PLUGINDIR)" ; $(INSTALL) $$i $(PLUGINDIR) ) \
     32  done
  • plugins/base1/se.lu.thep.wenni/trunk/base/base2/Makefile.am

    r848 r853  
    3838  @( rm -rf $(PLUGINutilities) $(PLUGINutilities).tgz )
    3939
    40 
    41 install-exec-local: $(JAR)
     40install-exec-local: $(JAR)
    4241  @$(NORMAL_INSTALL)
    4342  test -z "$(bindir)" || $(MKDIR_P) "$(bindir)"
    4443  $(INSTALL) "$(JAR)" "$(bindir)"
    4544  $(INSTALL) "$(PLUGINutilities)/$(PLUGINutilities).jar" "$(bindir)"
     45
     46install-plugin: $(JAR)
     47  @$(NORMAL_INSTALL)
     48  test -z "$(PLUGINDIR)" || $(MKDIR_P) "$(PLUGINDIR)"
     49  $(INSTALL) "$(JAR)" "$(PLUGINDIR)"
     50  $(INSTALL) "$(PLUGINutilities)/$(PLUGINutilities).jar" "$(PLUGINDIR)"
    4651
    4752$(JAR): $(BUILDDIR) $(PLUGINutilities) $(CLASS)
  • plugins/base1/se.lu.thep.wenni/trunk/bin/Makefile.am

    r825 r853  
    55# Copyright (C) 2005, 2006 Jari Häkkinen
    66# Copyright (C) 2007 Peter Johansson
     7# Copyright (C) 2008 Jari Häkkinen
    78#
    89# This file is part of WeNNI,
     
    2728SUBDIRS += NNIFileConverter
    2829endif
     30
     31install-plugin:;
     32  @for i in $(SUBDIRS); do \
     33    (cd $$i; $(MAKE) -w $@ ) \
     34  done
  • plugins/base1/se.lu.thep.wenni/trunk/bin/NNIFileConverter/Makefile.am

    r841 r853  
    44
    55# Copyright (C) 2005, 2006 Jari Häkkinen
    6 # Copyright (C) 2007 2008 Peter Johansson
     6# Copyright (C) 2007 Peter Johansson
     7# Copyright (C) 2008 Jari Häkkinen, Peter Johansson
    78#
    89# This file is part of WeNNI,
     
    3132
    3233EXTRA_DIST = Parameter.h
     34
     35install-plugin: $(PROGRAMS)
     36  @echo Making $@
     37  test -z "$(PLUGINDIR)" || $(MKDIR_P) "$(PLUGINDIR)"
     38  @for i in $(PROGRAMS); do \
     39    ( echo "$(INSTALL) $$i $(PLUGINDIR)" ; $(INSTALL) $$i $(PLUGINDIR) ) \
     40  done
  • plugins/base1/se.lu.thep.wenni/trunk/bin/nni/Makefile.am

    r841 r853  
    44
    55# Copyright (C) 2005, 2006 Jari Häkkinen
    6 # Copyright (C) 2007 2008 Peter Johansson
     6# Copyright (C) 2007 Peter Johansson
     7# Copyright (C) 2008 Jari Häkkinen, Peter Johansson
    78#
    89# This file is part of WeNNI,
     
    2930
    3031EXTRA_DIST = nni.h Parameter.h
     32
     33install-plugin: $(PROGRAMS)
     34  @echo Making $@
     35  test -z "$(PLUGINDIR)" || $(MKDIR_P) "$(PLUGINDIR)"
     36  @for i in $(PROGRAMS); do \
     37    ( echo "  $(INSTALL) $$i $(PLUGINDIR)" ; $(INSTALL) $$i $(PLUGINDIR) ) \
     38  done
  • plugins/base1/se.lu.thep.wenni/trunk/configure.ac

    r849 r853  
    9999                                      [the base plug-in install directory])],
    100100            [PLUGINDIR=$withval],
    101             [if (test x$state = xbase1); then
     101            [PLUGINDIR=$bindir
     102             if (test x$state = xbase1); then
    102103               PLUGINDIR="$BASEDIR/plugins/bin/wenni"
    103104             elif (test x$state = xbase2); then
    104105               PLUGINDIR="$BASEDIR/plugins/se/lu/thep/wenni"
    105106             fi])
     107AC_SUBST(PLUGINDIR)
    106108
    107109if (test x$state = xbase1); then
     
    139141  AC_SUBST(JAVACFLAGS)
    140142fi
    141 if (test x$state = xbase1 || test x$state = xbase2); then
    142   # Change binary installation directory, is this kosher?
    143   bindir=$PLUGINDIR
    144 fi
    145143
    146144AC_SEARCH_LIBS([sqrt], [m],, AC_MSG_FAILURE([cannot find math library]))
     
    192190  AC_MSG_NOTICE([    nni])
    193191  AC_MSG_NOTICE([    BaseFileConverter])
    194   AC_MSG_NOTICE([    base_plugin_script])
     192  AC_MSG_NOTICE([    wenni.pl])
    195193  AC_MSG_NOTICE([])
    196194  AC_MSG_NOTICE([WeNNI plug-in binaries will be installed in])
     
    202200  AC_MSG_NOTICE([    $PLUGINutilities.jar])
    203201  AC_MSG_NOTICE([])
    204   AC_MSG_NOTICE([If not already there, downloading])
    205   AC_MSG_NOTICE([    $PLUGINutilitiesURLpart/$PLUGINutilities])
     202  AC_MSG_NOTICE([If not already done, downloading])
     203  AC_MSG_NOTICE([    $PLUGINutilitiesURL])
    206204  AC_MSG_NOTICE([])
    207205  if (test $DOWNLOADBASE2API = true ); then
     
    218216  AC_MSG_NOTICE([    NNIFileConverter])
    219217  AC_MSG_NOTICE([    nni])
     218  AC_MSG_NOTICE([])
     219  AC_MSG_NOTICE([binaries will be installed in])
     220  AC_MSG_NOTICE([    $bindir])
    220221fi
    221222AC_MSG_NOTICE([])
     
    234235AC_MSG_NOTICE([+++++++++++++++++++++++++++++++++++++++++++++++])
    235236AC_MSG_NOTICE([])
    236 AC_MSG_NOTICE([ Now type 'make ; make check ; make install'.])
     237if (test x$state = xbase1 || test x$state = xbase2); then
     238  AC_MSG_NOTICE([ Now type 'make ; make check ; make install-plugin'.])
     239else
     240  AC_MSG_NOTICE([ Now type 'make ; make check ; make install'.])
     241fi
  • plugins/base1/se.lu.thep.wenni/trunk/data/Makefile.am

    r825 r853  
    33## $Id$
    44
    5 # Copyright (C) 2005, 2006 Jari Häkkinen
     5# Copyright (C) 2005, 2006, 2008 Jari Häkkinen
    66#
    77# This file is part of WeNNI,
     
    2626  wenni_imputed.data wenni_intensity1.data wenni_intensity2.data  \
    2727  wenni_logratio.data wenni_snr.data wenni_weight.data
     28
     29install-plugin:;
     30.PHONY: install-plugin
  • plugins/base1/se.lu.thep.wenni/trunk/lib/Makefile.am

    r825 r853  
    44
    55# Copyright (C) 2005, 2006 Jari Häkkinen, Peter Johansson
     6# Copyright (C) 2008 Jari Häkkinen
    67#
    78# This file is part of WeNNI,
     
    2425
    2526noinst_HEADERS = weight.h
     27
     28install-plugin: all
  • plugins/base1/se.lu.thep.wenni/trunk/test/Makefile.am

    r852 r853  
    33## $Id$
    44
    5 # Copyright (C) 2005, 2006 Jari Häkkinen
    6 # Copyright (C) 2007 2008 Peter Johansson
     5# Copyright (C) 2005, 2006 Jari Häkkinen
     6# Copyright (C) 2007 Peter Johansson
     7# Copyright (C) 2008 Jari Häkkinen, Peter Johansson
    78#
    89# This file is part of WeNNI,
     
    5455  knni_imputed.data wenni_imputed.data
    5556
    56 
    57 
     57install-plugin:;
     58.PHONY: install-plugin
Note: See TracChangeset for help on using the changeset viewer.