Generalise compilation of octave modules

src/Makefile.am

@@ -47,19 +47,15 @@ include $(top_srcdir)/am/global-rules
 
 include $(top_srcdir)/flymake.mk
 
+## Octave
+
 MKOCTFILE ?= mkoctfile
 OCTAVE    ?= octave
 
-bin_PROGRAMS =
-
-## Octave
-
-OCTAVE_MODULES= duneminimise.oct duneevaluate.oct
-octave_modules: $(OCTAVE_MODULES)
+OCTAVE_MODULES= duneminimise duneevaluate
 
 .PHONY:
-run-octave: octave_modules
+run-octave: $(addsuffix .oct,$(OCTAVE_MODULES))
 	$(OCTAVE) --path $(abs_builddir) --path $(abs_srcdir)
 
-include $(srcdir)/duneminimise.mk
-include $(srcdir)/duneevaluate.mk
+include $(srcdir)/octave.mk

src/duneevaluate.mk

-bin_PROGRAMS += duneminimise.oct
-
-# this would work if shared libraries were only passed via -L and -l, not directly
-#duneminimise_LINK = libtool --tag=CXX --mode link $(MKOCTFILE) $(AM_LDFLAGS) -o $@
-
-duneevaluate.oct: duneevaluate.o
-	$(MKOCTFILE) -o $@ $< -ldunecommon
-
-duneevaluate.o: duneevaluate.cc duneoctave.hh
-	$(MKOCTFILE) $(DEFS) $(AM_CPPFLAGS) -c -o $@ $<

src/duneminimise.mk

-bin_PROGRAMS += duneminimise.oct
-
-# this would work if shared libraries were only passed via -L and -l, not directly
-#duneminimise_LINK = libtool --tag=CXX --mode link $(MKOCTFILE) $(AM_LDFLAGS) -o $@
-
-duneminimise.oct: duneminimise.o
-	$(MKOCTFILE) -o $@ $< -ldunecommon
-
-duneminimise.o: duneminimise.cc duneoctave.hh
-	$(MKOCTFILE) $(DEFS) $(AM_CPPFLAGS) -c -o $@ $<

src/octave.mk

+define OCTFILE_template =
+$(1).oct: $(1).o
+	$$(MKOCTFILE) -o $$@ $$< -ldunecommon
+
+$(1).o: $(1).cc duneoctave.hh
+	$$(MKOCTFILE) $$(DEFS) $$(AM_CPPFLAGS) -c -o $$@ $$<
+endef
+
+$(foreach octave_module,$(OCTAVE_MODULES),$(eval $(call OCTFILE_template,$(octave_module))))
+
+CLEANFILES = $(addsuffix .oct,$(OCTAVE_MODULES)) $(addsuffix .o,$(OCTAVE_MODULES))
+