Mercurial > octave

comparison Makefile.am @ 20326:8ef616eec739

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate recursive make invocation in libgui directory tree * libgui/module.mk: New file created from libgui/Makefile.am. * libgui/Makefile.am: Delete. * configure.ac (AC_CONFIG_FILES): Remove libgui/Makefile from the list. * Makefile.am (octlocale_DATA, octlib_LTLIBRARIES, noinst_LTLIBRARIES): Initialize variables here. Include libgui/module.mk and libgui/link-deps.mk. (SUBDIRS): Remove libgui from the list. * src/module.mk: Don't include libgui/link-deps.mk. * libgui/graphics/module.mk, libgui/qterminal-module.mk, libgui/src/module.mk: Adapt for non-recursive build.
author John W. Eaton <jwe@octave.org>
date Thu, 09 Jul 2015 13:55:58 -0400
parents 2d84d27dc9f0
children 0ce7d8303152
comparison
equal deleted inserted replaced
20325:2d84d27dc9f0 20326:8ef616eec739
20 20
21 include build-aux/common.mk 21 include build-aux/common.mk
22 22
23 octdata_DATA = 23 octdata_DATA =
24 octetc_DATA = 24 octetc_DATA =
25 octlocale_DATA =
25 26
26 ACLOCAL_AMFLAGS = -I m4 27 ACLOCAL_AMFLAGS = -I m4
27 28
28 BUILT_DISTFILES = \ 29 BUILT_DISTFILES = \
29 AUTHORS \ 30 AUTHORS \
71 noinst_HEADERS = 72 noinst_HEADERS =
72 OCTAVE_VERSION_LINKS = 73 OCTAVE_VERSION_LINKS =
73 OCTAVE_CROSS_TOOLS = 74 OCTAVE_CROSS_TOOLS =
74 OCTAVE_INTERPRETER_TARGETS = 75 OCTAVE_INTERPRETER_TARGETS =
75 76
77 octlib_LTLIBRARIES =
78 noinst_LTLIBRARIES =
79
76 ALL_LOCAL_TARGETS = 80 ALL_LOCAL_TARGETS =
77 81
82 include libgui/module.mk
83 include libgui/link-deps.mk
78 include src/module.mk 84 include src/module.mk
79 include doc/module.mk 85 include doc/module.mk
80 include doc/interpreter/images.mk 86 include doc/interpreter/images.mk
81 include etc/module.mk 87 include etc/module.mk
82 include examples/module.mk 88 include examples/module.mk
85 91
86 # Subdirectories in which to run make recursively. Other 92 # Subdirectories in which to run make recursively. Other
87 # directories are handled directly from this Makefile (see also the 93 # directories are handled directly from this Makefile (see also the
88 # included makefile fragments). 94 # included makefile fragments).
89 95
90 SUBDIRS = libgnu liboctave libinterp 96 SUBDIRS = libgnu liboctave libinterp scripts
91 if AMCOND_BUILD_GUI
92 SUBDIRS += libgui
93 endif
94 SUBDIRS += scripts
95 97
96 dist-hook: doc-interpreter-dist-hook docs-dist-hook icons-dist-hook 98 dist-hook: doc-interpreter-dist-hook docs-dist-hook icons-dist-hook
97 99
98 if AMCOND_BUILD_DOCS 100 if AMCOND_BUILD_DOCS
99 docs-dist-hook: 101 docs-dist-hook: