Mercurial > octave-nkf

comparison Makefile.am @ 20342:c3c1fb44f9b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate recursive make invocations in doc directory tree * doc/module.mk: New file created from doc/Makefile.am, doc/doxyhtml/Makefile.am, doc/liboctave/Makefile, doc/interpreter/Makefile.am, and doc/refcard/Makefile. * configure.ac (AC_OUTPUT): Don't generate doc/Makefile, doc/doxyhtml/Makefile, or doc/interpreter/Makefile. * Makefile.am (.NOTPARALLEL, AUTHORS, BUGS, INSTALL.OCTAVE): Delete targets. * config-images.sh, find-docstring-files.sh, geometryimages.m, graphics_properties.mk, images.awk, interpimages.m, plotimages.m, sparseimages.m, splineimages.m: Adapt to Makefile changes. * octave.texi, liboctave.texi: Use unique version file names. * etc/module.mk: Ensure icons build directory is created. (etc/icons/octave-logo.ico): Fix file name. * examples/module.mk (examples_code_SRC): New variable. * doc/Makefile.am, doc/doxyhtml/Makefile.am, doc/liboctave/Makefile.am, doc/interpreter/Makefile.am, doc/refcard/Makefile: Delete.
author John W. Eaton <jwe@octave.org>
date Fri, 03 Jul 2015 19:33:19 -0400
parents 47d704435aa4
children bacaec9b5535
comparison
equal deleted inserted replaced
20341:47d704435aa4 20342:c3c1fb44f9b5
18 # along with Octave; see the file COPYING. If not, see 18 # along with Octave; see the file COPYING. If not, see
19 # <http://www.gnu.org/licenses/>. 19 # <http://www.gnu.org/licenses/>.
20 20
21 include build-aux/common.mk 21 include build-aux/common.mk
22 22
23 ## Avoid making multiple subdirs in parallel which can lead
24 ## to a confusing error message stream
25 .NOTPARALLEL:
26
27 octdata_DATA = 23 octdata_DATA =
28 octetc_DATA = 24 octetc_DATA =
29 25
30 ACLOCAL_AMFLAGS = -I m4 26 ACLOCAL_AMFLAGS = -I m4
31 27
32 BUILT_DISTFILES = AUTHORS BUGS ChangeLog INSTALL.OCTAVE 28 BUILT_DISTFILES = \
29 AUTHORS \
30 BUGS \
31 ChangeLog \
32 INSTALL.OCTAVE
33 33
34 EXTRA_DIST = \ 34 EXTRA_DIST = \
35 AUTHORS \
36 BUGS \
37 COPYING \ 35 COPYING \
38 ChangeLog \ 36 ChangeLog \
39 INSTALL \ 37 INSTALL \
40 INSTALL.OCTAVE \
41 NEWS \ 38 NEWS \
42 README \ 39 README \
43 CITATION \ 40 CITATION \
44 build-aux/find-files-with-tests.sh \ 41 build-aux/find-files-with-tests.sh \
45 build-aux/mk-opts.pl \ 42 build-aux/mk-opts.pl \
46 build-aux/move-if-change \ 43 build-aux/move-if-change \
47 build-aux/OctJavaQry.class \ 44 build-aux/OctJavaQry.class \
48 build-aux/stl_algo.h-fixed \ 45 build-aux/stl_algo.h-fixed \
49 run-octave.in 46 run-octave.in
50 47
48 DIRSTAMP_FILES =
49
50 octave_dirstamp = $(am__leading_dot)octave-dirstamp
51
52 $(DIRSTAMP_FILES):
53 $(AM_V_GEN)$(MKDIR_P) $(@D) && \
54 : > $@
55
51 CLEANFILES = 56 CLEANFILES =
52 DISTCLEANFILES = 57 DISTCLEANFILES =
53 MAINTAINERCLEANFILES = 58 MAINTAINERCLEANFILES =
59 info_TEXINFOS =
60 BUILT_SOURCES =
54 61
62 IMAGES_SRC =
63 IMAGES_EPS =
64 IMAGES_PDF =
65 IMAGES_PNG =
66 IMAGES_TXT =
67
68 include doc/module.mk
69 include doc/interpreter/images.mk
55 include etc/module.mk 70 include etc/module.mk
56 include examples/module.mk 71 include examples/module.mk
57 include m4/module.mk 72 include m4/module.mk
58 73
59 # Subdirectories in which to run `make all'. Including "." before 74 # Subdirectories in which to run make recursively. Other
60 # @DOCDIR@ is an attempt to force all preceding directories in the list 75 # directories are handled directly from this Makefile (see also the
61 # to be processed before the current directory so that the 76 # included makefile fragments).
62 # scripts/DOCSTRINGS libinterp/DOCSTRINGS files are built before 77
63 # attempting to build AUTHORS and BUGS. Including "." again at the end
64 # of the list ensures that we display the "Octave sucessfully built..."
65 # message at the very end of the output from Make. Another fix for
66 # these problems would be to continue eliminating the recursive make
67 # invocations so that we have better control over the dependencies and
68 # the order that things are built.
69 SUBDIRS = libgnu liboctave libinterp 78 SUBDIRS = libgnu liboctave libinterp
70 if AMCOND_BUILD_GUI 79 if AMCOND_BUILD_GUI
71 SUBDIRS += libgui 80 SUBDIRS += libgui
72 endif 81 endif
73 SUBDIRS += src scripts . @DOCDIR@ test . 82 SUBDIRS += src scripts test
74 83
75 dist-hook: docs-dist-hook icons-dist-hook 84 dist-hook: doc-interpreter-dist-hook docs-dist-hook icons-dist-hook
76 85
77 if AMCOND_BUILD_DOCS 86 if AMCOND_BUILD_DOCS
78 docs-dist-hook: 87 docs-dist-hook:
79 else 88 else
80 docs-dist-hook: 89 docs-dist-hook:
86 else 95 else
87 icons-dist-hook: 96 icons-dist-hook:
88 @echo "Packaging distribution requires icotool and rsvg-convert." ; exit 1; 97 @echo "Packaging distribution requires icotool and rsvg-convert." ; exit 1;
89 endif 98 endif
90 99
91 BUILT_SOURCES = run-octave 100 BUILT_SOURCES += \
101 run-octave \
102 $(DIRSTAMP_FILES)
92 103
93 if AMCOND_HAVE_BROKEN_STL_ALGO_H 104 if AMCOND_HAVE_BROKEN_STL_ALGO_H
94 BUILT_SOURCES += bits/stl_algo.h 105 BUILT_SOURCES += bits/stl_algo.h
95 else 106 else
96 BUILT_SOURCES += nonexistent-file 107 BUILT_SOURCES += nonexistent-file
97 endif 108 endif
98 109
99 noinst_SCRIPTS = run-octave 110 noinst_SCRIPTS = run-octave
100 111
101 INFO_FILES = \
102 AUTHORS \
103 BUGS \
104 INSTALL.OCTAVE
105
106 CLEANFILES += \ 112 CLEANFILES += \
107 $(BUILT_SOURCES) 113 $(BUILT_SOURCES)
108 114
109 DISTCLEANFILES += \ 115 DISTCLEANFILES += \
110 .gdbinit \ 116 .gdbinit \
111 ChangeLog 117 ChangeLog \
118 $(DIRSTAMP_FILES)
112 119
113 MAINTAINERCLEANFILES += \ 120 MAINTAINERCLEANFILES += \
114 $(BUILT_DISTFILES) 121 $(BUILT_DISTFILES)
115 122
116 CONFIG_FILES = @ac_config_headers@ @ac_config_files@ 123 CONFIG_FILES = @ac_config_headers@ @ac_config_files@
117 124
118 nodist_octinclude_HEADERS = config.h 125 nodist_octinclude_HEADERS = config.h
119 octinclude_HEADERS = oct-conf-post.h 126 octinclude_HEADERS = oct-conf-post.h
120 127
121 all-local: $(noinst_SCRIPTS) $(INFO_FILES) .gdbinit 128 all-local: $(noinst_SCRIPTS) $(DIST_INFO_FILES) .gdbinit $(DOC_TARGETS)
122 @echo "" 129 @echo ""
123 @echo "Octave successfully built. Now choose from the following:" 130 @echo "Octave successfully built. Now choose from the following:"
124 @echo "" 131 @echo ""
125 @echo " ./run-octave - to run in place to test before installing" 132 @echo " ./run-octave - to run in place to test before installing"
126 @echo " make check - to run the tests" 133 @echo " make check - to run the tests"
151 .PHONY: nonexistent-file 158 .PHONY: nonexistent-file
152 159
153 .gdbinit: etc/gdbinit 160 .gdbinit: etc/gdbinit
154 @$(gdbinit_install_rule) 161 @$(gdbinit_install_rule)
155 162
156 if AMCOND_BUILD_DOCS
157 AUTHORS BUGS INSTALL.OCTAVE:
158 $(AM_V_GEN)$(MAKE) -C doc/interpreter ../../$@
159 endif
160 .PHONY: AUTHORS BUGS INSTALL.OCTAVE
161
162 define changelog-from-hg-log 163 define changelog-from-hg-log
163 rm -f $@-t $@ && \ 164 rm -f $@-t $@ && \
164 ( cd $(srcdir); \ 165 ( cd $(srcdir); \
165 hg log --style=build-aux/changelog.tmpl --prune=b0e60ad4ae26 --only-branch=`hg branch`; \ 166 hg log --style=build-aux/changelog.tmpl --prune=b0e60ad4ae26 --only-branch=`hg branch`; \
166 echo ""; \ 167 echo ""; \
179 180
180 if AMCOND_INSTALL_BUILD_LOGS 181 if AMCOND_INSTALL_BUILD_LOGS
181 octetc_DATA += config.log 182 octetc_DATA += config.log
182 endif 183 endif
183 184
184 doxyhtml:
185 $(MAKE) -C doc/doxyhtml doxyhtml
186 .PHONY: doxyhtml
187
188 DIRS_TO_MAKE = \ 185 DIRS_TO_MAKE = \
189 $(localfcnfiledir) \ 186 $(localfcnfiledir) \
190 $(localapifcnfiledir) \ 187 $(localapifcnfiledir) \
191 $(localverfcnfiledir) \ 188 $(localverfcnfiledir) \
192 $(localoctfiledir) \ 189 $(localoctfiledir) \