From 2e62f69bd19c2a7918ac585a385c4b493f06453b Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Mon, 10 Oct 2011 18:04:33 +0200
Subject: [PATCH] Modularise octfile compilation a bit

---
 src/Makefile.am     | 8 ++++++++
 src/duneminimise.mk | 8 +-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 2b7ac107..dabe8d36 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,4 +40,12 @@ include $(top_srcdir)/am/global-rules
 
 include $(top_srcdir)/flymake.mk
 
+MKOCTFILE=mkoctfile
+
+bin_PROGRAMS =
+
+.PHONY:
+run-octave: duneevaluate.oct duneminimise.oct
+	octave --path $(abs_builddir) --path $(abs_srcdir)
+
 include $(srcdir)/duneminimise.mk
diff --git a/src/duneminimise.mk b/src/duneminimise.mk
index c7f4bd31..58a6d3bd 100644
--- a/src/duneminimise.mk
+++ b/src/duneminimise.mk
@@ -1,6 +1,4 @@
-MKOCTFILE=mkoctfile
-
-bin_PROGRAMS = duneminimise.oct
+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 $@
@@ -10,7 +8,3 @@ duneminimise.oct: duneminimise.o
 
 duneminimise.o: duneminimise.cc
 	$(MKOCTFILE) $(AM_CPPFLAGS) -c -o $@ $<
-
-.PHONY:
-run-octave: duneminimise.oct
-	octave --path $(abs_builddir) --path $(abs_srcdir)
-- 
GitLab