Mercurial > octave-nkf

annotate liboctave/module.mk @ 20595:c1a6c31ac29a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate more simple uses of error_state * ov-classdef.cc: Eliminate simple uses of error_state.
author John W. Eaton <jwe@octave.org>
date Tue, 06 Oct 2015 00:20:02 -0400
parents 1625e6bd5ce7
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
20401
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20362
diff changeset
1 liboctave_EXTRA_DIST =
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20362
diff changeset
2
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20362
diff changeset
3 liboctave_CLEANFILES =
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20362
diff changeset
4 liboctave_DISTCLEANFILES =
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20362
diff changeset
5 liboctave_MAINTAINERCLEANFILES =
9794
0d4613a736e9 convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6
14397
670feb71afde maint: Move @CPPFLAGS@ to end of AM_CPPFLAGS lists in Makefiles.
John W. Eaton <jwe@octave.org>
parents: 14348
diff changeset
7 ## Search local directories before those specified by the user.
20362
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
8 liboctave_liboctave_la_CPPFLAGS = \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
9 @OCTAVE_DLL_DEFS@ \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
10 @CRUFT_DLL_DEFS@ \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
11 -I$(srcdir)/liboctave/array \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
12 -I$(srcdir)/liboctave/cruft/misc \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
13 -Iliboctave/numeric -I$(srcdir)/liboctave/numeric \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
14 -Iliboctave/operators -I$(srcdir)/liboctave/operators \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
15 -I$(srcdir)/liboctave/system \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
16 -I$(srcdir)/liboctave/util \
17215
7c06875c2dcc Backed out changeset 3d1205d5771e
John W. Eaton <jwe@octave.org>
parents: 17214
diff changeset
17 -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu
9794
0d4613a736e9 convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18
20362
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
19 liboctave_liboctave_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS)
15363
482d92904aa4 don't use WARN_CXXFLAGS for qterminal library
John W. Eaton <jwe@octave.org>
parents: 15278
diff changeset
20
20362
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
21 liboctave_liboctave_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS)
9794
0d4613a736e9 convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22
20362
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
23 octlib_LTLIBRARIES += liboctave/liboctave.la
10376
1ed7cc046c52 Makefile.am rules for rebuilding .mk files
John W. Eaton <jwe@octave.org>
parents: 10350
diff changeset
24
9794
0d4613a736e9 convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25 BUILT_INCS = \
20362
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
26 liboctave/operators/mx-ops.h \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
27 $(LIBOCTAVE_OPT_INC) \
9794
0d4613a736e9 convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28 $(MX_OP_INC) \
0d4613a736e9 convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff changeset
29 $(VX_OP_INC) \
0d4613a736e9 convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30 $(SMX_OP_INC)
0d4613a736e9 convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31
20362
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
32 BUILT_SOURCES += $(BUILT_INCS)
9794
0d4613a736e9 convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33
20362
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
34 octinclude_HEADERS += \
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents: 15269
diff changeset
35 $(ARRAY_INC) \
19158
3087dc835497 eliminate recursive build in liboctave/cruft directory
John W. Eaton <jwe@octave.org>
parents: 18041
diff changeset
36 $(CRUFT_INC) \
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents: 15269
diff changeset
37 $(NUMERIC_INC) \
20362
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
38 $(LIBOCTAVE_OPERATORS_INC) \
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents: 15269
diff changeset
39 $(SYSTEM_INC) \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents: 15269
diff changeset
40 $(UTIL_INC) \
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents: 15269
diff changeset
41 $(OTHER_INC) \
20362
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
42 $(LIBOCTAVE_TEMPLATE_SRC)
9794
0d4613a736e9 convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff changeset
43
20362
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
44 nodist_octinclude_HEADERS += \
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents: 15269
diff changeset
45 $(BUILT_INCS)
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents: 15269
diff changeset
46
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents: 15269
diff changeset
47 ## C++ files that are #included, not compiled
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents: 15269
diff changeset
48 OTHER_INC =
9794
0d4613a736e9 convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff changeset
49
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents: 15269
diff changeset
50 ## C++ files with templates that are #included, not compiled
20362
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
51 LIBOCTAVE_TEMPLATE_SRC =
9979
3878bae57c12 Clean liboctave/Makefile.am to use more standard automake syntax
Rik <rdrider0-list@yahoo.com>
parents: 9946
diff changeset
52
16019
5b2126a8c84f install tests and functions to run them
John W. Eaton <jwe@octave.org>
parents: 15601
diff changeset
53 ## A list of all files that could include tests
5b2126a8c84f install tests and functions to run them
John W. Eaton <jwe@octave.org>
parents: 15601
diff changeset
54
20362
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
55 liboctave_liboctave_la_LIBADD =
19158
3087dc835497 eliminate recursive build in liboctave/cruft directory
John W. Eaton <jwe@octave.org>
parents: 18041
diff changeset
56
20362
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
57 include liboctave/array/module.mk
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
58 include liboctave/cruft/module.mk
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
59 include liboctave/numeric/module.mk
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
60 include liboctave/operators/module.mk
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
61 include liboctave/system/module.mk
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
62 include liboctave/util/module.mk
9794
0d4613a736e9 convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff changeset
63
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents: 15269
diff changeset
64 ## liboctave merely collects a bunch of compiled convenience libraries.
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents: 15269
diff changeset
65 ## It has no source code itself.
20362
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
66 liboctave_liboctave_la_SOURCES =
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents: 15269
diff changeset
67
15416
a0fb36acbd0d build: Only use extra CPPFLAGS in the convenience libraries that need them.
Rik <rik@octave.org>
parents: 15386
diff changeset
68 # Dummy C++ source to force C++ linking.
20418
1625e6bd5ce7 build: Move nonexistent dummy source files into lib directories
Mike Miller <mtmiller@octave.org>
parents: 20408
diff changeset
69 nodist_EXTRA_liboctave_liboctave_la_SOURCES = liboctave/dummy.cc
15386
5546fe4dd77f force C++ linking for liboctave and liboctgui
John W. Eaton <jwe@octave.org>
parents: 15363
diff changeset
70
20362
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
71 liboctave_liboctave_la_LIBADD += \
15278
f4b5304ee451 build: Remove unnecessary -I includes from AM_CPPFLAGS.
Rik <rik@octave.org>
parents: 15272
diff changeset
72 $(top_builddir)/libgnu/libgnu.la \
15271
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents: 15269
diff changeset
73 $(LIBOCTAVE_LINK_DEPS)
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents: 15269
diff changeset
74
648dabbb4c6b build: Refactor liboctave into multiple subdirectories. Move libcruft into liboctave.
Rik <rik@octave.org>
parents: 15269
diff changeset
75 # Increment these as needed and according to the rules in the libtool manual:
20362
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
76 liboctave_liboctave_current = 3
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
77 liboctave_liboctave_revision = 0
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
78 liboctave_liboctave_age = 0
12708
e34f2bf7319d maint: implement proper library versioning.
John W. Eaton <jwe@octave.org>
parents: 12338
diff changeset
79
20362
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
80 liboctave_liboctave_version_info = $(liboctave_liboctave_current):$(liboctave_liboctave_revision):$(liboctave_age)
12708
e34f2bf7319d maint: implement proper library versioning.
John W. Eaton <jwe@octave.org>
parents: 12338
diff changeset
81
20362
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
82 liboctave_liboctave_la_LDFLAGS = \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
83 -version-info $(liboctave_liboctave_version_info) \
12708
e34f2bf7319d maint: implement proper library versioning.
John W. Eaton <jwe@octave.org>
parents: 12338
diff changeset
84 $(NO_UNDEFINED_LDFLAG) \
15600
fcdc284f96ef Fix cruft.def location and usage.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15416
diff changeset
85 @XTRA_CRUFT_SH_LDFLAGS@ \
10342
7f6b4c6838ea Add -bindir flags to _LDFLAGS variables.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 10331
diff changeset
86 -bindir $(bindir) \
13010
edc5ec6e949b maint: allow --enable-static --disable-dl to work again
John W. Eaton <jwe@octave.org>
parents: 13004
diff changeset
87 $(LIBOCTAVE_LINK_OPTS)
9794
0d4613a736e9 convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff changeset
88
16019
5b2126a8c84f install tests and functions to run them
John W. Eaton <jwe@octave.org>
parents: 15601
diff changeset
89 ## Rules to build test files
5b2126a8c84f install tests and functions to run them
John W. Eaton <jwe@octave.org>
parents: 15601
diff changeset
90
5b2126a8c84f install tests and functions to run them
John W. Eaton <jwe@octave.org>
parents: 15601
diff changeset
91 LIBOCTAVE_TST_SRC = \
20362
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
92 $(liboctave_array_libarray_la_SOURCES) \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
93 $(liboctave_numeric_libnumeric_la_SOURCES) \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
94 $(liboctave_system_libsystem_la_SOURCES) \
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
95 $(liboctave_util_libutil_la_SOURCES) \
20405
f74ab65ee1bf Restore installation of tests from template source files
Mike Miller <mtmiller@octave.org>
parents: 20401
diff changeset
96 $(LIBOCTAVE_TEMPLATE_SRC)
16019
5b2126a8c84f install tests and functions to run them
John W. Eaton <jwe@octave.org>
parents: 15601
diff changeset
97
20362
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
98 LIBOCTAVE_TST_FILES_SRC := $(shell $(top_srcdir)/build-aux/find-files-with-tests.sh "$(srcdir)" $(LIBOCTAVE_TST_SRC))
16019
5b2126a8c84f install tests and functions to run them
John W. Eaton <jwe@octave.org>
parents: 15601
diff changeset
99
20362
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
100 LIBOCTAVE_TST_FILES := $(addsuffix -tst,$(LIBOCTAVE_TST_FILES_SRC))
16019
5b2126a8c84f install tests and functions to run them
John W. Eaton <jwe@octave.org>
parents: 15601
diff changeset
101
20408
3c70050faa1e Fix install paths of fixed and generated test files
Mike Miller <mtmiller@octave.org>
parents: 20405
diff changeset
102 liboctavetestsdir := $(octtestsdir)
16019
5b2126a8c84f install tests and functions to run them
John W. Eaton <jwe@octave.org>
parents: 15601
diff changeset
103
20362
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
104 nobase_liboctavetests_DATA = $(LIBOCTAVE_TST_FILES)
16019
5b2126a8c84f install tests and functions to run them
John W. Eaton <jwe@octave.org>
parents: 15601
diff changeset
105
20401
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20362
diff changeset
106 EXTRA_DIST += $(liboctave_EXTRA_DIST)
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20362
diff changeset
107
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20362
diff changeset
108 liboctave_DISTCLEANFILES += \
16056
f4f0aea29b21 build: remove *-tst files with distclean rule.
Rik <rik@octave.org>
parents: 16019
diff changeset
109 $(BUILT_INCS) \
20362
0ce7d8303152 eliminate recursive make invocations in liboctave and libinterp directories
John W. Eaton <jwe@octave.org>
parents: 20169
diff changeset
110 $(LIBOCTAVE_TST_FILES)
9794
0d4613a736e9 convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff changeset
111
20401
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20362
diff changeset
112 CLEANFILES += $(liboctave_CLEANFILES)
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20362
diff changeset
113 DISTCLEANFILES += $(liboctave_DISTCLEANFILES)
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20362
diff changeset
114 MAINTAINERCLEANFILES += $(liboctave_MAINTAINERCLEANFILES)
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20362
diff changeset
115
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20362
diff changeset
116 liboctave-clean:
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20362
diff changeset
117 rm -f $(liboctave_CLEANFILES)
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20362
diff changeset
118
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20362
diff changeset
119 liboctave-distclean: liboctave-clean
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20362
diff changeset
120 rm -f $(liboctave_DISTCLEANFILES)
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20362
diff changeset
121
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20362
diff changeset
122 liboctave-maintainer-clean: liboctave-distclean
9b44691a3520 provide per-directory clean targets
John W. Eaton <jwe@octave.org>
parents: 20362
diff changeset
123 rm -f $(liboctave_MAINTAINERCLEANFILES)