Mercurial > hg > octave-max

changeset 15244:b241e69306a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build octave and octave-cli when building compiled octave-config and mkoctfile * src/Makefile.am (OCTAVE_BINARIES): Define. (bin_PROGRAMS): Define using $(OCTAVE_BINARIES).
author John W. Eaton <jwe@octave.org>
date Tue, 28 Aug 2012 09:42:48 -0400
parents b7f9d2c99a06
children c16357c4bdbb
files src/Makefile.am
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,10 +25,14 @@
   -I$(srcdir)/../libinterp \
   -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu
 
+OCTAVE_BINARIES = \
+  octave \
+  octave-cli
+
 if AMCOND_BUILD_COMPILED_AUX_PROGRAMS
 bin_PROGRAMS = \
   mkoctfile \
-  $(OCTAVE_PROGRAMS) \
+  $(OCTAVE_BINARIES) \
   octave-config
 
 mkoctfile_SOURCES =
@@ -47,8 +51,7 @@
   octave-config.cc
 else
 bin_PROGRAMS = \
-  octave \
-  octave-cli
+  $(OCTAVE_BINARIES)
 
 bin_SCRIPTS = \
   mkoctfile \