Mercurial > octave

diff 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
line wrap: on
line diff
--- a/Makefile.am	Thu Jul 09 10:11:41 2015 -0400
+++ b/Makefile.am	Thu Jul 09 13:55:58 2015 -0400
@@ -22,6 +22,7 @@
 
 octdata_DATA =
 octetc_DATA =
+octlocale_DATA =
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -73,8 +74,13 @@
 OCTAVE_CROSS_TOOLS =
 OCTAVE_INTERPRETER_TARGETS =
 
+octlib_LTLIBRARIES =
+noinst_LTLIBRARIES =
+
 ALL_LOCAL_TARGETS =
 
+include libgui/module.mk
+include libgui/link-deps.mk
 include src/module.mk
 include doc/module.mk
 include doc/interpreter/images.mk
@@ -87,11 +93,7 @@
 # directories are handled directly from this Makefile (see also the
 # included makefile fragments).
 
-SUBDIRS = libgnu liboctave libinterp
-if AMCOND_BUILD_GUI
-SUBDIRS += libgui
-endif
-SUBDIRS += scripts
+SUBDIRS = libgnu liboctave libinterp scripts
 
 dist-hook: doc-interpreter-dist-hook docs-dist-hook icons-dist-hook