Mercurial > octave

changeset 22075:7a4897e07727

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: ensure all files needed to run octave in build dir are declared * scripts/module.mk (OCTAVE_INTERPRETER_TARGETS): Include $(PKG_ADD_FILES) in the list, moved from $(ALL_LOCAL_TARGETS). * src/module.mk (ALL_LOCAL_TARGETS): Remove $(OCTAVE_VERSION_LINKS) since it is already listed in $(OCTAVE_INTERPRETER_TARGETS).
author Mike Miller <mtmiller@octave.org>
date Thu, 07 Jul 2016 19:02:08 -0700
parents 5a0eea960bdb
children d9643bc3792a
files scripts/module.mk src/module.mk
diffstat 2 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/module.mk	Thu Jul 07 16:11:47 2016 -0700
+++ b/scripts/module.mk	Thu Jul 07 19:02:08 2016 -0700
@@ -81,12 +81,11 @@
 GEN_FCN_FILES_IN = $(GEN_FCN_FILES:.m=.in.m)
 
 ALL_LOCAL_TARGETS += \
-  $(GEN_FCN_FILES) \
-  $(PKG_ADD_FILES) \
   $(JAR_FILES)
 
 OCTAVE_INTERPRETER_TARGETS += \
-  $(GEN_FCN_FILES)
+  $(GEN_FCN_FILES) \
+  $(PKG_ADD_FILES)
 
 define PKG_ADD_FILE_TEMPLATE
 $(1)/PKG_ADD: $$($(2)_FCN_FILES) $$($(2)_GEN_FCN_FILES) $(1)/$(octave_dirstamp) scripts/mk-pkg-add
--- a/src/module.mk	Thu Jul 07 16:11:47 2016 -0700
+++ b/src/module.mk	Thu Jul 07 19:02:08 2016 -0700
@@ -213,7 +213,7 @@
 	  -e "s|%OCTAVE_HG_ID%|$(HG_ID_VAR)|" $< > $@-t && \
 	$(simple_move_if_change_rule)
 
-ALL_LOCAL_TARGETS += $(OCTAVE_VERSION_LINKS) $(OCTAVE_CROSS_TOOLS)
+ALL_LOCAL_TARGETS += $(OCTAVE_CROSS_TOOLS)
 
 install-exec-hook: make-version-links