From 56809b0359af7e9108adeb1fd21823a225edf6fa Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Wed, 20 Jan 2016 18:08:59 +0100
Subject: Remove dependency of libastra on libpython by refactoring
 PluginAlgorithm

---
 build/linux/Makefile.in | 2 --
 1 file changed, 2 deletions(-)

(limited to 'build')

diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in
index 3018674..d5644bc 100644
--- a/build/linux/Makefile.in
+++ b/build/linux/Makefile.in
@@ -62,8 +62,6 @@ PYCPPFLAGS  := $(CPPFLAGS)
 PYCPPFLAGS  += -I../include
 PYLDFLAGS = $(LDFLAGS)
 PYLDFLAGS   += -L$(abs_top_builddir)/.libs
-LIBS		+= -l$(PYLIBVER)
-LDFLAGS += -L$(PYLIBDIR)
 endif
 
 # This is below where PYCPPFLAGS copies CPPFLAGS.  The python code is built
-- 
cgit v1.2.3


From 96fa285132bf88462c33c5b24cc1b241fb3d4d73 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Thu, 21 Jan 2016 14:30:32 +0100
Subject: Initialize Python plugins when available in Matlab

---
 build/linux/Makefile.in | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'build')

diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in
index d5644bc..57ed8f8 100644
--- a/build/linux/Makefile.in
+++ b/build/linux/Makefile.in
@@ -95,6 +95,11 @@ ifeq ($(cuda),yes)
 MEXFLAGS += -DASTRA_CUDA
 endif
 
+ifeq ($(python),yes)
+MEXPYLDFLAGS='$$LDFLAGS $(LDFLAGS) -L$(PYLIBDIR)'
+MEXPYLIBS=$(MEXLIBS) -l$(PYLIBVER)
+endif
+
 endif
 
 LIBDIR=/usr/local/lib
@@ -265,6 +270,11 @@ mex: $(MATLAB_MEX)
 
 %.$(MEXSUFFIX): %.o $(MATLAB_CXX_OBJECTS) libastra.la
 	$(MEX) LDFLAGS=$(MEXLDFLAGS) $(MEXFLAGS) $(LIBS) $(MEXLIBS) -lastra -output $* $*.o $(MATLAB_CXX_OBJECTS)
+
+ifeq ($(python),yes)
+matlab/mex/astra_mex_plugin_c.$(MEXSUFFIX): matlab/mex/astra_mex_plugin_c.o $(MATLAB_CXX_OBJECTS) libastra.la
+	$(MEX) LDFLAGS=$(MEXPYLDFLAGS) $(MEXFLAGS) $(LIBS) $(MEXPYLIBS) -lastra -output matlab/mex/astra_mex_plugin_c $< $(MATLAB_CXX_OBJECTS)
+endif
 endif
 
 ifeq ($(python),yes)
-- 
cgit v1.2.3


From 3c194763acb879f0d51b7d4c90c3aad667223214 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Thu, 21 Jan 2016 14:37:07 +0100
Subject: Add missing .PHONY targets

---
 build/linux/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'build')

diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in
index 57ed8f8..9535b4c 100644
--- a/build/linux/Makefile.in
+++ b/build/linux/Makefile.in
@@ -419,7 +419,7 @@ $(srcdir)/configure: $(srcdir)/configure.ac
 	@echo "configure.ac has been changed. Regenerating configure script"
 	cd $(srcdir) && $(SHELL) ./autogen.sh
 
-.PHONY: all mex test clean distclean install install-libraries
+.PHONY: all mex test clean distclean install install-libraries py python-root-install install-python
 
 # don't remove intermediate files:
 .SECONDARY:
-- 
cgit v1.2.3