Changeset 149191 for trunk/dports/math


Ignore:
Timestamp:
Jun 4, 2016, 11:33:59 PM (3 years ago)
Author:
mps@…
Message:

octave-nan, octave-tsa: simplify patch files: no functional change.

Location:
trunk/dports/math
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/math/octave-nan/Portfile

    r146111 r149191  
    88platforms           darwin
    99license             GPL-3+
    10 maintainers         gmail.com:mschamschula openmaintainer
     10maintainers         mps openmaintainer
    1111description         A statistics and machine learning toolbox for \
    1212                    data with and without missing values.
  • trunk/dports/math/octave-nan/files/patch-src_Makefile.diff

    r146111 r149191  
    1 --- src/Makefile.orig   2016-02-15 15:43:42.000000000 -0500
    2 +++ src/Makefile        2016-02-25 21:14:01.000000000 -0500
    3 @@ -13,19 +13,19 @@
    4  # OCTAVE_VERSION=-3.6.3
    5  
    6  # Matlab configuration
    7 -#MATLABDIR = /usr/local/MATLAB/R2010b
    8 +# MATLABDIR = /usr/local/MATLAB/R2010b
    9  # comment the following line if you use MATLAB on 32-bit operating system
    10 -MEX_OPTION += -largeArrayDims
    11 -
    12 +# MEX_OPTION += -largeArrayDims
    13 +#
    14  # Mingw crosscompiler: available at http://www.nongnu.org/mingw-cross-env/
    15 -CROSS   = $(HOME)/src/mxe/usr/bin/i686-w64-mingw32.static-
    16 -CROSS64 = $(HOME)/src/mxe/usr/bin/x86_64-w64-mingw32.static-
    17 +# CROSS   = $(HOME)/src/mxe/usr/bin/i686-w64-mingw32.static-
    18 +# CROSS64 = $(HOME)/src/mxe/usr/bin/x86_64-w64-mingw32.static-
    19  # include directory for Win32-Matlab include
    20 -W32MAT_INC = $(HOME)/bin/win32/Matlab/R2010b/extern/include/
    21 -W64MAT_INC = $(HOME)/bin/win64/Matlab/R2010b/extern/include/
    22 +# W32MAT_INC = $(HOME)/bin/win32/Matlab/R2010b/extern/include/
    23 +# W64MAT_INC = $(HOME)/bin/win64/Matlab/R2010b/extern/include/
    24  # path to GNUMEX libraries, available from here http://sourceforge.net/projects/gnumex/
    25 -GNUMEX   = $(HOME)/bin/win32/gnumex
    26 -GNUMEX64 = $(HOME)/bin/win64/gnumex
    27 +# GNUMEX   = $(HOME)/bin/win32/gnumex
    28 +# GNUMEX64 = $(HOME)/bin/win64/gnumex
    29  # building gnumex64 was difficult, these hints were quite useful:
    30  # http://sourceforge.net/mailarchive/forum.php?thread_name=AANLkTinZvxgC9ezp2P3UCX_a7TAUYuVsp2U40MQUV6qr%40mail.gmail.com&forum_name=gnumex-users
    31  # Instead of building "mex shortpath.c" and "mex uigetpath.c", I used empty m-functions within argout=argin;
     1--- src/Makefile.orig   2016-02-26 09:09:14.000000000 -0600
     2+++ src/Makefile        2016-06-04 18:21:45.000000000 -0500
    323@@ -34,7 +34,7 @@
    334 CC      ?= gcc
     
    3910 
    4011 # Support Debian Hardening flags
    41 @@ -45,13 +45,13 @@
    42  CFLAGS      += -fPIC
    43  endif
     12@@ -79,7 +79,7 @@
    4413 
    45 -ifneq (Darwin,$(shell uname))
    46 -CFLAGS      += -fopenmp
    47 -MEX_OPTION  += -lgomp
    48 -MEX_OPTION  += CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS) " CXXFLAGS\#"$(CFLAGS) "
    49 -endif
    50 +# ifneq (Darwin,$(shell uname))
    51 +# CFLAGS      += -fopenmp
    52 +# MEX_OPTION  += -lgomp
    53 +# MEX_OPTION  += CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS) " CXXFLAGS\#"$(CFLAGS) "
    54 +# endif
    55  
    56 -MATMEX      = $(MATLABDIR)/bin/mex $(MEX_OPTION)
    57 +# MATMEX      = $(MATLABDIR)/bin/mex $(MEX_OPTION)
     14 mexw32 win32:  $(patsubst %.mex, %.mexw32, $(PROGS))
     15 mexw64 win64:  $(patsubst %.mex, %.mexw64, $(PROGS))
     16-all:    octave win32 win64 mex4m
     17+all:    mex4o
    5818 
    59  PROGS = histo_mex.mex covm_mex.mex kth_element.mex sumskipnan_mex.mex str2array.mex train.mex svmtrain_mex.mex svmpredict_mex.mex xptopen.mex
    60  
    61 @@ -59,30 +59,30 @@
    62  mex4o octave: $(PROGS)
    63  
    64  
    65 -### Matlab configuration - search for a matlab directory if not defined above
    66 -ifeq (,$(MATLABDIR))
    67 -  ifneq (,$(shell ls -1 /usr/local/ |grep MATLAB))
    68 -    # use oldest, typically mex-files are compatible with newer Matlab versions
    69 -    MATLABDIR=/usr/local/MATLAB/$(shell ls -1rt /usr/local/MATLAB/  |grep "^R20*" |head -1)
    70 -  endif
    71 -endif
    72 -
    73 -
    74 -### if MATLABDIR has been found or defined
    75 -ifneq (,$(MATLABDIR))
    76 -  ifneq (,$(shell ls -1 $(MATLABDIR)/bin/mexext))
    77 -    MEX_EXT=$(shell $(MATLABDIR)/bin/mexext)
    78 -    mex4m matlab: $(patsubst %.mex, %.$(MEX_EXT), $(PROGS))
    79 -  endif
    80 -endif
    81 -
    82 -
    83 -mexw32 win32:  $(patsubst %.mex, %.mexw32, $(PROGS))
    84 -mexw64 win64:  $(patsubst %.mex, %.mexw64, $(PROGS))
    85 -all:    octave win32 win64 mex4m
    86 -
    87 -clean:
    88 -       -$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex*
    89 +# Matlab configuration - search for a matlab directory if not defined above
    90 +# ifeq (,$(MATLABDIR))
    91 +#   ifneq (,$(shell ls -1 /usr/local/ |grep MATLAB))
    92 +#     use oldest, typically mex-files are compatible with newer Matlab versions
    93 +#     MATLABDIR=/usr/local/MATLAB/$(shell ls -1rt /usr/local/MATLAB/  |grep "^R20*" |head -1)
    94 +#   endif
    95 +# endif
    96 +#
    97 +#
    98 +# if MATLABDIR has been found or defined
    99 +# ifneq (,$(MATLABDIR))
    100 +#   ifneq (,$(shell ls -1 $(MATLABDIR)/bin/mexext))
    101 +#     MEX_EXT=$(shell $(MATLABDIR)/bin/mexext)
    102 +#     mex4m matlab: $(patsubst %.mex, %.$(MEX_EXT), $(PROGS))
    103 +#   endif
    104 +# endif
    105 +#
    106 +#
    107 +# mexw32 win32:  $(patsubst %.mex, %.mexw32, $(PROGS))
    108 +# mexw64 win64:  $(patsubst %.mex, %.mexw64, $(PROGS))
    109 +# all:    octave win32 win64 mex4m
    110 +#
    111 +# clean:
    112 +#      -$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex*
    113  
    114  #$(PROGS): Makefile
    115  
    116 @@ -123,22 +123,22 @@
    117  #########################################################
    118  #      MATLAB/WIN32
    119  #########################################################
    120 -%.obj: %.cpp
    121 -       $(CROSS)$(CXX) -fopenmp -c -DMATLAB_MEX_FILE -x c++ -o "$@" -I$(W32MAT_INC) -O2 -DMX_COMPAT_32 "$<"
    122 -%.obj: %.c
    123 -       $(CROSS)$(CXX) -fopenmp -c -DMATLAB_MEX_FILE -x c++ -o "$@" -I$(W32MAT_INC) -O2 -DMX_COMPAT_32 "$<"
    124 -
    125 -train.mexw32 predict.mexw32:  train.obj linear.obj linear_model_matlab.obj tron.obj
    126 -       $(CROSS)$(CXX) -shared $(GNUMEX)/mex.def -o "$@" -L$(GNUMEX) -s "$<" linear_model_matlab.obj linear.obj tron.obj -llibmx -llibmex -llibmat -lcholmod -lblas
    127 -
    128 -svmpredict_mex.mexw32 :  svmpredict_mex.obj svm.obj svm_model_matlab.obj
    129 -       $(CROSS)$(CXX) -shared $(GNUMEX)/mex.def -o "$@" -L$(GNUMEX) -s "$<" svm_model_matlab.obj svm.obj -llibmx -llibmex -llibmat -lcholmod
    130 -svmtrain_mex.mexw32 : svmtrain_mex.obj svm.obj svm_model_matlab.obj
    131 -       $(CROSS)$(CXX) -shared $(GNUMEX)/mex.def -o "$@" -L$(GNUMEX) -s "$<" svm_model_matlab.obj svm.obj -llibmx -llibmex -llibmat -lcholmod
    132 -
    133 -%.mexw32: %.obj
    134 -       $(CROSS)$(CXX) -shared $(GNUMEX)/mex.def -o "$@" -L$(GNUMEX) -s "$<" -llibmx -llibmex -llibmat -lcholmod -lgomp -lpthread
    135 -
    136 +# %.obj: %.cpp
    137 +#      $(CROSS)$(CXX) -fopenmp -c -DMATLAB_MEX_FILE -x c++ -o "$@" -I$(W32MAT_INC) -O2 -DMX_COMPAT_32 "$<"
    138 +# %.obj: %.c
    139 +#      $(CROSS)$(CXX) -fopenmp -c -DMATLAB_MEX_FILE -x c++ -o "$@" -I$(W32MAT_INC) -O2 -DMX_COMPAT_32 "$<"
    140 +#
    141 +# train.mexw32 predict.mexw32:  train.obj linear.obj linear_model_matlab.obj tron.obj
    142 +#      $(CROSS)$(CXX) -shared $(GNUMEX)/mex.def -o "$@" -L$(GNUMEX) -s "$<" linear_model_matlab.obj linear.obj tron.obj -llibmx -llibmex -llibmat -lcholmod -lblas
    143 +#
    144 +# svmpredict_mex.mexw32 :  svmpredict_mex.obj svm.obj svm_model_matlab.obj
    145 +#      $(CROSS)$(CXX) -shared $(GNUMEX)/mex.def -o "$@" -L$(GNUMEX) -s "$<" svm_model_matlab.obj svm.obj -llibmx -llibmex -llibmat -lcholmod
    146 +# svmtrain_mex.mexw32 : svmtrain_mex.obj svm.obj svm_model_matlab.obj
    147 +#      $(CROSS)$(CXX) -shared $(GNUMEX)/mex.def -o "$@" -L$(GNUMEX) -s "$<" svm_model_matlab.obj svm.obj -llibmx -llibmex -llibmat -lcholmod
    148 +#
    149 +# %.mexw32: %.obj
    150 +#      $(CROSS)$(CXX) -shared $(GNUMEX)/mex.def -o "$@" -L$(GNUMEX) -s "$<" -llibmx -llibmex -llibmat -lcholmod -lgomp -lpthread
    151 +#
    152  
    153  
    154  #########################################################
    155 @@ -146,19 +146,19 @@
    156  #########################################################
    157  
    158  ## ToDO: fix OpenMP support: currently -fopenmp causes Matlab to crash
    159 -%.o64: %.cpp
    160 -       $(CROSS64)$(CXX) -c -DMATLAB_MEX_FILE -x c++ -o "$@" -I$(W64MAT_INC) -O2 "$<"
    161 -%.o64: %.c
    162 -       $(CROSS64)$(CXX) -c -DMATLAB_MEX_FILE -x c++ -o "$@" -I$(W64MAT_INC) -O2 "$<"
    163 -
    164 -train.mexw64 predict.mexw64:  train.o64 linear.o64 linear_model_matlab.o64 tron.o64
    165 -       $(CROSS64)$(CXX) -shared $(GNUMEX64)/mex.def -o "$@" -L$(GNUMEX64) -s "$<" linear_model_matlab.o64 linear.o64 tron.o64 -llibmx -llibmex -llibmat -lcholmod -lblas
    166 -
    167 -svmpredict_mex.mexw64 :  svmpredict_mex.o64 svm.o64 svm_model_matlab.o64
    168 -       $(CROSS64)$(CXX) -shared $(GNUMEX64)/mex.def -o "$@" -L$(GNUMEX64) -s "$<" svm_model_matlab.o64 svm.o64 -llibmx -llibmex -llibmat -lcholmod
    169 -svmtrain_mex.mexw64 : svmtrain_mex.o64 svm.o64 svm_model_matlab.o64
    170 -       $(CROSS64)$(CXX) -shared $(GNUMEX64)/mex.def -o "$@" -L$(GNUMEX64) -s "$<" svm_model_matlab.o64 svm.o64 -llibmx -llibmex -llibmat -lcholmod
    171 -
    172 -%.mexw64: %.o64
    173 -       $(CROSS64)$(CXX) -shared $(GNUMEX64)/mex.def -o "$@" -L$(GNUMEX64) -s "$<" -llibmx -llibmex -llibmat -lcholmod -lgomp -lpthread
    174 -
    175 +# %.o64: %.cpp
    176 +#      $(CROSS64)$(CXX) -c -DMATLAB_MEX_FILE -x c++ -o "$@" -I$(W64MAT_INC) -O2 "$<"
    177 +# %.o64: %.c
    178 +#      $(CROSS64)$(CXX) -c -DMATLAB_MEX_FILE -x c++ -o "$@" -I$(W64MAT_INC) -O2 "$<"
    179 +#
    180 +# train.mexw64 predict.mexw64:  train.o64 linear.o64 linear_model_matlab.o64 tron.o64
    181 +#      $(CROSS64)$(CXX) -shared $(GNUMEX64)/mex.def -o "$@" -L$(GNUMEX64) -s "$<" linear_model_matlab.o64 linear.o64 tron.o64 -llibmx -llibmex -llibmat -lcholmod -lblas
    182 +#
    183 +# svmpredict_mex.mexw64 :  svmpredict_mex.o64 svm.o64 svm_model_matlab.o64
    184 +#      $(CROSS64)$(CXX) -shared $(GNUMEX64)/mex.def -o "$@" -L$(GNUMEX64) -s "$<" svm_model_matlab.o64 svm.o64 -llibmx -llibmex -llibmat -lcholmod
    185 +# svmtrain_mex.mexw64 : svmtrain_mex.o64 svm.o64 svm_model_matlab.o64
    186 +#      $(CROSS64)$(CXX) -shared $(GNUMEX64)/mex.def -o "$@" -L$(GNUMEX64) -s "$<" svm_model_matlab.o64 svm.o64 -llibmx -llibmex -llibmat -lcholmod
    187 +#
    188 +# %.mexw64: %.o64
    189 +#      $(CROSS64)$(CXX) -shared $(GNUMEX64)/mex.def -o "$@" -L$(GNUMEX64) -s "$<" -llibmx -llibmex -llibmat -lcholmod -lgomp -lpthread
    190 +#
     19 clean:
     20        -$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex*
  • trunk/dports/math/octave-tsa/Portfile

    r146132 r149191  
    88platforms           darwin
    99license             GPL-3+
    10 maintainers         gmail.com:mschamschula openmaintainer
     10maintainers         mps openmaintainer
    1111description         Stochastic concepts and maximum entropy \
    1212                    methods for time series analysis.
  • trunk/dports/math/octave-tsa/files/patch-src_Makefile.diff

    r146132 r149191  
    11--- src/Makefile.orig   2016-02-26 09:09:55.000000000 -0600
    2 +++ src/Makefile        2016-02-29 11:33:07.000000000 -0600
    3 @@ -15,74 +15,74 @@
    4  # Matlab configuration
    5  # MATLABDIR = /usr/local/MATLAB/R2010b
    6  # comment the following line if you use MATLAB on 32-bit operating system
    7 -MEX_OPTION += -largeArrayDims
    8 -
    9 -# Mingw crosscompiler: available at http://www.nongnu.org/mingw-cross-env/
    10 -CROSS   = $(HOME)/src/mxe/usr/bin/i686-w64-mingw32.static
    11 -CROSS64 = $(HOME)/src/mxe/usr/bin/x86_64-w64-mingw32.static
    12 -# include directory for Win32-Matlab include
    13 -W32MAT_INC = -I$(HOME)/bin/win32/Matlab/R2010b/extern/include/
    14 -W64MAT_INC = -I$(HOME)/bin/win64/Matlab/R2010b/extern/include/
    15 -# path to GNUMEX libraries, available from here http://sourceforge.net/projects/gnumex/
    16 -GNUMEX   = $(HOME)/bin/win32/gnumex
    17 -GNUMEX64 = $(HOME)/bin/win64/gnumex
    18 -# building gnumex64 was difficult, these hints were quite useful:
    19 -# http://sourceforge.net/mailarchive/forum.php?thread_name=AANLkTinZvxgC9ezp2P3UCX_a7TAUYuVsp2U40MQUV6qr%40mail.gmail.com&forum_name=gnumex-users
    20 -# Instead of building "mex shortpath.c" and "mex uigetpath.c", I used empty m-functions within argout=argin;
    21 -####################################################
    22 -W32MAT_INC += -I$(subst /usr/bin/,/usr/,$(CROSS))/include/
    23 -W64MAT_INC += -I$(subst /usr/bin/,/usr/,$(CROSS64))/include/
    24 -LDLIBS_W32 = $(subst /usr/bin/,/usr/,$(CROSS))/lib/
    25 -LDLIBS_W64 = $(subst /usr/bin/,/usr/,$(CROSS64))/lib/
    26 -W32_LIBS  = $(LDLIBS_W32)liblapack.a
    27 -W64_LIBS  = $(LDLIBS_W64)liblapack.a
    28 -W32_LIBS += $(LDLIBS_W32)libblas.a
    29 -W64_LIBS += $(LDLIBS_W64)libblas.a
    30 -
    31 -CC     ?= gcc
    32 -CXX    ?= g++
    33 +# MEX_OPTION += -largeArrayDims
    34 +#
    35 +# # Mingw crosscompiler: available at http://www.nongnu.org/mingw-cross-env/
    36 +# CROSS   = $(HOME)/src/mxe/usr/bin/i686-w64-mingw32.static
    37 +# CROSS64 = $(HOME)/src/mxe/usr/bin/x86_64-w64-mingw32.static
    38 +# # include directory for Win32-Matlab include
    39 +# W32MAT_INC = -I$(HOME)/bin/win32/Matlab/R2010b/extern/include/
    40 +# W64MAT_INC = -I$(HOME)/bin/win64/Matlab/R2010b/extern/include/
    41 +# # path to GNUMEX libraries, available from here http://sourceforge.net/projects/gnumex/
    42 +# GNUMEX   = $(HOME)/bin/win32/gnumex
    43 +# GNUMEX64 = $(HOME)/bin/win64/gnumex
    44 +# # building gnumex64 was difficult, these hints were quite useful:
    45 +# # http://sourceforge.net/mailarchive/forum.php?thread_name=AANLkTinZvxgC9ezp2P3UCX_a7TAUYuVsp2U40MQUV6qr%40mail.gmail.com&forum_name=gnumex-users
    46 +# # Instead of building "mex shortpath.c" and "mex uigetpath.c", I used empty m-functions within argout=argin;
    47 +# ####################################################
    48 +# W32MAT_INC += -I$(subst /usr/bin/,/usr/,$(CROSS))/include/
    49 +# W64MAT_INC += -I$(subst /usr/bin/,/usr/,$(CROSS64))/include/
    50 +# LDLIBS_W32 = $(subst /usr/bin/,/usr/,$(CROSS))/lib/
    51 +# LDLIBS_W64 = $(subst /usr/bin/,/usr/,$(CROSS64))/lib/
    52 +# W32_LIBS  = $(LDLIBS_W32)liblapack.a
    53 +# W64_LIBS  = $(LDLIBS_W64)liblapack.a
    54 +# W32_LIBS += $(LDLIBS_W32)libblas.a
    55 +# W64_LIBS += $(LDLIBS_W64)libblas.a
    56 +#
    57 +# CC   ?= gcc
    58 +# CXX  ?= g++
     2+++ src/Makefile        2016-06-04 18:28:33.000000000 -0500
     3@@ -42,7 +42,7 @@
     4 CC     ?= gcc
     5 CXX    ?= g++
    596 CFLAGS         = -Wall -Wextra -Wconversion -O2 -fPIC
    607-OCTMEX = mkoctfile$(OCTAVE_VERSION) --mex -lgomp
     
    6310 
    6411 # Support Debian Hardening flags
    65  # https://wiki.debian.org/HardeningWalkthrough#Handling_dpkg-buildflags_in_your_upstream_build_system
    66 -CFLAGS += $(CPPFLAGS)
    67 -
    68 -ifneq (Darwin,$(shell uname))
    69 -CFLAGS      += -fopenmp
    70 -MEX_OPTION  += -lgomp
    71 -endif
    72 -
    73 -MEX_OPTION  += CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS)" CXXFLAGS\#"$(CFLAGS)"
    74 -MATMEX      = $(MATLABDIR)/bin/mex $(MEX_OPTION)
    75 -
    76 -PROGS       = covm_mex.mex sumskipnan_mex.mex histo_mex.mex #
    77 -
    78 +# CFLAGS += $(CPPFLAGS)
    79 +#
    80 +# ifneq (Darwin,$(shell uname))
    81 +# CFLAGS      += -fopenmp
    82 +# MEX_OPTION  += -lgomp
    83 +# endif
    84 +#
    85 +# MEX_OPTION  += CC\#$(CXX) CXX\#$(CXX) CFLAGS\#"$(CFLAGS)" CXXFLAGS\#"$(CFLAGS)"
    86 +# MATMEX      = $(MATLABDIR)/bin/mex $(MEX_OPTION)
    87 +#
    88 +# PROGS       = covm_mex.mex sumskipnan_mex.mex histo_mex.mex #
    89 +#
    90  ### per default only the mex-files for octave are built
    91  mex4o octave: $(PROGS)
     12@@ -82,7 +82,7 @@
    9213 
    93  
    94  ### Matlab configuration - search for a matlab directory if not defined above
    95 -ifeq (,$(MATLABDIR))
    96 -  ifneq (,$(shell ls -1 /usr/local/ |grep MATLAB))
    97 -    # use oldest, typically mex-files a compatible with newer Matlab versions
    98 -    MATLABDIR=/usr/local/MATLAB/$(shell ls -1rt /usr/local/MATLAB/  |grep "^R*" |head -1)
    99 -  endif
    100 -endif
    101 -
    102 -### if MATLABDIR has been found or defined
    103 -ifneq (,$(MATLABDIR))
    104 -  ifneq (,$(shell ls -1 $(MATLABDIR)/bin/mexext))
    105 -    MEX_EXT=$(shell $(MATLABDIR)/bin/mexext)
    106 -    mex4m matlab: $(patsubst %.mex, %.$(MEX_EXT), $(PROGS))
    107 -  endif
    108 -endif
    109 -
    110 -
    111 -mexw32 win32:  $(patsubst %.mex, %.mexw32, $(PROGS))
    112 -mexw64 win64:  $(patsubst %.mex, %.mexw64, $(PROGS))
     14 mexw32 win32:  $(patsubst %.mex, %.mexw32, $(PROGS))
     15 mexw64 win64:  $(patsubst %.mex, %.mexw64, $(PROGS))
    11316-all:    octave win32 win64 mex4m
    114 +# ifeq (,$(MATLABDIR))
    115 +#   ifneq (,$(shell ls -1 /usr/local/ |grep MATLAB))
    116 +#     # use oldest, typically mex-files a compatible with newer Matlab versions
    117 +#     MATLABDIR=/usr/local/MATLAB/$(shell ls -1rt /usr/local/MATLAB/  |grep "^R*" |head -1)
    118 +#   endif
    119 +# endif
    120 +#
    121 +# ### if MATLABDIR has been found or defined
    122 +# ifneq (,$(MATLABDIR))
    123 +#   ifneq (,$(shell ls -1 $(MATLABDIR)/bin/mexext))
    124 +#     MEX_EXT=$(shell $(MATLABDIR)/bin/mexext)
    125 +#     mex4m matlab: $(patsubst %.mex, %.$(MEX_EXT), $(PROGS))
    126 +#   endif
    127 +# endif
    128 +#
    129 +#
    130 +# mexw32 win32:  $(patsubst %.mex, %.mexw32, $(PROGS))
    131 +# mexw64 win64:  $(patsubst %.mex, %.mexw64, $(PROGS))
    132 +all:    octave
     17+all:    mex4o
    13318 
    13419 clean:
    13520        -$(RM) *.o *.obj *.o64 core octave-core *.oct *~ *.mex*
    136 @@ -93,7 +93,7 @@
    137  #      Octave, MATLAB on Linux
    138  #########################################################
    139  %.oct: %.cc
    140 -       mkoctfile$(OCTAVE_VERSION) "$<"
    141 +       mkoctfile "$<"
    142  
    143  %.mex: %.cpp
    144         $(OCTMEX) "$<" -llapack -lblas
    145 @@ -104,13 +104,13 @@
    146  #########################################################
    147  #      MATLAB/WIN32
    148  #########################################################
    149 -%.obj: %.cpp
    150 -       $(CROSS)-$(CXX) -fopenmp -c -DMATLAB_MEX_FILE -x c++ -o "$@" $(W32MAT_INC) -O2 -DMX_COMPAT_32 "$<"
    151 -%.obj: %.c
    152 -       $(CROSS)-$(CXX) -fopenmp -c -DMATLAB_MEX_FILE -x c++ -o "$@" $(W32MAT_INC) -O2 -DMX_COMPAT_32 "$<"
    153 -
    154 -%.mexw32: %.obj
    155 -       $(CROSS)-$(CXX) -shared $(GNUMEX)/mex.def -o "$@" -L$(GNUMEX) -s "$<" -llibmx -llibmex -llibmat -lcholmod -lgomp -lpthread -L$(LDLIBS_W32) -lblas -llapack
    156 +# %.obj: %.cpp
    157 +#      $(CROSS)-$(CXX) -fopenmp -c -DMATLAB_MEX_FILE -x c++ -o "$@" $(W32MAT_INC) -O2 -DMX_COMPAT_32 "$<"
    158 +# %.obj: %.c
    159 +#      $(CROSS)-$(CXX) -fopenmp -c -DMATLAB_MEX_FILE -x c++ -o "$@" $(W32MAT_INC) -O2 -DMX_COMPAT_32 "$<"
    160 +#
    161 +# %.mexw32: %.obj
    162 +#      $(CROSS)-$(CXX) -shared $(GNUMEX)/mex.def -o "$@" -L$(GNUMEX) -s "$<" -llibmx -llibmex -llibmat -lcholmod -lgomp -lpthread -L$(LDLIBS_W32) -lblas -llapack
    163  
    164  
    165  #########################################################
    166 @@ -118,13 +118,13 @@
    167  #########################################################
    168  
    169  ## ToDO: fix OpenMP support: currently -fopenmp causes Matlab to crash
    170 -%.o64: %.cpp
    171 -       $(CROSS64)-$(CXX) -c -DMATLAB_MEX_FILE -x c++ -o "$@" $(W64MAT_INC) -O2 "$<"
    172 -%.o64: %.c
    173 -       $(CROSS64)-$(CXX) -c -DMATLAB_MEX_FILE -x c++ -o "$@" $(W64MAT_INC) -O2 "$<"
    174 -
    175 -%.mexw64: %.o64
    176 -       $(CROSS64)-$(CXX) -shared $(GNUMEX64)/mex.def -o "$@" -L$(GNUMEX64) -s "$<" -llibmx -llibmex -llibmat -lcholmod -lgomp -lpthread -L$(LDLIBS_W64) -lblas -llapack
    177 +# %.o64: %.cpp
    178 +#      $(CROSS64)-$(CXX) -c -DMATLAB_MEX_FILE -x c++ -o "$@" $(W64MAT_INC) -O2 "$<"
    179 +# %.o64: %.c
    180 +#      $(CROSS64)-$(CXX) -c -DMATLAB_MEX_FILE -x c++ -o "$@" $(W64MAT_INC) -O2 "$<"
    181 +#
    182 +# %.mexw64: %.o64
    183 +#      $(CROSS64)-$(CXX) -shared $(GNUMEX64)/mex.def -o "$@" -L$(GNUMEX64) -s "$<" -llibmx -llibmex -llibmat -lcholmod -lgomp -lpthread -L$(LDLIBS_W64) -lblas -llapack
    184        
    185        
    186  
Note: See TracChangeset for help on using the changeset viewer.