Mercurial > octave-nkf
view libinterp/octave-value/module.mk @ 20362:0ce7d8303152
eliminate recursive make invocations in liboctave and libinterp directories
* libinterp/module.mk: New file created from libinterp/Makefile.am.
* liboctave/module.mk: New file created from liboctave/Makefile.am.
* libinterp/Makefile.am, liboctave/Makefile.am: Delete.
* configure.ac (AC_CONFIG_FILES): Remove libinterp/Makefile and
liboctave/Makefile from the list.
* Makefile.am (SUBDIRS): Remove liboctave and libinterp from the list.
(BUILT_DISTFILES, BUILT_NODISTFILES, EXTRA_DIST, DIST_SRC,
octinclude_HEADERS, nodist_octinclude_HEADERS): Initialize as empty.
Include liboctave/module.mk liboctave/link-deps.mk,
libinterp/module.mk, and libinterp/link-deps.mk.
* doc/module.mk, libgui/link-deps.mk, libinterp/corefcn/module.mk,
libinterp/dldfcn/config-module.awk, libinterp/link-deps.mk,
libinterp/mkops, libinterp/octave-value/module.mk,
libinterp/operators/module.mk, libinterp/parse-tree/module.mk,
libinterp/template-inst/module.mk, liboctave/array/module.mk,
liboctave/cruft/Faddeeva/module.mk, liboctave/cruft/amos/module.mk,
liboctave/cruft/blas-xtra/module.mk, liboctave/cruft/daspk/module.mk,
liboctave/cruft/dasrt/module.mk, liboctave/cruft/dassl/module.mk,
liboctave/cruft/fftpack/module.mk,
liboctave/cruft/lapack-xtra/module.mk, liboctave/cruft/misc/module.mk,
liboctave/cruft/module.mk, liboctave/cruft/odepack/module.mk,
liboctave/cruft/ordered-qz/module.mk,
liboctave/cruft/quadpack/module.mk, liboctave/cruft/ranlib/module.mk,
liboctave/cruft/slatec-err/module.mk,
liboctave/cruft/slatec-fn/module.mk, liboctave/numeric/module.mk,
liboctave/operators/mk-ops.awk, liboctave/operators/module.mk,
liboctave/operators/sparse-mk-ops.awk, liboctave/system/module.mk,
liboctave/util/module.mk: Update for non-recursive build.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 10 Jul 2015 13:28:33 -0400 |
parents | 7575048a555b |
children | 9b44691a3520 |
line wrap: on
line source
EXTRA_DIST += \ libinterp/octave-value/module.mk OV_INTTYPE_INC = \ libinterp/octave-value/ov-base-int.h \ libinterp/octave-value/ov-base-int.cc \ libinterp/octave-value/ov-int-traits.h \ libinterp/octave-value/ov-int16.h \ libinterp/octave-value/ov-int32.h \ libinterp/octave-value/ov-int64.h \ libinterp/octave-value/ov-int8.h \ libinterp/octave-value/ov-intx.h \ libinterp/octave-value/ov-uint16.h \ libinterp/octave-value/ov-uint32.h \ libinterp/octave-value/ov-uint64.h \ libinterp/octave-value/ov-uint8.h OV_SPARSE_INC = \ libinterp/octave-value/ov-base-sparse.h \ libinterp/octave-value/ov-bool-sparse.h \ libinterp/octave-value/ov-cx-sparse.h \ libinterp/octave-value/ov-re-sparse.h OCTAVE_VALUE_INC = \ libinterp/octave-value/ov-base-diag.h \ libinterp/octave-value/ov-base-diag.cc \ libinterp/octave-value/ov-base-mat.h \ libinterp/octave-value/ov-base-mat.cc \ libinterp/octave-value/ov-base-scalar.h \ libinterp/octave-value/ov-base-scalar.cc \ libinterp/octave-value/ov-base.h \ libinterp/octave-value/ov-bool-mat.h \ libinterp/octave-value/ov-bool-mat.cc \ libinterp/octave-value/ov-bool.h \ libinterp/octave-value/ov-builtin.h \ libinterp/octave-value/ov-cell.h \ libinterp/octave-value/ov-ch-mat.h \ libinterp/octave-value/ov-class.h \ libinterp/octave-value/ov-classdef.h \ libinterp/octave-value/ov-colon.h \ libinterp/octave-value/ov-complex.h \ libinterp/octave-value/ov-cs-list.h \ libinterp/octave-value/ov-cx-diag.h \ libinterp/octave-value/ov-cx-mat.h \ libinterp/octave-value/ov-dld-fcn.h \ libinterp/octave-value/ov-fcn-handle.h \ libinterp/octave-value/ov-fcn-inline.h \ libinterp/octave-value/ov-fcn.h \ libinterp/octave-value/ov-float.h \ libinterp/octave-value/ov-flt-complex.h \ libinterp/octave-value/ov-flt-cx-diag.h \ libinterp/octave-value/ov-flt-cx-mat.h \ libinterp/octave-value/ov-flt-re-diag.h \ libinterp/octave-value/ov-flt-re-mat.h \ libinterp/octave-value/ov-java.h \ libinterp/octave-value/ov-lazy-idx.h \ libinterp/octave-value/ov-mex-fcn.h \ libinterp/octave-value/ov-null-mat.h \ libinterp/octave-value/ov-oncleanup.h \ libinterp/octave-value/ov-perm.h \ libinterp/octave-value/ov-range.h \ libinterp/octave-value/ov-re-diag.h \ libinterp/octave-value/ov-re-mat.h \ libinterp/octave-value/ov-scalar.h \ libinterp/octave-value/ov-str-mat.h \ libinterp/octave-value/ov-struct.h \ libinterp/octave-value/ov-type-conv.h \ libinterp/octave-value/ov-typeinfo.h \ libinterp/octave-value/ov-usr-fcn.h \ libinterp/octave-value/ov.h \ $(OV_INTTYPE_INC) \ $(OV_SPARSE_INC) OV_INTTYPE_SRC = \ libinterp/octave-value/ov-int16.cc \ libinterp/octave-value/ov-int32.cc \ libinterp/octave-value/ov-int64.cc \ libinterp/octave-value/ov-int8.cc \ libinterp/octave-value/ov-uint16.cc \ libinterp/octave-value/ov-uint32.cc \ libinterp/octave-value/ov-uint64.cc \ libinterp/octave-value/ov-uint8.cc OV_SPARSE_SRC = \ libinterp/octave-value/ov-base-sparse.cc \ libinterp/octave-value/ov-bool-sparse.cc \ libinterp/octave-value/ov-cx-sparse.cc \ libinterp/octave-value/ov-re-sparse.cc OCTAVE_VALUE_SRC = \ libinterp/octave-value/ov-base.cc \ libinterp/octave-value/ov-bool-mat.cc \ libinterp/octave-value/ov-bool.cc \ libinterp/octave-value/ov-builtin.cc \ libinterp/octave-value/ov-cell.cc \ libinterp/octave-value/ov-ch-mat.cc \ libinterp/octave-value/ov-class.cc \ libinterp/octave-value/ov-classdef.cc \ libinterp/octave-value/ov-colon.cc \ libinterp/octave-value/ov-complex.cc \ libinterp/octave-value/ov-cs-list.cc \ libinterp/octave-value/ov-cx-diag.cc \ libinterp/octave-value/ov-cx-mat.cc \ libinterp/octave-value/ov-dld-fcn.cc \ libinterp/octave-value/ov-fcn-handle.cc \ libinterp/octave-value/ov-fcn-inline.cc \ libinterp/octave-value/ov-fcn.cc \ libinterp/octave-value/ov-float.cc \ libinterp/octave-value/ov-flt-complex.cc \ libinterp/octave-value/ov-flt-cx-diag.cc \ libinterp/octave-value/ov-flt-cx-mat.cc \ libinterp/octave-value/ov-flt-re-diag.cc \ libinterp/octave-value/ov-flt-re-mat.cc \ libinterp/octave-value/ov-java.cc \ libinterp/octave-value/ov-lazy-idx.cc \ libinterp/octave-value/ov-mex-fcn.cc \ libinterp/octave-value/ov-null-mat.cc \ libinterp/octave-value/ov-oncleanup.cc \ libinterp/octave-value/ov-perm.cc \ libinterp/octave-value/ov-range.cc \ libinterp/octave-value/ov-re-diag.cc \ libinterp/octave-value/ov-re-mat.cc \ libinterp/octave-value/ov-scalar.cc \ libinterp/octave-value/ov-str-mat.cc \ libinterp/octave-value/ov-struct.cc \ libinterp/octave-value/ov-typeinfo.cc \ libinterp/octave-value/ov-usr-fcn.cc \ libinterp/octave-value/ov.cc \ $(OV_INTTYPE_SRC) \ $(OV_SPARSE_SRC) OV_JAVA_DF = \ libinterp/octave-value/ov.df \ libinterp/octave-value/ov-class.df \ libinterp/octave-value/ov-java.df \ libinterp/octave-value/ov-typeinfo.df ## Special rules for Java .df files so that not all .df files are built with ## JAVA_CPPFLAGS $(OV_JAVA_DF) : libinterp/octave-value/%.df : libinterp/octave-value/%.cc $(GENERATED_MAKE_BUILTINS_INCS) $(AM_V_GEN)rm -f $@-t $@-t1 $@ && \ $(CXXCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(libinterp_octave_value_liboctave_value_la_CPPFLAGS) $(JAVA_CPPFLAGS) $(CPPFLAGS) \ $(libinterp_octave_value_liboctave_value_la_CXXFLAGS) \ -DMAKE_BUILTINS $< > $@-t1 && \ $(srcdir)/libinterp/mkdefs $(srcdir)/libinterp $< < $@-t1 > $@-t && \ mv $@-t $@ && \ rm -f $@-t1 noinst_LTLIBRARIES += libinterp/octave-value/liboctave-value.la libinterp_octave_value_liboctave_value_la_SOURCES = $(OCTAVE_VALUE_SRC) ## FIXME -- maybe it would be better to limit the JAVA flags to ## the compile commands for ov-java.cc? Does JAVA_LIBS need to be ## added to LIBOCTINTERP_LINK_DEPS (see libinterp/link-deps.mk)? ## Should we have a separate set of JAVA_LDFLAGS? libinterp_octave_value_liboctave_value_la_CPPFLAGS = \ $(libinterp_liboctinterp_la_CPPFLAGS) \ $(HDF5_CPPFLAGS) \ $(JAVA_CPPFLAGS) libinterp_octave_value_liboctave_value_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS) libinterp_octave_value_liboctave_value_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS) libinterp_octave_value_liboctave_value_la_LIBADD = $(JAVA_LIBS)