Mercurial > octave-nkf

comparison src/Makefile.am @ 20006:28a9e59d0714

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cross-tools: Add ability to build cross built octave-config * configure.ac: rename --enable-cross-mkoctfile to --enable-cross-tools * src/Makefile.am: rename AMCOND_CROSS_MKOCTFILE to AMCOND_CROSS_TOOLS, add rule to build $(host_triplet)-octave-config$(BUILD_EXEEXT)
author John Donoghue
date Fri, 20 Mar 2015 08:44:24 -0400
parents 8ba35b7b355d
children
comparison
equal deleted inserted replaced
20005:f7846f0ea6db 20006:28a9e59d0714
129 octave_config_LDADD = \ 129 octave_config_LDADD = \
130 $(top_builddir)/libinterp/corefcn/libcorefcn.la \ 130 $(top_builddir)/libinterp/corefcn/libcorefcn.la \
131 $(top_builddir)/libgnu/libgnu.la \ 131 $(top_builddir)/libgnu/libgnu.la \
132 $(LIBS) 132 $(LIBS)
133 133
134 # if building cross octfile
135 OCTAVE_CROSS_TOOLS= 134 OCTAVE_CROSS_TOOLS=
136 if AMCOND_CROSS_MKOCTFILE 135 if AMCOND_CROSS_TOOLS
136 # building cross mkoctfile
137 OCTAVE_CROSS_TOOLS += $(host_triplet)-mkoctfile$(BUILD_EXEEXT) 137 OCTAVE_CROSS_TOOLS += $(host_triplet)-mkoctfile$(BUILD_EXEEXT)
138 $(host_triplet)-mkoctfile$(BUILD_EXEEXT): $(host_triplet)-mkoctfile.cc 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 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 140 $(host_triplet)-mkoctfile.cc: mkoctfile.in.cc Makefile
144 $(AM_V_GEN)$(do_subst_cross_config_vals) 141 $(AM_V_GEN)$(do_subst_cross_config_vals)
142
143 # building cross octave-config
144 OCTAVE_CROSS_TOOLS += $(host_triplet)-octave-config$(BUILD_EXEEXT)
145 $(host_triplet)-octave-config$(BUILD_EXEEXT): $(host_triplet)-octave-config.cc
146 $(BUILD_CXX) -o $(host_triplet)-octave-config$(BUILD_EXEEXT) -Dgnulib='' -Doctave_idx_type=int $(DEFAULT_INCLUDES) $(BUILD_CXXFLAGS) $(BUILD_LDFLAGS) $(host_triplet)-octave-config.cc
147 $(host_triplet)-octave-config.cc: octave-config.in.cc Makefile
148 $(AM_V_GEN)$(do_subst_default_vals)
149
150 mostlyclean-local:
151 -rm -f $(OCTAVE_CROSS_TOOLS)
152
145 endif 153 endif
146 154
147 all-local: $(OCTAVE_VERSION_LINKS) $(OCTAVE_CROSS_TOOLS) 155 all-local: $(OCTAVE_VERSION_LINKS) $(OCTAVE_CROSS_TOOLS)
148 156
149 octave-config.cc: octave-config.in.cc Makefile 157 octave-config.cc: octave-config.in.cc Makefile