Mercurial > octave

comparison Makefile.am @ 20325:2d84d27dc9f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate recursive make invocation in src directory * src/module.mk: New file, created from src/Makefile.am. * src/Makefile.am: Delete. * configure.ac (AC_OUTPUT): Don't generate src/Makefile. * Makefile.am (SUBDIRS): Remove src. (ALL_LOCAL_TARGETS, bin_PROGRAMS, noinst_HEADERS, OCTAVE_VERSION_LINKS, OCTAVE_CROSS_TOOLS, archlib_PROGRAMS, OCTAVE_INTERPRETER_TARGETS): Initialize new variables. * doc/module.mk ($(GRAPH_PROP_TEXI_SRC), $(BUILT_IMAGES), doc/interpreter/doc-cache): Depend on $(OCTAVE_INTERPRETER_TARGETS). Fix dependencies for octave.html. Use $(abs_top_srcdir) instead of $(srcdir) in rules that use cd. * test/module.mk (GENERATED_TEST_FILES): New macro. (check-local, check-jit): Depend on $(OCTAVE_INTERPRETER_TARGETS) and $(GENERATED_TEST_FILES).
author John W. Eaton <jwe@octave.org>
date Thu, 09 Jul 2015 10:11:41 -0400
parents bacaec9b5535
children 8ef616eec739
comparison
equal deleted inserted replaced
20324:79d64c58daea 20325:2d84d27dc9f0
64 IMAGES_EPS = 64 IMAGES_EPS =
65 IMAGES_PDF = 65 IMAGES_PDF =
66 IMAGES_PNG = 66 IMAGES_PNG =
67 IMAGES_TXT = 67 IMAGES_TXT =
68 68
69 bin_PROGRAMS =
70 archlib_PROGRAMS =
71 noinst_HEADERS =
72 OCTAVE_VERSION_LINKS =
73 OCTAVE_CROSS_TOOLS =
74 OCTAVE_INTERPRETER_TARGETS =
75
76 ALL_LOCAL_TARGETS =
77
78 include src/module.mk
69 include doc/module.mk 79 include doc/module.mk
70 include doc/interpreter/images.mk 80 include doc/interpreter/images.mk
71 include etc/module.mk 81 include etc/module.mk
72 include examples/module.mk 82 include examples/module.mk
73 include m4/module.mk 83 include m4/module.mk
79 89
80 SUBDIRS = libgnu liboctave libinterp 90 SUBDIRS = libgnu liboctave libinterp
81 if AMCOND_BUILD_GUI 91 if AMCOND_BUILD_GUI
82 SUBDIRS += libgui 92 SUBDIRS += libgui
83 endif 93 endif
84 SUBDIRS += src scripts 94 SUBDIRS += scripts
85 95
86 dist-hook: doc-interpreter-dist-hook docs-dist-hook icons-dist-hook 96 dist-hook: doc-interpreter-dist-hook docs-dist-hook icons-dist-hook
87 97
88 if AMCOND_BUILD_DOCS 98 if AMCOND_BUILD_DOCS
89 docs-dist-hook: 99 docs-dist-hook:
109 BUILT_SOURCES += nonexistent-file 119 BUILT_SOURCES += nonexistent-file
110 endif 120 endif
111 121
112 noinst_SCRIPTS = run-octave 122 noinst_SCRIPTS = run-octave
113 123
124 OCTAVE_INTERPRETER_TARGETS += run-octave
125
114 CLEANFILES += \ 126 CLEANFILES += \
115 $(BUILT_SOURCES) 127 $(BUILT_SOURCES)
116 128
117 DISTCLEANFILES += \ 129 DISTCLEANFILES += \
118 .gdbinit \ 130 .gdbinit \
125 CONFIG_FILES = @ac_config_headers@ @ac_config_files@ 137 CONFIG_FILES = @ac_config_headers@ @ac_config_files@
126 138
127 nodist_octinclude_HEADERS = config.h 139 nodist_octinclude_HEADERS = config.h
128 octinclude_HEADERS = oct-conf-post.h 140 octinclude_HEADERS = oct-conf-post.h
129 141
130 all-local: $(noinst_SCRIPTS) $(DIST_INFO_FILES) .gdbinit $(DOC_TARGETS) 142 all-local: $(ALL_LOCAL_TARGETS) $(noinst_SCRIPTS) $(DIST_INFO_FILES) .gdbinit $(DOC_TARGETS)
131 @echo "" 143 @echo ""
132 @echo "Octave successfully built. Now choose from the following:" 144 @echo "Octave successfully built. Now choose from the following:"
133 @echo "" 145 @echo ""
134 @echo " ./run-octave - to run in place to test before installing" 146 @echo " ./run-octave - to run in place to test before installing"
135 @echo " make check - to run the tests" 147 @echo " make check - to run the tests"