Mercurial > octave

changeset 22024:659731a4563f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: delete generated files, keep distributed files on clean and distclean (bug #45646) * Makefile.am (CLEANFILES): Add octave-config.h and run-octave to the list. Remove $(BUILT_SOURCES) from the list. (DISTCLEANFILES): Add $(GEN_CONFIG_INC) to the list. (nodist_octinclude_HEADERS): Add oct-conf-post.h to the list. * libgui/src/module.mk (libgui_CLEANFILES): Add libgui/src/liboctgui-build-info.cc to the list. (libgui_DISTCLEANFILES): Remove libgui/src/liboctgui-build-info.cc from the list. * libinterp/module.mk (LIBINTERP_BUILT_NODISTFILES): Add libinterp/corefcn/graphics-props.cc to the list. (nodist_octinclude_HEADERS): Add libinterp/builtin-defun-decls.h and libinterp/corefcn/graphics-props.cc to the list. (octinclude_HEADERS): Remove libinterp/builtin-defun-decls.h and libinterp/corefcn/graphics-props.cc from the list. (libinterp_CLEANFILES): Add $(LIBINTERP_BUILT_NODISTFILES) to the list, replacing libinterp/corefcn/graphics-props.cc. (libinterp_DISTCLEANFILES): Remove $(LIBINTERP_BUILT_NODISTFILES) from the list. * liboctave/cruft/module.mk (liboctave_CLEANFILES): Add the previous contents of $(liboctave_DISTCLEANFILES) to the list. * liboctave/module.mk (liboctave_CLEANFILES): Add $(LIBOCTAVE_BUILT_NODISTFILES) to the list. (liboctave_DISTCLEANFILES): Remove $(LIBOCTAVE_BUILT_NODISTFILES) and $(BUILT_INCS) from the list. * liboctave/numeric/module.mk (liboctave_CLEANFILES): Add $(LIBOCTAVE_OPT_INC) to the list. * liboctave/operators/module.mk (liboctave_CLEANFILES): Add $(BUILT_LIBOCTAVE_OPERATORS_FILES) to the list. (liboctave_DISTCLEANFILES): Remove $(BUILT_LIBOCTAVE_OPERATORS_SOURCES) from the list. * scripts/module.mk (scripts_CLEANFILES): Add $(GEN_FCN_FILES) to the list. (scripts_DISTCLEANFILES): Remove $(GEN_FCN_FILES) from the list. * src/module.mk (src_CLEANFILES): Add src/main.cc, src/mkoctfile.cc, src/octave-build-info.cc, and src/octave-config.cc to the list. (src_DISTCLEANFILES): Remove src/octave-config-build-info.cc from the list. (DISTCLEANFILES): Remove src/main.cc, src/mkoctfile.cc, and src/octave-config.cc from the list.
author Mike Miller <mtmiller@octave.org>
date Fri, 01 Jul 2016 10:51:49 -0700
parents b602ce0b5acf
children 0f2389d8fe0c
files Makefile.am libgui/src/module.mk libinterp/module.mk liboctave/cruft/module.mk liboctave/module.mk liboctave/numeric/module.mk liboctave/operators/module.mk scripts/module.mk src/module.mk
diffstat 9 files changed, 29 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.am	Fri Jul 01 20:12:57 2016 -0700
+++ b/Makefile.am	Fri Jul 01 10:51:49 2016 -0700
@@ -289,12 +289,14 @@
 noinst_SCRIPTS = run-octave
 
 CLEANFILES += \
-  $(BUILT_SOURCES) \
   config-vars \
-  make-vars
+  make-vars \
+  octave-config.h \
+  run-octave
 
 DISTCLEANFILES += \
   $(DIRSTAMP_FILES) \
+  $(GEN_CONFIG_INC) \
   $(GEN_CONFIG_SHELL) \
   .gdbinit
 
@@ -305,8 +307,10 @@
 
 CONFIG_FILES = @ac_config_headers@ @ac_config_files@
 
-octinclude_HEADERS += oct-conf-post.h
-nodist_octinclude_HEADERS += config.h octave-config.h
+nodist_octinclude_HEADERS += \
+  config.h \
+  oct-conf-post.h \
+  octave-config.h
 
 ALL_LOCAL_TARGETS += \
   $(OCTAVE_INTERPRETER_TARGETS) \
--- a/libgui/src/module.mk	Fri Jul 01 20:12:57 2016 -0700
+++ b/libgui/src/module.mk	Fri Jul 01 10:51:49 2016 -0700
@@ -228,13 +228,11 @@
   $(octave_gui_UI) \
   $(octave_gui_ICONS)
 
-libgui_DISTCLEANFILES += \
-  libgui/src/liboctgui-build-info.cc
-
 libgui_CLEANFILES += \
   $(octave_gui_MOC) \
   $(octave_gui_UI_H) \
-  $(octave_gui_RC)
+  $(octave_gui_RC) \
+  libgui/src/liboctgui-build-info.cc
 
 libgui/src/liboctgui-build-info.cc: libgui/src/liboctgui-build-info.in.cc | libgui/src/$(octave-dirstamp)
 	$(AM_V_GEN)rm -f $@-t && \
--- a/libinterp/module.mk	Fri Jul 01 20:12:57 2016 -0700
+++ b/libinterp/module.mk	Fri Jul 01 10:51:49 2016 -0700
@@ -71,6 +71,7 @@
   libinterp/corefcn/mxarray.h \
   libinterp/corefcn/oct-errno.cc \
   libinterp/corefcn/defaults.h \
+  libinterp/corefcn/graphics-props.cc \
   libinterp/corefcn/graphics.h \
   libinterp/builtin-defun-decls.h \
   libinterp/operators/ops.cc \
@@ -93,9 +94,7 @@
   $(LIBINTERP_BUILT_DISTFILES)
 
 octinclude_HEADERS += \
-  libinterp/corefcn/graphics-props.cc \
   libinterp/builtins.h \
-  libinterp/builtin-defun-decls.h \
   libinterp/build-env.h \
   libinterp/liboctinterp-build-info.h \
   libinterp/octave.h \
@@ -110,9 +109,11 @@
   $(NOINSTALL_LIBINTERP_OPERATORS_INC)
 
 nodist_octinclude_HEADERS += \
-  libinterp/corefcn/mxarray.h \
+  libinterp/builtin-defun-decls.h \
   libinterp/corefcn/defaults.h \
+  libinterp/corefcn/graphics-props.cc \
   libinterp/corefcn/graphics.h \
+  libinterp/corefcn/mxarray.h \
   libinterp/version.h
 
 DIST_SRC += \
@@ -328,15 +329,12 @@
 
 libinterp_CLEANFILES += \
   $(DLDFCN_PKG_ADD_FILE) \
+  $(LIBINTERP_BUILT_NODISTFILES) \
   $(LIBINTERP_TST_FILES) \
   $(OCT_FILES) \
-  libinterp/corefcn/graphics-props.cc \
   libinterp/corefcn/oct-tex-parser.output \
   libinterp/parse-tree/oct-parse.output
 
-libinterp_DISTCLEANFILES += \
-  $(LIBINTERP_BUILT_NODISTFILES)
-
 libinterp_MAINTAINERCLEANFILES += \
   $(srcdir)/libinterp/DOCSTRINGS \
   $(LIBINTERP_BUILT_DISTFILES)
--- a/liboctave/cruft/module.mk	Fri Jul 01 20:12:57 2016 -0700
+++ b/liboctave/cruft/module.mk	Fri Jul 01 10:51:49 2016 -0700
@@ -29,7 +29,7 @@
 	$(SHELL) build-aux/mk-f77-def.sh $(srcdir) $(liboctave_cruft_libcruft_la_SOURCES) > $@-t && \
 	mv $@-t $@
 
-liboctave_DISTCLEANFILES += \
+liboctave_CLEANFILES += \
   liboctave/cruft/cruft.def \
   liboctave/cruft/ranlib/ranlib.def \
   $(nodist_liboctave_cruft_libcruft_la_SOURCES)
--- a/liboctave/module.mk	Fri Jul 01 20:12:57 2016 -0700
+++ b/liboctave/module.mk	Fri Jul 01 10:51:49 2016 -0700
@@ -121,12 +121,9 @@
 EXTRA_DIST += $(liboctave_EXTRA_DIST)
 
 liboctave_CLEANFILES += \
+  $(LIBOCTAVE_BUILT_NODISTFILES) \
   $(LIBOCTAVE_TST_FILES)
 
-liboctave_DISTCLEANFILES += \
-  $(LIBOCTAVE_BUILT_NODISTFILES) \
-  $(BUILT_INCS)
-
 BUILT_NODISTFILES += $(LIBOCTAVE_BUILT_NODISTFILES)
 
 CLEANFILES += $(liboctave_CLEANFILES)
--- a/liboctave/numeric/module.mk	Fri Jul 01 20:12:57 2016 -0700
+++ b/liboctave/numeric/module.mk	Fri Jul 01 10:51:49 2016 -0700
@@ -119,3 +119,5 @@
 
 liboctave_EXTRA_DIST += $(LIBOCTAVE_OPT_IN)
 
+liboctave_CLEANFILES += \
+  $(LIBOCTAVE_OPT_INC)
--- a/liboctave/operators/module.mk	Fri Jul 01 20:12:57 2016 -0700
+++ b/liboctave/operators/module.mk	Fri Jul 01 10:51:49 2016 -0700
@@ -95,4 +95,5 @@
   liboctave/operators/smx-ops \
   liboctave/operators/vx-ops
 
-liboctave_DISTCLEANFILES += $(BUILT_LIBOCTAVE_OPERATORS_SOURCES)
+liboctave_CLEANFILES += \
+  $(BUILT_LIBOCTAVE_OPERATORS_FILES)
--- a/scripts/module.mk	Fri Jul 01 20:12:57 2016 -0700
+++ b/scripts/module.mk	Fri Jul 01 10:51:49 2016 -0700
@@ -188,11 +188,11 @@
 EXTRA_DIST += $(scripts_EXTRA_DIST)
 
 scripts_CLEANFILES += \
+  $(GEN_FCN_FILES) \
   $(PKG_ADD_FILES)
 
 scripts_DISTCLEANFILES += \
-  $(DIRSTAMP_FILES) \
-  $(GEN_FCN_FILES)
+  $(DIRSTAMP_FILES)
 
 scripts_MAINTAINERCLEANFILES += \
   $(srcdir)/scripts/DOCSTRINGS
--- a/src/module.mk	Fri Jul 01 20:12:57 2016 -0700
+++ b/src/module.mk	Fri Jul 01 10:51:49 2016 -0700
@@ -24,11 +24,6 @@
   src/octave-build-info.in.cc \
   src/octave-config.in.cc
 
-DISTCLEANFILES += \
-  src/main.cc \
-  src/mkoctfile.cc \
-  src/octave-config.cc
-
 bin_PROGRAMS += \
   src/mkoctfile \
   src/octave \
@@ -249,8 +244,12 @@
 	$(AM_V_GEN)rm -f $@ && \
 	cd $(@D) && $(LN_S) $(<F) $(@F)
 
-src_CLEANFILES += $(OCTAVE_VERSION_LINKS)
-src_DISTCLEANFILES += src/octave-build-info.cc
+src_CLEANFILES += \
+  $(OCTAVE_VERSION_LINKS) \
+  src/main.cc \
+  src/mkoctfile.cc \
+  src/octave-build-info.cc \
+  src/octave-config.cc
 
 CLEANFILES += $(src_CLEANFILES)
 DISTCLEANFILES += $(src_DISTCLEANFILES)