Minor changes to build scripts

.gitignore

@@ -51,7 +51,7 @@ configure.log
 /src/examples
 /src/shogun/.clang_complete
 /src/configure-*-*.c*
-
+/src/build-local
 
 # static interfaces
 /src/interfaces/cmdline_static/shogun

examples/undocumented/libshogun/Makefile

@@ -21,7 +21,7 @@ TARGETS = basic_minimal \
 		  classifier_libsvm_probabilities\
 		  classifier_minimal_svm \
 		  classifier_mklmulticlass \
-  		  classifier_conjugateindex \
+		  classifier_conjugateindex \
 		  classifier_gaussiannaivebayes \
 		  classifier_multiclasslibsvm \
 		  classifier_qda \
@@ -46,15 +46,15 @@ TARGETS = basic_minimal \
 		  regression_gaussian_process_product \
 		  regression_gaussian_process_ard \
 		  regression_gaussian_process_laplace \
-  		  regression_gaussian_process_simple_exact \
+		  regression_gaussian_process_simple_exact \
 		  modelselection_model_selection_parameters_test \
 		  modelselection_parameter_tree \
 		  modelselection_apply_parameter_tree \
 		  modelselection_grid_search_linear features_subset_labels \
 		  modelselection_grid_search_kernel \
 		  modelselection_grid_search_string_kernel \
 		  modelselection_grid_search_multiclass_svm \
-  		  modelselection_combined_kernel_sub_parameters \
+		  modelselection_combined_kernel_sub_parameters \
 		  features_dense_real_modular \
 		  features_subset_stack \
 		  features_subset_simple_features \
@@ -107,10 +107,10 @@ TARGETS = basic_minimal \
 		  library_hdf5 \
 		  library_serialization \
 		  classifier_svmlight_string_features_precomputed_kernel \
-  		  classifier_mkl_svmlight_modelselection_bug \
-  		  base_migration_new_buggy \
-  		  regression_libsvr \
-  		  classifier_multiclass_prob_heuristics \
+		  classifier_mkl_svmlight_modelselection_bug \
+		  base_migration_new_buggy \
+		  regression_libsvr \
+		  classifier_multiclass_prob_heuristics \
 		  streaming_onlineliblinear \
 		  io_linereader \
 		  library_circularbuffer \

examples/undocumented/libshogun/check.sh

@@ -19,10 +19,10 @@ do
 	else
 		echo " ERROR"
 		echo "================================================================================" >>error.log
-		echo "error in $MAKE $e $CC $LIBRARY_PATH $LIB_PATH $INC_PATH $LIBS" >>error.log
+		echo "error in $MAKE $e $CC $LIBRARY_PATH $LIB_PATH $INC_PATH $LIBS $INCLUDES" >>error.log
 		echo "error in ./$e" >>error.log 2>&1
 		echo "================================================================================" >>error.log
-		$MAKE "$e" "$CC" "$LIBRARY_PATH" "$LIB_PATH" "$INC_PATH" "$LIBS" >>error.log 2>&1 && $GDB $GDBOPTS "./$e" >>error.log
+		$MAKE "$e" "$CC" "$LIBRARY_PATH" "$LIB_PATH" "$INC_PATH" "$LIBS" "$INCLUDES" >>error.log 2>&1 && $GDB $GDBOPTS "./$e" >>error.log
 		echo "================================================================================" >>error.log
 		echo >>error.log
 		echo >>error.log

src/Makefile

@@ -83,15 +83,14 @@ check-examples: $(PARTDEPS)
 	$(MAKE) -C shogun check-examples
 	+$(foreach part, $(PARTS), $(MAKE) -C interfaces/$(part) check-examples-$(part) &&) true
 
-LOCAL_BUILD_DIR="local-build-tmp"
+install-local:
+	$(MAKE) DESTDIR="$(shell readlink -f .)"/build-local install
 
-install-local-build:
-	$(MAKE) DESTDIR="$(shell readlink -f ".")"/"$(LOCAL_BUILD_DIR)" install
-clean-local-build:
-	@rm -rf "$(LOCAL_BUILD_DIR)"
+clean-local:
+	@rm -rf build-local
 
-%-local-build: install-local-build
-	$(MAKE) DESTDIR="$(shell readlink -f ".")"/"$(LOCAL_BUILD_DIR)" $*
+%-local: install-local
+	$(MAKE) DESTDIR="$(shell readlink -f .)"/build-local $*
 
 doc:  $(PARTDEPS)
 	+$(foreach part, $(PARTS), $(MAKE) -C interfaces/$(part) doc-$(part) &&) true
@@ -109,7 +108,7 @@ clean:  $(PARTDEPS)
 	@+$(foreach part, $(PARTS), $(MAKE) -C interfaces/$(part) $@ &&) true
 	@rm -rf configure-*.dSYM
 	@rm -f configure.log .cpuinfo .cpuinfo.c ./configure-* cplex.log examples
-	$(MAKE) clean-local-build
+	$(MAKE) clean-local
 
 dist:	distclean
 	rm -f $(TAR).gz

src/Makefile.template

