Mercurial > octave-nkf

comparison src/Makefile.am @ 15243: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 ad1a980b0cb5
comparison
equal deleted inserted replaced
15242:b7f9d2c99a06 15243:b241e69306a5
23 ## Search local directories before those specified by the user. 23 ## Search local directories before those specified by the user.
24 AM_CPPFLAGS = \ 24 AM_CPPFLAGS = \
25 -I$(srcdir)/../libinterp \ 25 -I$(srcdir)/../libinterp \
26 -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu 26 -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu
27 27
28 OCTAVE_BINARIES = \
29 octave \
30 octave-cli
31
28 if AMCOND_BUILD_COMPILED_AUX_PROGRAMS 32 if AMCOND_BUILD_COMPILED_AUX_PROGRAMS
29 bin_PROGRAMS = \ 33 bin_PROGRAMS = \
30 mkoctfile \ 34 mkoctfile \
31 $(OCTAVE_PROGRAMS) \ 35 $(OCTAVE_BINARIES) \
32 octave-config 36 octave-config
33 37
34 mkoctfile_SOURCES = 38 mkoctfile_SOURCES =
35 nodist_mkoctfile_SOURCES = mkoctfile.cc 39 nodist_mkoctfile_SOURCES = mkoctfile.cc
36 mkoctfile_LDADD = $(top_builddir)/libgnu/libgnu.la $(LIBS) 40 mkoctfile_LDADD = $(top_builddir)/libgnu/libgnu.la $(LIBS)
45 BUILT_SOURCES_EXTRA = \ 49 BUILT_SOURCES_EXTRA = \
46 mkoctfile.cc \ 50 mkoctfile.cc \
47 octave-config.cc 51 octave-config.cc
48 else 52 else
49 bin_PROGRAMS = \ 53 bin_PROGRAMS = \
50 octave \ 54 $(OCTAVE_BINARIES)
51 octave-cli
52 55
53 bin_SCRIPTS = \ 56 bin_SCRIPTS = \
54 mkoctfile \ 57 mkoctfile \
55 octave-config 58 octave-config
56 endif 59 endif