Mercurial > octave

annotate liboctave/util/module.mk @ 20327:0ce7d8303152

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 76478d2da117
children 9b44691a3520
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
1 EXTRA_DIST += \
20327
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
2 liboctave/util/module.mk
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
3
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
4 UTIL_INC = \
20327
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
5 liboctave/util/action-container.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
6 liboctave/util/base-list.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
7 liboctave/util/byte-swap.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
8 liboctave/util/caseless-str.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
9 liboctave/util/cmd-edit.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
10 liboctave/util/cmd-hist.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
11 liboctave/util/data-conv.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
12 liboctave/util/functor.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
13 liboctave/util/glob-match.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
14 liboctave/util/lo-array-gripes.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
15 liboctave/util/lo-cutils.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
16 liboctave/util/lo-ieee.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
17 liboctave/util/lo-macros.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
18 liboctave/util/lo-math.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
19 liboctave/util/lo-traits.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
20 liboctave/util/lo-utils.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
21 liboctave/util/oct-alloc.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
22 liboctave/util/oct-base64.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
23 liboctave/util/oct-binmap.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
24 liboctave/util/oct-cmplx.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
25 liboctave/util/oct-glob.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
26 liboctave/util/oct-inttypes.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
27 liboctave/util/oct-locbuf.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
28 liboctave/util/oct-md5.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
29 liboctave/util/oct-mutex.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
30 liboctave/util/oct-refcount.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
31 liboctave/util/oct-rl-edit.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
32 liboctave/util/oct-rl-hist.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
33 liboctave/util/oct-shlib.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
34 liboctave/util/oct-sort.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
35 liboctave/util/oct-sparse.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
36 liboctave/util/pathsearch.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
37 liboctave/util/lo-regexp.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
38 liboctave/util/singleton-cleanup.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
39 liboctave/util/sparse-sort.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
40 liboctave/util/sparse-util.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
41 liboctave/util/statdefs.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
42 liboctave/util/str-vec.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
43 liboctave/util/sun-utils.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
44 liboctave/util/unwind-prot.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
45 liboctave/util/url-transfer.h
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
46
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
47 UTIL_C_SRC = \
20327
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
48 liboctave/util/f2c-main.c \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
49 liboctave/util/lo-cutils.c \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
50 liboctave/util/oct-rl-edit.c \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
51 liboctave/util/oct-rl-hist.c
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
52
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
53 UTIL_SRC = \
20327
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
54 liboctave/util/cmd-edit.cc \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
55 liboctave/util/cmd-hist.cc \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
56 liboctave/util/data-conv.cc \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
57 liboctave/util/glob-match.cc \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
58 liboctave/util/lo-array-gripes.cc \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
59 liboctave/util/lo-ieee.cc \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
60 liboctave/util/lo-utils.cc \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
61 liboctave/util/oct-base64.cc \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
62 liboctave/util/oct-glob.cc \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
63 liboctave/util/oct-inttypes.cc \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
64 liboctave/util/oct-locbuf.cc \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
65 liboctave/util/oct-md5.cc \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
66 liboctave/util/oct-mutex.cc \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
67 liboctave/util/oct-shlib.cc \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
68 liboctave/util/pathsearch.cc \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
69 liboctave/util/lo-regexp.cc \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
70 liboctave/util/singleton-cleanup.cc \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
71 liboctave/util/sparse-sort.cc \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
72 liboctave/util/sparse-util.cc \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
73 liboctave/util/str-vec.cc \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
74 liboctave/util/unwind-prot.cc \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
75 liboctave/util/url-transfer.cc \
15372
bff950876af5 don't compiler kpse.cc by itself
John W. Eaton <jwe@octave.org>
parents: 15271
diff changeset
76 $(UTIL_C_SRC)
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
77
20327
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
78 LIBOCTAVE_TEMPLATE_SRC += \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
79 liboctave/util/oct-sort.cc
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
80
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
81 OTHER_INC += \
20327
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
82 liboctave/util/kpse.cc
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
83
20327
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
84 noinst_LTLIBRARIES += liboctave/util/libutil.la
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
85
20327
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
86 liboctave_util_libutil_la_SOURCES = $(UTIL_SRC)
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
87
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
88 liboctave_util_libutil_la_CPPFLAGS = \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
89 $(liboctave_liboctave_la_CPPFLAGS) \
19281
4b8b942ef8db limit specific CPPFLAGS variables to specific convenience libs (bug #38928)
John W. Eaton <jwe@octave.org>
parents: 19124
diff changeset
90 $(CURL_CPPFLAGS) \
17821
82c94987abc6 build: Remove REGEX_CPPFLAGS from XTRA_CXXFLAGS.
Rik <rik@octave.org>
parents: 17555
diff changeset
91 $(PCRE_CPPFLAGS) \
15416
a0fb36acbd0d build: Only use extra CPPFLAGS in the convenience libraries that need them.
Rik <rik@octave.org>
parents: 15380
diff changeset
92 $(SPARSE_XCPPFLAGS)
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
93
20327
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
94 liboctave_util_libutil_la_CFLAGS = $(liboctave_liboctave_la_CFLAGS)
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
95
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
96 liboctave_util_libutil_la_CXXFLAGS = $(liboctave_liboctave_la_CXXFLAGS)
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
97
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 19598
diff changeset
98 liboctave_liboctave_la_LIBADD += liboctave/util/libutil.la