Mercurial > hg > octave-lyh

changeset 15273:535bb601e7db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use absolute file name to find mk-ops.awk * liboctave/operators/module.mk (OP_SRCDIR): Use absolute name. Let make find operator file dependencies with VPATH.
author John W. Eaton <jwe@octave.org>
date Sat, 01 Sep 2012 11:50:12 -0400
parents dd794aa84232
children c5d09a57ceb2
files liboctave/operators/module.mk
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/operators/module.mk
+++ b/liboctave/operators/module.mk
@@ -42,19 +42,19 @@
 OTHER_INC += \
   operators/mx-inlines.cc
 
-OP_SRCDIR = $(srcdir)/operators
+OP_SRCDIR = $(abs_top_srcdir)/liboctave/operators
 
 ## Special rules for sources which must be built before rest of compilation.
-$(VX_OP_INC) $(VX_OP_SRC) : $(OP_SRCDIR)/mk-ops.awk operators/vx-ops
+$(VX_OP_INC) $(VX_OP_SRC) : operators/mk-ops.awk operators/vx-ops
 	(cd operators; $(AWK) -f $(OP_SRCDIR)/mk-ops.awk prefix=vx $(OP_SRCDIR)/vx-ops)
 
-$(MX_OP_INC) $(MX_OP_SRC) : $(OP_SRCDIR)/mk-ops.awk operators/mx-ops
+$(MX_OP_INC) $(MX_OP_SRC) : operators/mk-ops.awk operators/mx-ops
 	(cd operators; $(AWK) -f $(OP_SRCDIR)/mk-ops.awk prefix=mx $(OP_SRCDIR)/mx-ops)
 
-$(SMX_OP_INC) $(SMX_OP_SRC) : $(OP_SRCDIR)/sparse-mk-ops.awk operators/sparse-mx-ops
+$(SMX_OP_INC) $(SMX_OP_SRC) : operators/sparse-mk-ops.awk operators/sparse-mx-ops
 	(cd operators; $(AWK) -f $(OP_SRCDIR)/sparse-mk-ops.awk prefix=smx $(OP_SRCDIR)/sparse-mx-ops)
 
-operators/mx-ops.h : $(OP_SRCDIR)/mk-ops.awk operators/mx-ops
+operators/mx-ops.h : operators/mk-ops.awk operators/mx-ops
 	$(AWK) -f $(OP_SRCDIR)/mk-ops.awk prefix=mx make_inclusive_header=mx-ops.h $(OP_SRCDIR)/mx-ops > $@-t
 	mv $@-t $@