Mercurial > octave

diff libinterp/module.mk @ 23709:3b68aeeabc40

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename some build scripts for consistency and move them to where they are used * libgui/mk-default-qt-settings.in.sh: Rename from build-aux/mk-default-qt-settings.in.sh. * libinterp/mk-doc.pl: Rename from libinterp/gendoc.pl. * libinterp/operators/mk-ops.sh: Rename from libinterp/mkops. * scripts/mk-doc.pl: Rename from scripts/mkdoc.pl. * libinterp/mk-builtins.pl: Rename from build-aux/mk-builtins.pl. * liboctave/external/mk-f77-def.in.sh: Rename from build-aux/mk-f77-def.in.sh. * libinterp/corefcn/mk-mxarray-h.in.sh: Rename from build-aux/mk-mxarray-h.in.sh. * libinterp/mk-version-h.in.sh: Rename from build-aux/mk-version-h.in.sh. * libinterp/corefcn/genprops.awk: Rename from libinterp/genprops.awk. * libinterp/corefcn/mk-errno-list.sh: Rename from libinterp/mk-errno-list. * libinterp/mk-pkg-add.sh: Rename from libinterp/mk-pkg-add. * scripts/mk-pkg-add.sh: Rename from scripts/mk-pkg-add. * Makefile.am, build-aux/module.mk, configure.ac, libgui/module.mk, libinterp/corefcn/module.mk, libinterp/dldfcn/config-module.awk, libinterp/module.mk, libinterp/operators/module.mk, liboctave/external/module.mk, liboctave/external/ranlib/module.mk, scripts/module.mk: Update.
author John W. Eaton <jwe@octave.org>
date Tue, 27 Jun 2017 15:10:58 -0400
parents 8308417aff1c
children 279a6bd429f4
line wrap: on
line diff
--- a/libinterp/module.mk	Tue Jun 27 09:24:08 2017 -0700
+++ b/libinterp/module.mk	Tue Jun 27 15:10:58 2017 -0400
@@ -83,16 +83,18 @@
   %reldir%/build-env.in.cc \
   %reldir%/build-env-features.sh \
   %reldir%/deprecated-config.h \
-  %reldir%/gendoc.pl \
-  %reldir%/genprops.awk \
   %reldir%/liboctinterp-build-info.in.cc \
-  %reldir%/mk-errno-list \
-  %reldir%/mk-pkg-add \
-  %reldir%/mkops \
+  %reldir%/mk-builtins.pl \
+  %reldir%/mk-doc.pl \
+  %reldir%/mk-pkg-add.sh \
+  %reldir%/mk-version-h.in.sh \
   %reldir%/op-kw-docs \
   %reldir%/version.in.h \
   $(LIBINTERP_BUILT_DISTFILES)
 
+GEN_CONFIG_SHELL += \
+  %reldir%/mk-version-h.sh
+
 octinclude_HEADERS += \
   %reldir%/builtins.h \
   %reldir%/build-env.h \
@@ -130,9 +132,6 @@
 include %reldir%/corefcn/module.mk
 include %reldir%/dldfcn/module.mk
 
-$(srcdir)/%reldir%/dldfcn/module.mk: $(srcdir)/%reldir%/dldfcn/config-module.sh $(srcdir)/%reldir%/dldfcn/config-module.awk $(srcdir)/%reldir%/dldfcn/module-files
-	$(AM_V_GEN)$(SHELL) $(srcdir)/%reldir%/dldfcn/config-module.sh $(srcdir)
-
 if AMCOND_ENABLE_DYNAMIC_LINKING
   OCT_FILES = $(DLDFCN_LIBS:.la=.oct)
   DLD_LIBOCTINTERP_LIBADD = %reldir%/liboctinterp.la
@@ -241,8 +240,8 @@
 	$(SHELL) $(srcdir)/%reldir%/build-env-features.sh $< > $@-t && \
 	mv $@-t $@
 
-%reldir%/version.h: %reldir%/version.in.h build-aux/mk-version-h.sh | %reldir%/$(octave_dirstamp)
-	$(AM_V_GEN)$(call simple-filter-rule,build-aux/mk-version-h.sh)
+%reldir%/version.h: %reldir%/version.in.h %reldir%/mk-version-h.sh | %reldir%/$(octave_dirstamp)
+	$(AM_V_GEN)$(call simple-filter-rule,%reldir%/mk-version-h.sh)
 
 %reldir%/liboctinterp-build-info.cc: %reldir%/liboctinterp-build-info.in.cc HG-ID | %reldir%/$(octave_dirstamp)
 	$(AM_V_GEN)$(build-info-commands)
