[vlfeat] 06/06: the mex .d file generator now works. It has include-path issues

[Dima Kogan]

This is an automated email from the git hooks/post-receive script.

dkogan-guest pushed a commit to branch patch-queue/master
in repository vlfeat.

commit 5212b8ef8dcfd50ed93f3107c7bd14d898439366
Author: Dima Kogan <dima at secretsauce.net>
Date:   Thu Nov 7 12:47:04 2013 -0800

    the mex .d file generator now works. It has include-path issues
---
 make/octave.mak |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/make/octave.mak b/make/octave.mak
index 3f44465..2d2f2b2 100644
--- a/make/octave.mak
+++ b/make/octave.mak
@@ -41,7 +41,8 @@ info: octave-mex-info
 OCTAVE_MEX_SUFFIX := mex
 OCTAVE_MEX_BINDIR := toolbox/mex/octave/$(MEX_SUFFIX)
 OCTAVE_MEX_FLAGS = -L$(BINDIR) -lvl
-OCTAVE_MEX_CFLAGS = -I$(VLDIR)/toolbox
+OCTAVE_MEX_INC    := -I$(VLDIR) -I$(VLDIR)/toolbox
+OCTAVE_MEX_CFLAGS = $(OCTAVE_MEX_INC)
 OCTAVE_MEX_CFLAGS += $(if $(DEBUG), -g, -O)
 OCTAVE_MEX_CFLAGS += $(if $(PROFILE), -O -g,)
 OCTAVE_MEX_CFLAGS += $(STD_CFLAGS)
@@ -85,7 +86,7 @@ octave-mex-all: $(octave_mex_tgt) matlab-noprefix
 $(eval $(call gendir, octave-mex, $(OCTAVE_MEX_BINDIR)))
 
 $(OCTAVE_MEX_BINDIR)/%.d : %.c $(octave-mex-dir)
-	$(call C,MKOCTFILE) $(OCTAVE_MEX_FLAGS) -M "$(<)"
+	$(call C,MKOCTFILE) $(OCTAVE_MEX_INC) -M "$(<)"
 	@mv "$(<:.c=.d)" $(OCTAVE_MEX_BINDIR)
 
 $(octave_mex_dll) : $(dll_tgt)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vlfeat.git