Mercurial > hg > octave-nkf

annotate liboctave/util/module.mk @ 19473:4b8b942ef8db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
limit specific CPPFLAGS variables to specific convenience libs (bug #38928) * libinterp/Makefile.am (AM_CPPFLAGS): Remove $(FT2_CPPFLAGS), $(HDF5_CPPFLAGS), $(Z_CPPFLAGS), $(FFTW_XCPPFLAGS), and $(LLVM_CPPFLAGS) from the list. * liboctave/Makefile.am (AM_CPPFLAGS): Remove $(CURL_CPPFLAGS), $(SPARSE_XCPPFLAGS), $(ARPACK_CPPFLAGS), $(QRUPDATE_CPPFLAGS), and $(FFTW_XCPPFLAGS) from the list. * libinterp/corefcn/module.mk (corefcn_libcorefcn_la_CPPFLAGS): Include $(Z_CPPFLAGS) in the list. * liboctave/array/module.mk (array_libarray_la_CPPFLAGS): Include $(FFTW_XCPPFLAGS) in the list. * liboctave/numeric/module.mk (numeric_libnumeric_la_CPPFLAGS): Remove $(ARPACK_CPPFLAGS) from the list. * liboctave/util/module.mk (util_libutil_la_CPPFLAGS): Include $(CURL_CPPFLAGS) in the list.
author John W. Eaton <jwe@octave.org>
date Thu, 23 Oct 2014 17:12:58 -0400
parents 3087dc835497
children af41e41ad28e
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 += \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
2 util/module.mk
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 = \
17552
d07d59cc8775 move unwind-protect to liboctave
John W. Eaton <jwe@octave.org>
parents: 16940
diff changeset
5 util/action-container.h \
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
6 util/base-list.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
7 util/byte-swap.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
8 util/caseless-str.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
9 util/cmd-edit.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
10 util/cmd-hist.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
11 util/data-conv.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
12 util/functor.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
13 util/glob-match.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
14 util/lo-array-gripes.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
15 util/lo-cutils.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
16 util/lo-ieee.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
17 util/lo-macros.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
18 util/lo-math.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
19 util/lo-traits.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
20 util/lo-utils.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
21 util/oct-alloc.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
22 util/oct-base64.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
23 util/oct-binmap.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
24 util/oct-cmplx.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
25 util/oct-glob.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
26 util/oct-inttypes.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
27 util/oct-locbuf.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
28 util/oct-md5.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
29 util/oct-mem.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
30 util/oct-mutex.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
31 util/oct-refcount.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
32 util/oct-rl-edit.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
33 util/oct-rl-hist.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
34 util/oct-shlib.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
35 util/oct-sort.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
36 util/oct-sparse.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
37 util/pathsearch.h \
16940
99122191d3dd maint: Rename regexp.h to lo-regexp.h, regexp.cc to lo-regexp.cc in liboctave.
Rik <rik@octave.org>
parents: 15416
diff changeset
38 util/lo-regexp.h \
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
39 util/singleton-cleanup.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
40 util/sparse-sort.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
41 util/sparse-util.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
42 util/statdefs.h \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
43 util/str-vec.h \
17552
d07d59cc8775 move unwind-protect to liboctave
John W. Eaton <jwe@octave.org>
parents: 16940
diff changeset
44 util/sun-utils.h \
17555
0946b0e06544 move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents: 17552
diff changeset
45 util/unwind-prot.h \
0946b0e06544 move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents: 17552
diff changeset
46 util/url-transfer.h
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
47
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
48 UTIL_C_SRC = \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
49 util/f2c-main.c \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
50 util/lo-cutils.c \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
51 util/oct-rl-edit.c \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
52 util/oct-rl-hist.c
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
53
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
54 UTIL_SRC = \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
55 util/cmd-edit.cc \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
56 util/cmd-hist.cc \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
57 util/data-conv.cc \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
58 util/glob-match.cc \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
59 util/lo-array-gripes.cc \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
60 util/lo-ieee.cc \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
61 util/lo-utils.cc \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
62 util/oct-alloc.cc \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
63 util/oct-base64.cc \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
64 util/oct-glob.cc \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
65 util/oct-inttypes.cc \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
66 util/oct-locbuf.cc \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
67 util/oct-md5.cc \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
68 util/oct-mutex.cc \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
69 util/oct-shlib.cc \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
70 util/pathsearch.cc \
16940
99122191d3dd maint: Rename regexp.h to lo-regexp.h, regexp.cc to lo-regexp.cc in liboctave.
Rik <rik@octave.org>
parents: 15416
diff changeset
71 util/lo-regexp.cc \
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
72 util/singleton-cleanup.cc \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
73 util/sparse-sort.cc \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
74 util/sparse-util.cc \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
75 util/str-vec.cc \
17552
d07d59cc8775 move unwind-protect to liboctave
John W. Eaton <jwe@octave.org>
parents: 16940
diff changeset
76 util/unwind-prot.cc \
17555
0946b0e06544 move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents: 17552
diff changeset
77 util/url-transfer.cc \
15372
bff950876af5 don't compiler kpse.cc by itself
John W. Eaton <jwe@octave.org>
parents: 15271
diff changeset
78 $(UTIL_C_SRC)
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
79
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
80 TEMPLATE_SRC += \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
81 util/oct-sort.cc
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
82
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
83 OTHER_INC += \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
84 util/kpse.cc
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
85
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
86 noinst_LTLIBRARIES += util/libutil.la
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
87
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
88 util_libutil_la_SOURCES = $(UTIL_SRC)
15416
a0fb36acbd0d build: Only use extra CPPFLAGS in the convenience libraries that need them.
Rik <rik@octave.org>
parents: 15380
diff changeset
89 util_libutil_la_CPPFLAGS = \
a0fb36acbd0d build: Only use extra CPPFLAGS in the convenience libraries that need them.
Rik <rik@octave.org>
parents: 15380
diff changeset
90 $(liboctave_la_CPPFLAGS) \
19473
4b8b942ef8db limit specific CPPFLAGS variables to specific convenience libs (bug #38928)
John W. Eaton <jwe@octave.org>
parents: 19316
diff changeset
91 $(CURL_CPPFLAGS) \
17821
82c94987abc6 build: Remove REGEX_CPPFLAGS from XTRA_CXXFLAGS.
Rik <rik@octave.org>
parents: 17555
diff changeset
92 $(PCRE_CPPFLAGS) \
15416
a0fb36acbd0d build: Only use extra CPPFLAGS in the convenience libraries that need them.
Rik <rik@octave.org>
parents: 15380
diff changeset
93 $(SPARSE_XCPPFLAGS)
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents:
diff changeset
94
19316
3087dc835497 eliminate recursive build in liboctave/cruft directory
John W. Eaton <jwe@octave.org>
parents: 18608
diff changeset
95 liboctave_la_LIBADD += util/libutil.la