# HG changeset patch
# User schloegl
# Date 1442063080 0
# Node ID 16bc2657b1f12a53a2b847326d4a624b88448935
# Parent  e2c27fba9dd63eb2086d408b4860a92594e264e8
[nan][tsa] honor CC and CXX environment variables; fix build error with gcc-5 for mex4m target

diff -r e2c27fba9dd6 -r 16bc2657b1f1 extra/NaN/src/Makefile
--- a/extra/NaN/src/Makefile	Sat Sep 12 09:30:19 2015 +0000
+++ b/extra/NaN/src/Makefile	Sat Sep 12 13:04:40 2015 +0000
@@ -31,8 +31,8 @@
 # Instead of building "mex shortpath.c" and "mex uigetpath.c", I used empty m-functions within argout=argin; 
 ####################################################
 MKOCTFILE ?= mkoctfile$(OCTAVE_VERSION)
-CC      = gcc
-CXX     = g++
+CC      ?= gcc
+CXX     ?= g++
 CFLAGS += -fopenmp -Wall -Wextra -Wconversion -O2
 OCTMEX	= $(MKOCTFILE) --mex -lgomp
 RM      = rm
@@ -99,12 +99,12 @@
 svm_model_octave.o: svm_model_matlab.c 
 	env CC=$(CC) $(MKOCTFILE) -o "$@" -c "$<"
 svm_model_matlab.o: svm_model_matlab.c 
-	$(CC) $(CFLAGS) -I $(MATLABDIR)/extern/include -o "$@" -c "$<"  
+	$(CXX) $(CFLAGS) -I $(MATLABDIR)/extern/include -o "$@" -c "$<"  
 svm.o: svm.cpp
 	$(CC) $(CFLAGS) -c svm.cpp
 
 train.$(MEX_EXT) predict.$(MEX_EXT): train.c tron.o linear.o linear_model_matlab.c
-	$(CC) $(CFLAGS) -I $(MATLABDIR)/extern/include -c linear_model_matlab.c
+	$(CXX) $(CFLAGS) -I $(MATLABDIR)/extern/include -c linear_model_matlab.c
 	$(MATMEX)  -lblas train.c tron.o linear.o linear_model_matlab.o 
 	#$(MATMEX) -lblas predict.c tron.o linear.o linear_model_matlab.o
 train.mex predict.mex: train.c tron.o linear.o linear_model_matlab.c
diff -r e2c27fba9dd6 -r 16bc2657b1f1 extra/tsa/src/Makefile
--- a/extra/tsa/src/Makefile	Sat Sep 12 09:30:19 2015 +0000
+++ b/extra/tsa/src/Makefile	Sat Sep 12 13:04:40 2015 +0000
@@ -39,8 +39,8 @@
 W32_LIBS += $(LDLIBS_W32)libblas.a
 W64_LIBS += $(LDLIBS_W64)libblas.a
 
-CC  	= gcc
-CXX 	= g++
+CC  	?= gcc
+CXX 	?= g++
 CFLAGS 	= -Wall -Wextra -Wconversion -O2 -fPIC 
 OCTMEX	= mkoctfile$(OCTAVE_VERSION) --mex -lgomp
 RM      = rm