# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1346161368 14400
# Node ID b241e69306a5ba4b3f44d490ac1db31d4658c07a
# Parent  b7f9d2c99a06e581e94394f1e243b9544740ba98
build octave and octave-cli when building compiled octave-config and mkoctfile

* src/Makefile.am (OCTAVE_BINARIES): Define.
(bin_PROGRAMS): Define using $(OCTAVE_BINARIES).

diff -r b7f9d2c99a06 -r b241e69306a5 src/Makefile.am
--- a/src/Makefile.am	Mon Aug 27 18:06:48 2012 -0400
+++ b/src/Makefile.am	Tue Aug 28 09:42:48 2012 -0400
@@ -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 \