Mercurial > octave

changeset 21243:c2b17840910e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
generate and install smx-ops.h and vx-ops.h * liboctave/module.mk (BUILT_INCS): Include smx-ops.h and vx-ops.h in the list. * liboctave/operators/module.mk (run-mx-ops-inclusive): New macro. (liboctave/operators/smx-ops.h, liboctave/operators/vx-ops.h): New targets. (liboctave/operators/mx-ops.h, liboctave/operators/smx-ops.h, liboctave/operators/vx-ops.h): Use run-mx-ops-inclusive.
author John W. Eaton <jwe@octave.org>
date Wed, 10 Feb 2016 13:59:49 -0500
parents ae03a16f3343
children 1473547f50f5
files liboctave/module.mk liboctave/operators/module.mk
diffstat 2 files changed, 15 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/module.mk	Wed Feb 10 13:21:57 2016 -0500
+++ b/liboctave/module.mk	Wed Feb 10 13:59:49 2016 -0500
@@ -24,6 +24,8 @@
 
 BUILT_INCS = \
   liboctave/operators/mx-ops.h \
+  liboctave/operators/smx-ops.h \
+  liboctave/operators/vx-ops.h \
   $(LIBOCTAVE_OPT_INC) \
   $(MX_OP_INC) \
   $(VX_OP_INC) \
--- a/liboctave/operators/module.mk	Wed Feb 10 13:21:57 2016 -0500
+++ b/liboctave/operators/module.mk	Wed Feb 10 13:59:49 2016 -0500
@@ -46,10 +46,20 @@
 $(SMX_OP_INC) $(SMX_OP_SRC) : liboctave/operators/sparse-mk-ops.awk liboctave/operators/smx-ops
 	$(AM_V_GEN)$(call run-mx-ops,smx,sparse-)
 
+define run-mx-ops-inclusive
+  rm -f $@-t $@ && \
+  $(AWK) -f $(OP_SRCDIR)/$(notdir $<) prefix=$(patsubst %-ops.h,%,$(notdir $@)) make_inclusive_header=$(notdir $@) $(OP_SRCDIR)/$(basename $(notdir $@)) > $@-t && \
+	mv $@-t $@
+endef
+
+liboctave/operators/vx-ops.h : liboctave/operators/mk-ops.awk liboctave/operators/vx-ops
+	$(AM_V_GEN)$(run-mx-ops-inclusive)
+
 liboctave/operators/mx-ops.h : liboctave/operators/mk-ops.awk liboctave/operators/mx-ops
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	$(AWK) -f $(OP_SRCDIR)/mk-ops.awk prefix=mx make_inclusive_header=mx-ops.h $(OP_SRCDIR)/mx-ops > $@-t && \
-	mv $@-t $@
+	$(AM_V_GEN)$(run-mx-ops-inclusive)
+
+liboctave/operators/smx-ops.h : liboctave/operators/sparse-mk-ops.awk liboctave/operators/smx-ops
+	$(AM_V_GEN)$(run-mx-ops-inclusive)
 
 noinst_LTLIBRARIES += liboctave/operators/liboperators.la