← Back to branch summary

~ubuntu-branches/ubuntu/wily/octave-ltfat/wily-proposed

« back to all changes in this revision

Viewing changes to src/Makefile_unix

  • Committer: Package Import Robot
  • Author(s): Sébastien Villemot, Rafael Laboissiere
  • Date: 2015-07-18 23:36:41 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20150718233641-jhuf3f551a3523qc
Tags: 2.1.0+dfsg-1
* Team upload.

[ Rafael Laboissiere ]
* Imported Upstream version 2.1.0+dfsg
* d/rules: Prevent unit testing on armhf and mips.
  This avoids FTBFS on theses architectures (see Bug#765545).
* Unit testing does not need X-window anymore
  + d/rules: Do not use xfvb-run to run the tests.
  + d/control: Drop xauth, xvfb, and gnuplot-nox from Build-Depends.
    Also, the versioned dependency on octave-pkg-dev is relaxed.
* Drop .jar file from upstream tarball, complying with the Debian Policy
  + d/copyright: Exclude file blockproc.jar
  + d/rules: Add get-orig-source target
  + d/watch: Mangle upstream version to cope with "+dfsg" tag
* Build blockproc.jar, which is deleted from the upstream tarball
  + d/rules: Add commands for building blockproc.jar
  + d/control: Build-depend on default-jdk
  + d/p/fix-path-of-included-makefile.patch: New patch
* Bump Standard-Versions to 3.9.6 (no changes needed)
* d/p/autoload-yes.patch: Remove patch (deprecated upstream)
* Bump Build-Depends on octave to >> 4.0.0~rc4-1 (for sndfile support)
* d/check.m: Avoid verbose output of unit tests
* d/watch: Add the repacksuffix option
* d/p/add-hardening-flags.patch: Drop patch (applied upstream)
* d/p/fix-path-of-included-makefile.patch: Drop patch (applied upstream)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Makefile_unix
21
21
   SFFTW=-lfftw3f
22
22
endif
23
23
 
24
 
 
25
 
CFLAGS+=-O3 -fPIC -std=c99 -Ithirdparty 
26
 
SHARED_FLAGS=-shared -Wl,--no-undefined -lc -lm -L"$(MATLABROOT)/bin/$(ARCH)" \
 
24
CFLAGS+=-g -std=c99 -Ithirdparty -Wall -Wextra
 
25
 
 
26
# the following adds parameters to CFLAGS
 
27
include comptarget.mk
 
28
 
 
29
# This is used for Octave mxe 
 
30
ifneq ($(OS),Windows_NT)
 
31
   CFLAGS+=-fPIC
 
32
endif
 
33
 
 
34
# Used only in the shared library build
 
35
SHARED_FLAGS=-shared -Wl,--no-undefined -L"$(MATLABROOT)/bin/$(ARCH)" \
27
36
                         -lmwblas -lmwlapack $(DFFTW) $(SFFTW)
28
37
 
29
38
include filedefs.mk
56
65
single_shared: $(SFILES) Makefile_unix
57
66
        $(CC) $(SHARED_FLAGS) $(SFILES) -o ../lib/libltfatf.so
58
67
 
59
 
sltfat_blaslapack_matlab.o: ltfat_blaslapack.c config.h
60
 
        $(CC) $(CFLAGS) -DLTFAT_SINGLE -DMATLABFORTRAN -c $< -o $*.o
61
 
 
62
 
dltfat_blaslapack_matlab.o: ltfat_blaslapack.c config.h
63
 
        $(CC) $(CFLAGS) -DLTFAT_DOUBLE -DMATLABFORTRAN -c $< -o $*.o
 
68
#sltfat_blaslapack_matlab.o: ltfat_blaslapack.c config.h
 
69
#       $(CC) $(CFLAGS) -DLTFAT_SINGLE -DMATLABFORTRAN -c $< -o $*.o
 
70
#
 
71
#dltfat_blaslapack_matlab.o: ltfat_blaslapack.c config.h
 
72
#       $(CC) $(CFLAGS) -DLTFAT_DOUBLE -DMATLABFORTRAN -c $< -o $*.o
64
73
 
65
74
s%.o: %.c config.h
66
75
        $(CC) $(CFLAGS) -DLTFAT_SINGLE  -c $< -o s$*.o