@@ -189,7 +189,7 @@ install-cmdline_static: $(TEMPLATE_TARGET)
 	install -d -m755 $(DESTDIR)$(BINDIR)
 	install -m755 $(TEMPLATE_TARGET) $(DESTDIR)$(BINDIR)
 
-install-libshogun: $(TEMPLATE_TARGET)
+install-libshogun: $(TEMPLATE_TARGET) $(TEMPLATE_STATIC)
 	install -d -m755 $(DESTDIR)$(LIBDIR)
 	install -d -m755 "$(DESTDIR)$(INCDIR)/shogun"
 	install -m755 $(TEMPLATE_TARGET) $(DESTDIR)$(LIBDIR)
@@ -356,7 +356,6 @@ run-testsuite-python_static:
 	cd $(CONFIGPATH)/../tests/integration/python_static && \
 		( $(LIBRARY_PATH)=$(DESTDIR)$(LIBDIR) PYTHON=$(PYTHON) \
 		PYTHONPATH="$(DESTDIR)$(PYDIR)" ./test_all.sh	)
-
 check-examples-python_static:
 	cd $(CONFIGPATH)/../examples/undocumented/python_static && \
 		( $(LIBRARY_PATH)=$(DESTDIR)$(LIBDIR) PYTHON=$(PYTHON) \
@@ -394,7 +393,6 @@ run-testsuite-matlab_static:
 	cd $(CONFIGPATH)/../tests/integration/matlab_static && \
 		( ln -sf $(CONFIGPATH)/../src/matlab/$(TEMPLATE_TARGET) ; \
 		$(LIBRARY_PATH)=$(DESTDIR)$(LIBDIR) ./test_all.sh - matlab)
-
 check-examples-matlab_static:
 	cd $(CONFIGPATH)/../examples/undocumented/matlab_static && \
 		( $(LIBRARY_PATH)=$(DESTDIR)$(LIBDIR) \
@@ -407,6 +405,11 @@ run-testsuite-python_modular:
 	cd $(CONFIGPATH)/../tests/integration/python_modular && \
 		( $(LIBRARY_PATH)=$(DESTDIR)$(LIBDIR) \
 		PYTHONPATH="$(DESTDIR)$(PYDIR)" $(PYTHON) tester.py  )
+check-examples-python_modular:
+	cd $(CONFIGPATH)/../examples/undocumented/python_modular && \
+		( $(LIBRARY_PATH)=$(DESTDIR)$(LIBDIR) PYTHON=$(PYTHON) \
+		GDB="gdb -x ../../../src/.gdb --args" \
+		PYTHONPATH="$(DESTDIR)$(PYDIR)" ./check.sh    )
 
 run-testsuite-perl_modular:
 	cd $(CONFIGPATH)/../tests/integration/perl_modular && (\
@@ -417,28 +420,19 @@ run-testsuite-perl_modular:
 	$(LIBRARY_PATH)=$(DESTDIR)$(LIBDIR) PERLPATH="$(DESTDIR)$(PLDIR)" \
 	$(LIBRARY_PATH)="/usr/src/shogun/src/interfaces/perl_modular:/usr/src/shogun/src/shogun" \
 	./tester.pl)
-
-check-examples-python_modular:
-	cd $(CONFIGPATH)/../examples/undocumented/python_modular && \
-		( $(LIBRARY_PATH)=$(DESTDIR)$(LIBDIR) PYTHON=$(PYTHON) \
-		GDB="gdb -x ../../../src/.gdb --args" \
-		PYTHONPATH="$(DESTDIR)$(PYDIR)" ./check.sh    )
-
 check-examples-perl_modular:
 	cd $(CONFIGPATH)/../examples/undocumented/perl_modular && \
 		( $(LIBRARY_PATH)=$(DESTDIR)$(LIBDIR) PERL=$(PERL) \
 		PERLPATH="$(DESTDIR)$(PLDIR)" ./check.sh    )
 
 run-testsuite-java_modular:
 #TODO
-
 check-examples-java_modular:
 	cd $(CONFIGPATH)/../examples/undocumented/java_modular && \
 		( $(LIBRARY_PATH)=$(DESTDIR)$(LIBDIR) ./check.sh    )
 
 run-testsuite-csharp_modular:
 #TODO
-
 check-examples-csharp_modular:
 	cd $(CONFIGPATH)/../examples/undocumented/csharp_modular && \
 		( $(LIBRARY_PATH)=$(DESTDIR)$(LIBDIR) ./check.sh    )
@@ -463,15 +457,13 @@ check-examples-octave_modular:
 
 run-testsuite-lua_modular:
 #TODO
-
 check-examples-lua_modular:
 	cd $(CONFIGPATH)/../examples/undocumented/lua_modular && \
 		( $(LIBRARY_PATH)=$(DESTDIR)$(LIBDIR) \
 		LUA_CPATH="$(DESTDIR)$(LUA_EXTENSIONS_INSTALL_DIR)/?.so" ./check.sh )
 
 run-testsuite-ruby_modular:
 #TODO
-
 check-examples-ruby_modular:
 	cd $(CONFIGPATH)/../examples/undocumented/ruby_modular && \
 		( $(LIBRARY_PATH)=$(DESTDIR)$(LIBDIR) \