Mercurial > octave-nkf

comparison src/Makefile.am @ 18158:8071c0a9d193

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Periodic merge of gui-release to default.
author John W. Eaton <jwe@octave.org>
date Sat, 21 Dec 2013 13:44:53 -0500
parents 6762a6d23010 91a3858ef8cf
children c56ce7c65019
comparison
equal deleted inserted replaced
18157:bf638abc95de 18158:8071c0a9d193
47 47
48 OCTAVE_BINARIES = \ 48 OCTAVE_BINARIES = \
49 octave \ 49 octave \
50 octave-cli 50 octave-cli
51 51
52 OCTAVE_VERSION_LINKS = octave-cli-$(version)
53
52 if AMCOND_BUILD_GUI 54 if AMCOND_BUILD_GUI
53 OCTAVE_BINARIES += octave-gui 55 OCTAVE_BINARIES += octave-gui
56 OCTAVE_VERSION_LINKS += octave-gui-$(version)
54 endif 57 endif
55 58
56 OCTAVE_CORE_LIBS = \ 59 OCTAVE_CORE_LIBS = \
57 $(top_builddir)/libinterp/liboctinterp.la \ 60 $(top_builddir)/libinterp/liboctinterp.la \
58 $(top_builddir)/liboctave/liboctave.la 61 $(top_builddir)/liboctave/liboctave.la
134 bin_SCRIPTS = \ 137 bin_SCRIPTS = \
135 mkoctfile \ 138 mkoctfile \
136 octave-config 139 octave-config
137 endif 140 endif
138 141
142 all-local: $(OCTAVE_VERSION_LINKS)
143
139 if AMCOND_BUILD_COMPILED_AUX_PROGRAMS 144 if AMCOND_BUILD_COMPILED_AUX_PROGRAMS
140 octave-config.cc: octave-config.in.cc Makefile 145 octave-config.cc: octave-config.in.cc Makefile
141 @$(do_subst_default_vals) 146 @$(do_subst_default_vals)
142 147
143 mkoctfile.cc: mkoctfile.in.cc Makefile 148 mkoctfile.cc: mkoctfile.in.cc Makefile
187 done 192 done
188 endif 193 endif
189 194
190 .PHONY: make-version-links remove-version-links 195 .PHONY: make-version-links remove-version-links
191 196
197 ## We need these file names in the build tree because the wrapper
198 ## program (main.cc) will try to invoke the versioned binaries.
199
200 octave-cli-$(version): octave-cli
201 rm -f $@
202 $(LN_S) $< $@
203
204 octave-gui-$(version): octave-gui
205 rm -f $@
206 $(LN_S) $< $@
207
192 CLEANFILES = \ 208 CLEANFILES = \
193 $(bin_SCRIPTS) 209 $(bin_SCRIPTS) \
210 $(OCTAVE_VERSION_LINKS)