Changeset 853
- Timestamp:
- Dec 1, 2008, 11:59:25 PM (14 years ago)
- 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 75 75 $ `make` 76 76 $ `make check` 77 $ `make install `77 $ `make install-plugin` 78 78 79 79 If you have probems check the pre-requisites below. … … 182 182 5. Install files using 183 183 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. 185 188 186 189 6. Make BASE2 aware of the plugin, see BASE2 documentation … … 269 272 5. Install files using 270 273 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. 272 278 273 279 6. Make BASE1 aware of the plugin. … … 349 355 $ `make install` 350 356 357 Note! `make install-plugin` will do the samething as `make install`. 351 358 352 359 -
plugins/base1/se.lu.thep.wenni/trunk/Makefile.am
r825 r853 36 36 37 37 EXTRA_DIST = TODO 38 39 install-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 4 4 5 5 # Copyright (C) 2007 Peter Johansson 6 # Copyright (C) 2008 Jari Häkkinen 6 7 # 7 8 # This file is part of WeNNI, … … 31 32 endif 32 33 34 install-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 4 4 5 5 # 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 7 8 # 8 9 # This file is part of WeNNI, … … 32 33 33 34 EXTRA_DIST = Clone.h Data.h Parameter.h 35 36 install-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 4 4 5 5 # Copyright (C) 2007 Peter Johansson 6 # Copyright (C) 2008 Jari Häkkinen 6 7 # 7 8 # This file is part of WeNNI, … … 22 23 23 24 SUBDIRS = base_plugin_script BaseFileConverter 25 26 install-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 5 5 # Copyright (C) 2005, 2006 Jari Häkkinen 6 6 # Copyright (C) 2007 Peter Johansson 7 # Copyright (C) 2008 Jari Häkkinen 7 8 # 8 9 # This file is part of WeNNI, … … 24 25 dist_bin_SCRIPTS = wenni.pl 25 26 27 install-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 38 38 @( rm -rf $(PLUGINutilities) $(PLUGINutilities).tgz ) 39 39 40 41 install-exec-local: $(JAR) 40 install-exec-local: $(JAR) 42 41 @$(NORMAL_INSTALL) 43 42 test -z "$(bindir)" || $(MKDIR_P) "$(bindir)" 44 43 $(INSTALL) "$(JAR)" "$(bindir)" 45 44 $(INSTALL) "$(PLUGINutilities)/$(PLUGINutilities).jar" "$(bindir)" 45 46 install-plugin: $(JAR) 47 @$(NORMAL_INSTALL) 48 test -z "$(PLUGINDIR)" || $(MKDIR_P) "$(PLUGINDIR)" 49 $(INSTALL) "$(JAR)" "$(PLUGINDIR)" 50 $(INSTALL) "$(PLUGINutilities)/$(PLUGINutilities).jar" "$(PLUGINDIR)" 46 51 47 52 $(JAR): $(BUILDDIR) $(PLUGINutilities) $(CLASS) -
plugins/base1/se.lu.thep.wenni/trunk/bin/Makefile.am
r825 r853 5 5 # Copyright (C) 2005, 2006 Jari Häkkinen 6 6 # Copyright (C) 2007 Peter Johansson 7 # Copyright (C) 2008 Jari Häkkinen 7 8 # 8 9 # This file is part of WeNNI, … … 27 28 SUBDIRS += NNIFileConverter 28 29 endif 30 31 install-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 4 4 5 5 # 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 7 8 # 8 9 # This file is part of WeNNI, … … 31 32 32 33 EXTRA_DIST = Parameter.h 34 35 install-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 4 4 5 5 # 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 7 8 # 8 9 # This file is part of WeNNI, … … 29 30 30 31 EXTRA_DIST = nni.h Parameter.h 32 33 install-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 99 99 [the base plug-in install directory])], 100 100 [PLUGINDIR=$withval], 101 [if (test x$state = xbase1); then 101 [PLUGINDIR=$bindir 102 if (test x$state = xbase1); then 102 103 PLUGINDIR="$BASEDIR/plugins/bin/wenni" 103 104 elif (test x$state = xbase2); then 104 105 PLUGINDIR="$BASEDIR/plugins/se/lu/thep/wenni" 105 106 fi]) 107 AC_SUBST(PLUGINDIR) 106 108 107 109 if (test x$state = xbase1); then … … 139 141 AC_SUBST(JAVACFLAGS) 140 142 fi 141 if (test x$state = xbase1 || test x$state = xbase2); then142 # Change binary installation directory, is this kosher?143 bindir=$PLUGINDIR144 fi145 143 146 144 AC_SEARCH_LIBS([sqrt], [m],, AC_MSG_FAILURE([cannot find math library])) … … 192 190 AC_MSG_NOTICE([ nni]) 193 191 AC_MSG_NOTICE([ BaseFileConverter]) 194 AC_MSG_NOTICE([ base_plugin_script])192 AC_MSG_NOTICE([ wenni.pl]) 195 193 AC_MSG_NOTICE([]) 196 194 AC_MSG_NOTICE([WeNNI plug-in binaries will be installed in]) … … 202 200 AC_MSG_NOTICE([ $PLUGINutilities.jar]) 203 201 AC_MSG_NOTICE([]) 204 AC_MSG_NOTICE([If not already there, downloading])205 AC_MSG_NOTICE([ $PLUGINutilitiesURL part/$PLUGINutilities])202 AC_MSG_NOTICE([If not already done, downloading]) 203 AC_MSG_NOTICE([ $PLUGINutilitiesURL]) 206 204 AC_MSG_NOTICE([]) 207 205 if (test $DOWNLOADBASE2API = true ); then … … 218 216 AC_MSG_NOTICE([ NNIFileConverter]) 219 217 AC_MSG_NOTICE([ nni]) 218 AC_MSG_NOTICE([]) 219 AC_MSG_NOTICE([binaries will be installed in]) 220 AC_MSG_NOTICE([ $bindir]) 220 221 fi 221 222 AC_MSG_NOTICE([]) … … 234 235 AC_MSG_NOTICE([+++++++++++++++++++++++++++++++++++++++++++++++]) 235 236 AC_MSG_NOTICE([]) 236 AC_MSG_NOTICE([ Now type 'make ; make check ; make install'.]) 237 if (test x$state = xbase1 || test x$state = xbase2); then 238 AC_MSG_NOTICE([ Now type 'make ; make check ; make install-plugin'.]) 239 else 240 AC_MSG_NOTICE([ Now type 'make ; make check ; make install'.]) 241 fi -
plugins/base1/se.lu.thep.wenni/trunk/data/Makefile.am
r825 r853 3 3 ## $Id$ 4 4 5 # Copyright (C) 2005, 2006 Jari Häkkinen5 # Copyright (C) 2005, 2006, 2008 Jari Häkkinen 6 6 # 7 7 # This file is part of WeNNI, … … 26 26 wenni_imputed.data wenni_intensity1.data wenni_intensity2.data \ 27 27 wenni_logratio.data wenni_snr.data wenni_weight.data 28 29 install-plugin:; 30 .PHONY: install-plugin -
plugins/base1/se.lu.thep.wenni/trunk/lib/Makefile.am
r825 r853 4 4 5 5 # Copyright (C) 2005, 2006 Jari Häkkinen, Peter Johansson 6 # Copyright (C) 2008 Jari Häkkinen 6 7 # 7 8 # This file is part of WeNNI, … … 24 25 25 26 noinst_HEADERS = weight.h 27 28 install-plugin: all -
plugins/base1/se.lu.thep.wenni/trunk/test/Makefile.am
r852 r853 3 3 ## $Id$ 4 4 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 7 8 # 8 9 # This file is part of WeNNI, … … 54 55 knni_imputed.data wenni_imputed.data 55 56 56 57 57 install-plugin:; 58 .PHONY: install-plugin
Note: See TracChangeset
for help on using the changeset viewer.