Mercurial > octave-nkf

comparison Makefile.am @ 20343:bacaec9b5535

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate recursive make invocation in test directory tree * test/module.mk: New file created from test/Makefile.am, test/bug-35448/module.mk, test/bug-36025/module.mk, test/bug-38236/module.mk, test/bug-38691/module.mk, test/bug-44940/module.mk, test/class-concat/module.mk, test/classdef/module.mk, test/classes/module.mk, test/ctor-vs-method/module.mk, test/fcn-handle-derived-resolution/module.mk, and test/nest/module.mk. * test/Makefile.am, test/bug-35448/module.mk, test/bug-36025/module.mk, test/bug-38236/module.mk, test/bug-38691/module.mk, test/bug-44940/module.mk, test/class-concat/module.mk, test/classdef/module.mk, test/classes/module.mk, test/ctor-vs-method/module.mk, test/fcn-handle-derived-resolution/module.mk, test/nest/module.mk: Delete. * configure.ac (AC_OUTPUT): Don't generate test/Makefile. * Makefile.am: Include test/module.mk. * build-aux/common.mk, test/build-bc-overload-tests.sh: Adapt to changes in Makefile structure.
author John W. Eaton <jwe@octave.org>
date Tue, 07 Jul 2015 10:40:38 -0400
parents c3c1fb44f9b5
children 2d84d27dc9f0
comparison
equal deleted inserted replaced
20342:c3c1fb44f9b5 20343:bacaec9b5535
56 CLEANFILES = 56 CLEANFILES =
57 DISTCLEANFILES = 57 DISTCLEANFILES =
58 MAINTAINERCLEANFILES = 58 MAINTAINERCLEANFILES =
59 info_TEXINFOS = 59 info_TEXINFOS =
60 BUILT_SOURCES = 60 BUILT_SOURCES =
61 TEST_FILES =
61 62
62 IMAGES_SRC = 63 IMAGES_SRC =
63 IMAGES_EPS = 64 IMAGES_EPS =
64 IMAGES_PDF = 65 IMAGES_PDF =
65 IMAGES_PNG = 66 IMAGES_PNG =
68 include doc/module.mk 69 include doc/module.mk
69 include doc/interpreter/images.mk 70 include doc/interpreter/images.mk
70 include etc/module.mk 71 include etc/module.mk
71 include examples/module.mk 72 include examples/module.mk
72 include m4/module.mk 73 include m4/module.mk
74 include test/module.mk
73 75
74 # Subdirectories in which to run make recursively. Other 76 # Subdirectories in which to run make recursively. Other
75 # directories are handled directly from this Makefile (see also the 77 # directories are handled directly from this Makefile (see also the
76 # included makefile fragments). 78 # included makefile fragments).
77 79
78 SUBDIRS = libgnu liboctave libinterp 80 SUBDIRS = libgnu liboctave libinterp
79 if AMCOND_BUILD_GUI 81 if AMCOND_BUILD_GUI
80 SUBDIRS += libgui 82 SUBDIRS += libgui
81 endif 83 endif
82 SUBDIRS += src scripts test 84 SUBDIRS += src scripts
83 85
84 dist-hook: doc-interpreter-dist-hook docs-dist-hook icons-dist-hook 86 dist-hook: doc-interpreter-dist-hook docs-dist-hook icons-dist-hook
85 87
86 if AMCOND_BUILD_DOCS 88 if AMCOND_BUILD_DOCS
87 docs-dist-hook: 89 docs-dist-hook:
131 @echo "" 133 @echo ""
132 @echo " ./run-octave - to run in place to test before installing" 134 @echo " ./run-octave - to run in place to test before installing"
133 @echo " make check - to run the tests" 135 @echo " make check - to run the tests"
134 @echo " make install - to install (PREFIX=$(prefix))" 136 @echo " make install - to install (PREFIX=$(prefix))"
135 @echo "" 137 @echo ""
136
137 check: all
138 $(MAKE) -C test check
139
140 if AMCOND_HAVE_LLVM
141 check-jit: all
142 $(MAKE) -C test check-jit
143 endif
144 138
145 run-octave: run-octave.in Makefile 139 run-octave: run-octave.in Makefile
146 $(AM_V_GEN)$(do_subst_script_vals) && \ 140 $(AM_V_GEN)$(do_subst_script_vals) && \
147 chmod a+rx "$@" 141 chmod a+rx "$@"
148 142