comparison src/Makefile.am @ 19998:8ba35b7b355d

Add cross buioldable mkoctfile target * configure.ac: add option for --enable-cross-mkoctfile * src/Makefile.am: on enable cross mkoctfile, add rules to generate $(host_triplet)-mkoctfile * build-aux/common.mk: add new macro for do_subst_cross_config_vals
author John Donoghue
date Wed, 18 Mar 2015 11:18:39 -0400
parents 343ca73b1507
children 28a9e59d0714
comparison
equal deleted inserted replaced
19997:2e7497ff2535 19998:8ba35b7b355d
55 display-available.h \ 55 display-available.h \
56 shared-fcns.h 56 shared-fcns.h
57 57
58 OCTAVE_VERSION_LINKS = octave-cli-$(version)$(EXEEXT) 58 OCTAVE_VERSION_LINKS = octave-cli-$(version)$(EXEEXT)
59 59
60 archlib_PROGRAMS =
61
60 if AMCOND_BUILD_GUI 62 if AMCOND_BUILD_GUI
61 archlib_PROGRAMS = octave-gui 63 archlib_PROGRAMS += octave-gui
62 OCTAVE_VERSION_LINKS += octave-gui-$(version)$(EXEEXT) 64 OCTAVE_VERSION_LINKS += octave-gui-$(version)$(EXEEXT)
63 endif 65 endif
64 66
65 OCTAVE_CORE_LIBS = \ 67 OCTAVE_CORE_LIBS = \
66 $(top_builddir)/libinterp/liboctinterp.la \ 68 $(top_builddir)/libinterp/liboctinterp.la \
127 octave_config_LDADD = \ 129 octave_config_LDADD = \
128 $(top_builddir)/libinterp/corefcn/libcorefcn.la \ 130 $(top_builddir)/libinterp/corefcn/libcorefcn.la \
129 $(top_builddir)/libgnu/libgnu.la \ 131 $(top_builddir)/libgnu/libgnu.la \
130 $(LIBS) 132 $(LIBS)
131 133
132 all-local: $(OCTAVE_VERSION_LINKS) 134 # if building cross octfile
135 OCTAVE_CROSS_TOOLS=
136 if AMCOND_CROSS_MKOCTFILE
137 OCTAVE_CROSS_TOOLS += $(host_triplet)-mkoctfile$(BUILD_EXEEXT)
138 $(host_triplet)-mkoctfile$(BUILD_EXEEXT): $(host_triplet)-mkoctfile.cc
139 $(BUILD_CXX) -o $(host_triplet)-mkoctfile$(BUILD_EXEEXT) -Dgnulib='' -Doctave_idx_type=int $(DEFAULT_INCLUDES) $(BUILD_CXXFLAGS) $(BUILD_LDFLAGS) $(host_triplet)-mkoctfile.cc
140 mostlyclean-local:
141 -rm -f $(TARGET)-mkoctfile$(BUILD_EXEEXT)
142
143 $(host_triplet)-mkoctfile.cc: mkoctfile.in.cc Makefile
144 $(AM_V_GEN)$(do_subst_cross_config_vals)
145 endif
146
147 all-local: $(OCTAVE_VERSION_LINKS) $(OCTAVE_CROSS_TOOLS)
133 148
134 octave-config.cc: octave-config.in.cc Makefile 149 octave-config.cc: octave-config.in.cc Makefile
135 $(AM_V_GEN)$(do_subst_default_vals) 150 $(AM_V_GEN)$(do_subst_default_vals)
136 151
137 mkoctfile.cc: mkoctfile.in.cc Makefile 152 mkoctfile.cc: mkoctfile.in.cc Makefile