@@ -253,22 +252,22 @@
   mkbuiltins_dld_opt = --disable-dl
 endif
 
-%reldir%/builtins.cc: $(LIBINTERP_DEFUN_FILES) build-aux/mk-builtins.pl | %reldir%/$(octave_dirstamp)
+%reldir%/builtins.cc: $(LIBINTERP_DEFUN_FILES) %reldir%/mk-builtins.pl | %reldir%/$(octave_dirstamp)
 	$(AM_V_GEN)rm -f $@-t && \
-	$(PERL) $(srcdir)/build-aux/mk-builtins.pl --source $(mkbuiltins_dld_opt) "$(srcdir)" -- $(LIBINTERP_DEFUN_FILES) > $@-t && \
+	$(PERL) $(srcdir)/%reldir%/mk-builtins.pl --source $(mkbuiltins_dld_opt) "$(srcdir)" -- $(LIBINTERP_DEFUN_FILES) > $@-t && \
 	mv $@-t $@
 
-%reldir%/builtin-defun-decls.h: $(LIBINTERP_DEFUN_FILES) build-aux/mk-builtins.pl | %reldir%/$(octave_dirstamp)
+%reldir%/builtin-defun-decls.h: $(LIBINTERP_DEFUN_FILES) %reldir%/mk-builtins.pl | %reldir%/$(octave_dirstamp)
 	$(AM_V_GEN)rm -f $@-t && \
-	$(PERL) $(srcdir)/build-aux/mk-builtins.pl --header $(mkbuiltins_dld_opt) "$(srcdir)" -- $(LIBINTERP_DEFUN_FILES) > $@-t && \
+	$(PERL) $(srcdir)/%reldir%/mk-builtins.pl --header $(mkbuiltins_dld_opt) "$(srcdir)" -- $(LIBINTERP_DEFUN_FILES) > $@-t && \
 	$(simple_move_if_change_rule)
 
 if AMCOND_ENABLE_DYNAMIC_LINKING
 DLDFCN_PKG_ADD_FILE = %reldir%/dldfcn/PKG_ADD
 
-%reldir%/dldfcn/PKG_ADD: $(DLDFCN_DEFUN_FILES) %reldir%/mk-pkg-add | %reldir%/$(octave_dirstamp)
+%reldir%/dldfcn/PKG_ADD: $(DLDFCN_DEFUN_FILES) %reldir%/mk-pkg-add.sh | %reldir%/$(octave_dirstamp)
 	$(AM_V_GEN)rm -f $@-t && \
-	$(SHELL) $(srcdir)/%reldir%/mk-pkg-add "$(srcdir)" $(DLDFCN_DEFUN_FILES) > $@-t && \
+	$(SHELL) $(srcdir)/%reldir%/mk-pkg-add.sh "$(srcdir)" $(DLDFCN_DEFUN_FILES) > $@-t && \
 	mv $@-t $@
 endif
 
@@ -276,7 +275,7 @@
 
 %reldir%/DOCSTRINGS: $(LIBINTERP_DEFUN_FILES) %reldir%/op-kw-docs | %reldir%/$(octave_dirstamp)
 	$(AM_V_GEN)rm -f %reldir%/DOCSTRINGS-t && \
-	( $(PERL) $(srcdir)/%reldir%/gendoc.pl "$(srcdir)" $(LIBINTERP_DEFUN_FILES); $(SED) -ne '/^\x1d/,$$p' $(srcdir)/%reldir%/op-kw-docs ) > %reldir%/DOCSTRINGS-t && \
+	( $(PERL) $(srcdir)/%reldir%/mk-doc.pl "$(srcdir)" $(LIBINTERP_DEFUN_FILES); $(SED) -ne '/^\x1d/,$$p' $(srcdir)/%reldir%/op-kw-docs ) > %reldir%/DOCSTRINGS-t && \
 	$(call move_if_change_rule,%reldir%/DOCSTRINGS-t,$@)
 
 OCTAVE_INTERPRETER_TARGETS += \