Mercurial > mxe-octave

view src/of-tsa-1-cross-fixes.patch @ 3948:1fea617cdf13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-odepkg: update to v0.8.5 * src/of-odepkg.mk: update version, checksum, compile if binary package * build_packages.m: add odepkg back to install script * Makefile.am: add of-odepkg back to installed of packages
author John Donoghue
date Thu, 21 May 2015 13:51:16 -0400
parents 1368ac3ea124
children c970bbc5e7db
line wrap: on
line source

diff -ur tsa.orig/src/Makefile tsa/src/Makefile
--- tsa.orig/src/Makefile	2015-05-17 20:55:08.000000000 -0400
+++ tsa/src/Makefile	2015-05-17 20:58:48.000000000 -0400
@@ -39,11 +39,12 @@
 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
-RM      = rm
+MKOCTFILE ?= mkoctfile$(OCTAVE_VERSION)
+OCTMEX	?= $(MKOCTFILE) --mex
+RM      ?= rm
 
 ifneq (Darwin,$(shell uname))
 CFLAGS      += -fopenmp
@@ -91,7 +92,7 @@
 #	Octave, MATLAB on Linux 
 #########################################################
 %.oct: %.cc
-	mkoctfile$(OCTAVE_VERSION) "$<"
+	$(MKOCTFILE) "$<"
 
 %.mex: %.cpp
 	$(OCTMEX) "$<" -llapack -lblas