[vlfeat] 05/06: octave 'make clean' now works properly

[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 aff8dfd6b560a5c03cbfcd44e6aef4705e45495c
Author: Dima Kogan <dima at secretsauce.net>
Date:   Thu Nov 7 11:21:57 2013 -0800

    octave 'make clean' now works properly
    
    Two fixes:
    
    1. 'make clean' now always cleans up octave stuff, even if octave builds are
       off. This works to clean up from previous runs
    2. octave now cleans up its .o files
---
 make/octave.mak |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/make/octave.mak b/make/octave.mak
index 8f72472..3f44465 100644
--- a/make/octave.mak
+++ b/make/octave.mak
@@ -28,10 +28,13 @@ endif
 
 ifdef OCTAVE_ENABLE
 all: octave-mex-all
+endif
+
+# cleaning rules are defined even if OCTAVE_ENABLE is off, so that we can clean
+# up previous build products
 clean: octave-mex-clean
 archclean: octave-mex-archclean
 distclean: octave-mex-distclean
-endif
 
 info: octave-mex-info
 
@@ -65,6 +68,7 @@ octave_mex_src := $(shell find $(VLDIR)/toolbox -name "*.c")
 octave_mex_tgt := $(addprefix $(OCTAVE_MEX_BINDIR)/,\
                   $(notdir $(mex_src:.c=.$(OCTAVE_MEX_SUFFIX)) ) )
 octave_mex_dep := $(octave_mex_tgt:.$(OCTAVE_MEX_SUFFIX)=.d)
+octave_mex_obj := $(notdir $(mex_src:.c=.o))
 octave_mex_dll := $(OCTAVE_MEX_BINDIR)/lib$(DLL_NAME).$(DLL_SUFFIX)
 
 ifdef OCTAVE_ENABLE
@@ -113,7 +117,7 @@ octave-mex-info:
 	@echo
 
 octave-mex-clean:
-	rm -f $(octave_mex_dep)
+	rm -f $(octave_mex_dep) $(octave_mex_obj)
 
 octave-mex-archclean: octave-clean
 	rm -f $(octave_mex_tgt)

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