Mercurial > hg > octave-lyh

changeset 15462:e8b117b405f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge in Torsten's changes
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Mon, 01 Oct 2012 09:02:03 -0400
parents abf34bbcd053 (diff) 1e64aff609c3 (current diff)
children 6a05cad5b694
files
diffstat 1 files changed, 35 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,42 +34,18 @@
 
 AM_CXXFLAGS += $(WARN_CXXFLAGS)
 
-OCTAVE_BINARIES = \
-  octave \
-  octave-cli
-
-if AMCOND_BUILD_COMPILED_AUX_PROGRAMS
-bin_PROGRAMS = \
-  mkoctfile \
-  $(OCTAVE_BINARIES) \
-  octave-config
-
-mkoctfile_SOURCES =
-nodist_mkoctfile_SOURCES = mkoctfile.cc
-mkoctfile_LDADD = $(top_builddir)/libgnu/libgnu.la $(LIBS)
-
-octave_config_SOURCES =
-nodist_octave_config_SOURCES = octave-config.cc
-octave_config_LDADD = \
-  $(top_builddir)/libinterp/corefcn/libcorefcn.la \
-  $(top_builddir)/libgnu/libgnu.la \
-  $(LIBS)
-
-else
-bin_PROGRAMS = \
-  $(OCTAVE_BINARIES)
-
-bin_SCRIPTS = \
-  mkoctfile \
-  octave-config
-endif
-
 EXTRA_DIST = \
   mkoctfile.in.cc \
   mkoctfile.in.sh \
   octave-config.in.cc \
   octave-config.in.sh
 
+DISTCLEANFILES =
+
+OCTAVE_BINARIES = \
+  octave \
+  octave-cli
+
 OCTAVE_CORE_LIBS = \
   $(top_builddir)/libinterp/liboctinterp.la \
   $(top_builddir)/liboctave/liboctave.la
@@ -110,11 +86,40 @@
   $(OCTAVE_GUI_LINK_OPTS)
 
 if AMCOND_BUILD_COMPILED_AUX_PROGRAMS
+bin_PROGRAMS = \
+  $(OCTAVE_BINARIES) \
+  mkoctfile \
+  octave-config
+
+mkoctfile_SOURCES =
+nodist_mkoctfile_SOURCES = mkoctfile.cc
+mkoctfile_LDADD = $(top_builddir)/libgnu/libgnu.la $(LIBS)
+
+octave_config_SOURCES =
+nodist_octave_config_SOURCES = octave-config.cc
+octave_config_LDADD = \
+  $(top_builddir)/libinterp/corefcn/libcorefcn.la \
+  $(top_builddir)/libgnu/libgnu.la \
+  $(LIBS)
+
+DISTCLEANFILES += mkoctfile.cc octave-config.cc
+
+else
+bin_PROGRAMS = \
+  $(OCTAVE_BINARIES)
+
+bin_SCRIPTS = \
+  mkoctfile \
+  octave-config
+endif
+
+if AMCOND_BUILD_COMPILED_AUX_PROGRAMS
 octave-config.cc: octave-config.in.cc Makefile
 	@$(do_subst_default_vals)
 
 mkoctfile.cc: mkoctfile.in.cc Makefile
 	@$(do_subst_config_vals)
+
 else
 octave-config: octave-config.in.sh Makefile
 	@$(do_subst_default_vals)