Mercurial > octave-nkf
comparison Makefile.am @ 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 | 8ef616eec739 |
children | fa9fa6ab76f0 |
comparison
equal
deleted
inserted
replaced
20361:8ef616eec739 | 20362:0ce7d8303152 |
---|---|
24 octetc_DATA = | 24 octetc_DATA = |
25 octlocale_DATA = | 25 octlocale_DATA = |
26 | 26 |
27 ACLOCAL_AMFLAGS = -I m4 | 27 ACLOCAL_AMFLAGS = -I m4 |
28 | 28 |
29 BUILT_DISTFILES = \ | 29 BUILT_DISTFILES = |
30 BUILT_NODISTFILES = | |
31 EXTRA_DIST = | |
32 | |
33 BUILT_DISTFILES += \ | |
30 AUTHORS \ | 34 AUTHORS \ |
31 BUGS \ | 35 BUGS \ |
32 ChangeLog \ | 36 ChangeLog \ |
33 INSTALL.OCTAVE | 37 INSTALL.OCTAVE |
34 | 38 |
35 EXTRA_DIST = \ | 39 EXTRA_DIST += \ |
36 COPYING \ | 40 COPYING \ |
37 ChangeLog \ | 41 ChangeLog \ |
38 INSTALL \ | 42 INSTALL \ |
39 NEWS \ | 43 NEWS \ |
40 README \ | 44 README \ |
75 OCTAVE_INTERPRETER_TARGETS = | 79 OCTAVE_INTERPRETER_TARGETS = |
76 | 80 |
77 octlib_LTLIBRARIES = | 81 octlib_LTLIBRARIES = |
78 noinst_LTLIBRARIES = | 82 noinst_LTLIBRARIES = |
79 | 83 |
84 octinclude_HEADERS = | |
85 nodist_octinclude_HEADERS = | |
86 | |
87 DIST_SRC = | |
88 | |
80 ALL_LOCAL_TARGETS = | 89 ALL_LOCAL_TARGETS = |
81 | 90 |
91 include liboctave/module.mk | |
92 include liboctave/link-deps.mk | |
93 include libinterp/module.mk | |
94 include libinterp/link-deps.mk | |
82 include libgui/module.mk | 95 include libgui/module.mk |
83 include libgui/link-deps.mk | 96 include libgui/link-deps.mk |
84 include src/module.mk | 97 include src/module.mk |
85 include doc/module.mk | 98 include doc/module.mk |
86 include doc/interpreter/images.mk | 99 include doc/interpreter/images.mk |
91 | 104 |
92 # Subdirectories in which to run make recursively. Other | 105 # Subdirectories in which to run make recursively. Other |
93 # directories are handled directly from this Makefile (see also the | 106 # directories are handled directly from this Makefile (see also the |
94 # included makefile fragments). | 107 # included makefile fragments). |
95 | 108 |
96 SUBDIRS = libgnu liboctave libinterp scripts | 109 SUBDIRS = libgnu scripts |
97 | 110 |
98 dist-hook: doc-interpreter-dist-hook docs-dist-hook icons-dist-hook | 111 dist-hook: doc-interpreter-dist-hook docs-dist-hook icons-dist-hook |
99 | 112 |
100 if AMCOND_BUILD_DOCS | 113 if AMCOND_BUILD_DOCS |
101 docs-dist-hook: | 114 docs-dist-hook: |
136 MAINTAINERCLEANFILES += \ | 149 MAINTAINERCLEANFILES += \ |
137 $(BUILT_DISTFILES) | 150 $(BUILT_DISTFILES) |
138 | 151 |
139 CONFIG_FILES = @ac_config_headers@ @ac_config_files@ | 152 CONFIG_FILES = @ac_config_headers@ @ac_config_files@ |
140 | 153 |
141 nodist_octinclude_HEADERS = config.h | 154 octinclude_HEADERS += oct-conf-post.h |
142 octinclude_HEADERS = oct-conf-post.h | 155 nodist_octinclude_HEADERS += config.h |
143 | 156 |
144 all-local: $(ALL_LOCAL_TARGETS) $(noinst_SCRIPTS) $(DIST_INFO_FILES) .gdbinit $(DOC_TARGETS) | 157 all-local: $(ALL_LOCAL_TARGETS) $(noinst_SCRIPTS) $(DIST_INFO_FILES) .gdbinit $(DOC_TARGETS) |
145 @echo "" | 158 @echo "" |
146 @echo "Octave successfully built. Now choose from the following:" | 159 @echo "Octave successfully built. Now choose from the following:" |
147 @echo "" | 160 @echo "" |