From c882da2327b900d8b362787577773055d892266f Mon Sep 17 00:00:00 2001 From: Jonathan Leto Date: Sat, 5 Jul 2008 23:36:52 -0700 Subject: [PATCH] Fixed hardcoded include file location of /usr/local/include, now ExtUtils::PkgConfig is asked . --- .gitignore | 3 +- BLAS.i | 8 ++-- BSpline.i | 8 ++-- Block.i | 94 ++++++++++++++++++++--------------------- Build.PL | 17 ++++---- CBLAS.i | 4 +- CDF.i | 4 +- Chebyshev.i | 4 +- Combination.i | 8 ++-- Complex.i | 8 ++-- Const.i | 28 ++++++------- DFT.i | 4 +- DHT.i | 4 +- Deriv.i | 8 ++-- Diff.i | 4 +- Eigen.i | 4 +- Errno.i | 4 +- FFT.i | 20 ++++----- Fit.i | 4 +- GSL.i | 4 +- Heapsort.i | 4 +- Histogram.i | 4 +- Histogram2D.i | 4 +- IEEEUtils.i | 4 +- Integration.i | 4 +- Interp.i | 8 ++-- Linalg.i | 8 ++-- Machine.i | 4 +- Matrix.i | 28 ++++++------- Message.i | 4 +- Min.i | 8 ++-- Mode.i | 4 +- Monte.i | 16 +++---- Multifit.i | 12 +++--- Multimin.i | 8 ++-- Multiroots.i | 8 ++-- NTuple.i | 4 +- ODEIV.i | 6 +-- Permutation.i | 28 ++++++------- Poly.i | 20 ++++----- PowInt.i | 4 +- QRNG.i | 8 ++-- README | 2 +- RNG.i | 6 +-- Randist.i | 4 +- Roots.i | 8 ++-- SF.i | 132 +++++++++++++++++++++++++++++----------------------------- Siman.i | 4 +- Sort.i | 28 ++++++------- Spline.i | 4 +- Statistics.i | 12 +++--- Sum.i | 4 +- Sys.i | 4 +- Vector.i | 30 ++++++------- Wavelet.i | 8 ++-- Wavelet2D.i | 8 ++-- 56 files changed, 347 insertions(+), 347 deletions(-) rewrite Block.i (79%) diff --git a/.gitignore b/.gitignore index 3d82006..e9ce6c3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,7 @@ Build blib *.bak -*_wrap*c -*_wrap*so +*_wrap\.* \.*sw[op] _build tmp* diff --git a/BLAS.i b/BLAS.i index bb9e91b..bc1b3ef 100644 --- a/BLAS.i +++ b/BLAS.i @@ -5,12 +5,12 @@ %apply float *OUTPUT { float *result }; %{ - #include "/usr/local/include/gsl/gsl_blas.h" - #include "/usr/local/include/gsl/gsl_blas_types.h" + #include "gsl/gsl_blas.h" + #include "gsl/gsl_blas_types.h" %} -%include "/usr/local/include/gsl/gsl_blas.h" -%include "/usr/local/include/gsl/gsl_blas_types.h" +%include "gsl/gsl_blas.h" +%include "gsl/gsl_blas_types.h" %perlcode %{ diff --git a/BSpline.i b/BSpline.i index ee3d199..e21bce3 100644 --- a/BSpline.i +++ b/BSpline.i @@ -1,11 +1,11 @@ %module BSpline %{ - #include "/usr/local/include/gsl/gsl_bspline.h" - #include "/usr/local/include/gsl/gsl_vector.h" + #include "gsl/gsl_bspline.h" + #include "gsl/gsl_vector.h" %} -%include "/usr/local/include/gsl/gsl_bspline.h" -%include "/usr/local/include/gsl/gsl_vector.h" +%include "gsl/gsl_bspline.h" +%include "gsl/gsl_vector.h" %perlcode %{ diff --git a/Block.i b/Block.i dissimilarity index 79% index fb81950..11fd8bf 100644 --- a/Block.i +++ b/Block.i @@ -1,47 +1,47 @@ -%module Block -%{ -#include "/usr/local/include/gsl/gsl_block.h" -#include "/usr/local/include/gsl/gsl_block_char.h" -#include "/usr/local/include/gsl/gsl_block_complex_double.h" -#include "/usr/local/include/gsl/gsl_block_complex_float.h" -#include "/usr/local/include/gsl/gsl_block_complex_long_double.h" -#include "/usr/local/include/gsl/gsl_block_double.h" -#include "/usr/local/include/gsl/gsl_block_float.h" -#include "/usr/local/include/gsl/gsl_block_int.h" -#include "/usr/local/include/gsl/gsl_block_long.h" -#include "/usr/local/include/gsl/gsl_block_long_double.h" -#include "/usr/local/include/gsl/gsl_block_short.h" -#include "/usr/local/include/gsl/gsl_block_uchar.h" -#include "/usr/local/include/gsl/gsl_block_uint.h" -#include "/usr/local/include/gsl/gsl_block_ulong.h" -#include "/usr/local/include/gsl/gsl_block_ushort.h" -%} -%include "/usr/local/include/gsl/gsl_block.h" -%include "/usr/local/include/gsl/gsl_block_char.h" -%include "/usr/local/include/gsl/gsl_block_complex_double.h" -%include "/usr/local/include/gsl/gsl_block_complex_float.h" -%include "/usr/local/include/gsl/gsl_block_complex_long_double.h" -%include "/usr/local/include/gsl/gsl_block_double.h" -%include "/usr/local/include/gsl/gsl_block_float.h" -%include "/usr/local/include/gsl/gsl_block_int.h" -%include "/usr/local/include/gsl/gsl_block_long.h" -%include "/usr/local/include/gsl/gsl_block_long_double.h" -%include "/usr/local/include/gsl/gsl_block_short.h" -%include "/usr/local/include/gsl/gsl_block_uchar.h" -%include "/usr/local/include/gsl/gsl_block_uint.h" -%include "/usr/local/include/gsl/gsl_block_ulong.h" -%include "/usr/local/include/gsl/gsl_block_ushort.h" - -%perlcode %{ - -@EXPORT_OK = qw/gsl_block_alloc gsl_block_calloc gsl_block_free - gsl_block_fread gsl_block_fwrite gsl_block_fscanf - gsl_block_fprintf gsl_block_raw_fread gsl_block_raw_fwrite - gsl_block_raw_fscanf gsl_block_raw_fprintf gsl_block_size - gsl_block_data - /; - -%EXPORT_TAGS = ( all => [ @EXPORT_OK ] ); - - -%} +%module Block +%{ + #include "gsl/gsl_block.h" + #include "gsl/gsl_block_char.h" + #include "gsl/gsl_block_complex_double.h" + #include "gsl/gsl_block_complex_float.h" + #include "gsl/gsl_block_complex_long_double.h" + #include "gsl/gsl_block_double.h" + #include "gsl/gsl_block_float.h" + #include "gsl/gsl_block_int.h" + #include "gsl/gsl_block_long.h" + #include "gsl/gsl_block_long_double.h" + #include "gsl/gsl_block_short.h" + #include "gsl/gsl_block_uchar.h" + #include "gsl/gsl_block_uint.h" + #include "gsl/gsl_block_ulong.h" + #include "gsl/gsl_block_ushort.h" +%} +%include "gsl/gsl_block.h" +%include "gsl/gsl_block_char.h" +%include "gsl/gsl_block_complex_double.h" +%include "gsl/gsl_block_complex_float.h" +%include "gsl/gsl_block_complex_long_double.h" +%include "gsl/gsl_block_double.h" +%include "gsl/gsl_block_float.h" +%include "gsl/gsl_block_int.h" +%include "gsl/gsl_block_long.h" +%include "gsl/gsl_block_long_double.h" +%include "gsl/gsl_block_short.h" +%include "gsl/gsl_block_uchar.h" +%include "gsl/gsl_block_uint.h" +%include "gsl/gsl_block_ulong.h" +%include "gsl/gsl_block_ushort.h" + +%perlcode %{ + +@EXPORT_OK = qw/gsl_block_alloc gsl_block_calloc gsl_block_free + gsl_block_fread gsl_block_fwrite gsl_block_fscanf + gsl_block_fprintf gsl_block_raw_fread gsl_block_raw_fwrite + gsl_block_raw_fscanf gsl_block_raw_fprintf gsl_block_size + gsl_block_data + /; + +%EXPORT_TAGS = ( all => [ @EXPORT_OK ] ); + + +%} diff --git a/Build.PL b/Build.PL index c2ff680..759bbc0 100644 --- a/Build.PL +++ b/Build.PL @@ -2,7 +2,6 @@ # This script has been heavily modified from the Device::Cdio Build.PL # Jonathan Leto - # Copyright (C) 2006 Rocky Bernstein # # This program is free software; you can redistribute it and/or modify @@ -168,7 +167,8 @@ sub compile_c { # File name, minus the suffix (my $file_base = $file) =~ s/\.[^.]+$//; - my $obj_file = "$file_base.so"; + my $obj_file = $file_base . $Config{_o}; + $self->add_to_cleanup($obj_file); return $obj_file if $self->up_to_date($file, $obj_file); @@ -199,7 +199,7 @@ sub compile_c { @cc = "gcc" unless @cc; $self->do_system(@cc, @flags, '-o', $obj_file, $file) - or die "error building $cf->{obj_ext} file from '$file'"; + or die "error building $Config{_o} file from '$file'"; return $obj_file; } @@ -214,7 +214,7 @@ sub try_compile { my $tmp = "tmp$$"; local(*TMPC); - my $obj_ext = $Config{obj_ext} || ".o"; + my $obj_ext = $Config{_o} || ".o"; unlink("$tmp.c", "$tmp$obj_ext"); if (open(TMPC, ">", "$tmp.c")) { @@ -314,7 +314,7 @@ if ($?) { my $errno = $? >> 8; print "I don't see SWIG installed. Please install SWIG from http://www.swig.org .\n"; print "*** Output was:\n @swig_version\n" if @swig_version; - exit(0); + exit 1; } else { $swig_installed = 1; print qq{Found $swig_version[1]}; @@ -330,7 +330,8 @@ $ccflags .= try_cflags("-Wno-unused-function"); $ccflags .= try_cflags("-Wno-unused-variable"); my $ldflags = "$gsl_pkgcfg{libs} -gsl"; -my $swig_flags='-Wall'; +my $swig_flags='-Wall ' . $gsl_pkgcfg{cflags}; + if ('cygwin' eq $Config{osname} && $Config{shrpenv} =~ m{\Aenv LD_RUN_PATH=(.*)\Z} ) { $ldflags .= " -L$1 -lperl"; @@ -367,8 +368,8 @@ my $builder = $class->new( dist_author => 'Jonathan Leto ', dist_version_from => 'lib/Math/GSL.pm', include_dirs => q{}, - extra_linker_flags => '-shared -I./lib -I../lib -I/usr/local/include/ ' . $ldflags, - extra_compiler_flags=> q{-shared -Wall -fpic -Dbool=char -I/usr/local/include/ } . $ccflags, + extra_linker_flags => '-shared -I./lib -I../lib ' . $ldflags, + extra_compiler_flags=> q{-shared -Wall -fpic -Dbool=char } . $ccflags, swig_flags => $swig_flags, swig_installed => $swig_installed, license => 'gpl', diff --git a/CBLAS.i b/CBLAS.i index 6e994a2..6d82713 100644 --- a/CBLAS.i +++ b/CBLAS.i @@ -4,10 +4,10 @@ %apply double *INPUT { const double *X }; %{ - #include "/usr/local/include/gsl/gsl_cblas.h" + #include "gsl/gsl_cblas.h" %} -%include "/usr/local/include/gsl/gsl_cblas.h" +%include "gsl/gsl_cblas.h" %perlcode %{ diff --git a/CDF.i b/CDF.i index 68c6762..1997a31 100644 --- a/CDF.i +++ b/CDF.i @@ -1,9 +1,9 @@ %module CDF %{ -#include "/usr/local/include/gsl/gsl_cdf.h" +#include "gsl/gsl_cdf.h" %} -%include "/usr/local/include/gsl/gsl_cdf.h" +%include "gsl/gsl_cdf.h" %perlcode %{ diff --git a/Chebyshev.i b/Chebyshev.i index f134b9d..c0614c7 100644 --- a/Chebyshev.i +++ b/Chebyshev.i @@ -1,9 +1,9 @@ %module Chebyshev %{ - #include "/usr/local/include/gsl/gsl_chebyshev.h" + #include "gsl/gsl_chebyshev.h" %} -%include "/usr/local/include/gsl/gsl_chebyshev.h" +%include "gsl/gsl_chebyshev.h" %perlcode %{ diff --git a/Combination.i b/Combination.i index 59d56d1..5df97fe 100644 --- a/Combination.i +++ b/Combination.i @@ -1,11 +1,11 @@ %module Combination %{ - #include "/usr/local/include/gsl/gsl_types.h" - #include "/usr/local/include/gsl/gsl_combination.h" + #include "gsl/gsl_types.h" + #include "gsl/gsl_combination.h" %} -%include "/usr/local/include/gsl/gsl_types.h" -%include "/usr/local/include/gsl/gsl_combination.h" +%include "gsl/gsl_types.h" +%include "gsl/gsl_combination.h" %perlcode %{ diff --git a/Complex.i b/Complex.i index ce925dd..372e47f 100644 --- a/Complex.i +++ b/Complex.i @@ -1,11 +1,11 @@ %module Complex %{ - #include "/usr/local/include/gsl/gsl_complex.h" - #include "/usr/local/include/gsl/gsl_complex_math.h" + #include "gsl/gsl_complex.h" + #include "gsl/gsl_complex_math.h" %} -%include "/usr/local/include/gsl/gsl_complex.h" -%include "/usr/local/include/gsl/gsl_complex_math.h" +%include "gsl/gsl_complex.h" +%include "gsl/gsl_complex_math.h" %include "carrays.i" diff --git a/Const.i b/Const.i index cb8ccec..7ea2dc2 100644 --- a/Const.i +++ b/Const.i @@ -1,21 +1,21 @@ %module Const %{ - #include "/usr/local/include/gsl/gsl_math.h" - #include "/usr/local/include/gsl/gsl_const.h" - #include "/usr/local/include/gsl/gsl_const_cgs.h" - #include "/usr/local/include/gsl/gsl_const_cgsm.h" - #include "/usr/local/include/gsl/gsl_const_mks.h" - #include "/usr/local/include/gsl/gsl_const_mksa.h" - #include "/usr/local/include/gsl/gsl_const_num.h" + #include "gsl/gsl_math.h" + #include "gsl/gsl_const.h" + #include "gsl/gsl_const_cgs.h" + #include "gsl/gsl_const_cgsm.h" + #include "gsl/gsl_const_mks.h" + #include "gsl/gsl_const_mksa.h" + #include "gsl/gsl_const_num.h" %} -%include "/usr/local/include/gsl/gsl_math.h" -%include "/usr/local/include/gsl/gsl_const.h" -%include "/usr/local/include/gsl/gsl_const_cgs.h" -%include "/usr/local/include/gsl/gsl_const_cgsm.h" -%include "/usr/local/include/gsl/gsl_const_mks.h" -%include "/usr/local/include/gsl/gsl_const_mksa.h" -%include "/usr/local/include/gsl/gsl_const_num.h" +%include "gsl/gsl_math.h" +%include "gsl/gsl_const.h" +%include "gsl/gsl_const_cgs.h" +%include "gsl/gsl_const_cgsm.h" +%include "gsl/gsl_const_mks.h" +%include "gsl/gsl_const_mksa.h" +%include "gsl/gsl_const_num.h" %perlcode %{ diff --git a/DFT.i b/DFT.i index 1abf7b3..aa37bc6 100644 --- a/DFT.i +++ b/DFT.i @@ -1,9 +1,9 @@ %module DFT %{ - #include "/usr/local/include/gsl/gsl_dft_complex.h" + #include "gsl/gsl_dft_complex.h" %} -%include "/usr/local/include/gsl/gsl_dft_complex.h" +%include "gsl/gsl_dft_complex.h" %perlcode %{ diff --git a/DHT.i b/DHT.i index 92b2af7..4a9d465 100644 --- a/DHT.i +++ b/DHT.i @@ -1,9 +1,9 @@ %module DHT %{ - #include "/usr/local/include/gsl/gsl_dht.h" + #include "gsl/gsl_dht.h" %} -%include "/usr/local/include/gsl/gsl_dht.h" +%include "gsl/gsl_dht.h" %perlcode %{ diff --git a/Deriv.i b/Deriv.i index 411e57d..2b0c152 100644 --- a/Deriv.i +++ b/Deriv.i @@ -15,12 +15,12 @@ %apply double * OUTPUT { double *result,double *abserr }; %{ - #include "/usr/local/include/gsl/gsl_math.h" - #include "/usr/local/include/gsl/gsl_deriv.h" + #include "gsl/gsl_math.h" + #include "gsl/gsl_deriv.h" %} -%include "/usr/local/include/gsl/gsl_math.h" -%include "/usr/local/include/gsl/gsl_deriv.h" +%include "gsl/gsl_math.h" +%include "gsl/gsl_deriv.h" %perlcode %{ @EXPORT_OK = qw/ diff --git a/Diff.i b/Diff.i index 1389f8b..eef85eb 100644 --- a/Diff.i +++ b/Diff.i @@ -1,9 +1,9 @@ %module Diff %{ - #include "/usr/local/include/gsl/gsl_diff.h" + #include "gsl/gsl_diff.h" %} -%include "/usr/local/include/gsl/gsl_diff.h" +%include "gsl/gsl_diff.h" %perlcode %{ diff --git a/Eigen.i b/Eigen.i index 5b19952..4bcaaeb 100644 --- a/Eigen.i +++ b/Eigen.i @@ -1,9 +1,9 @@ %module Eigen %{ - #include "/usr/local/include/gsl/gsl_eigen.h" + #include "gsl/gsl_eigen.h" %} -%include "/usr/local/include/gsl/gsl_eigen.h" +%include "gsl/gsl_eigen.h" %perlcode %{ diff --git a/Errno.i b/Errno.i index 42888ff..bd456ed 100644 --- a/Errno.i +++ b/Errno.i @@ -1,9 +1,9 @@ %module Errno %{ - #include "/usr/local/include/gsl/gsl_errno.h" + #include "gsl/gsl_errno.h" %} -%include "/usr/local/include/gsl/gsl_errno.h" +%include "gsl/gsl_errno.h" %perlcode %{ @EXPORT_OK = qw/ diff --git a/FFT.i b/FFT.i index 78155c8..458855f 100644 --- a/FFT.i +++ b/FFT.i @@ -1,17 +1,17 @@ %module FFT %{ - #include "/usr/local/include/gsl/gsl_fft.h" - #include "/usr/local/include/gsl/gsl_fft_complex.h" - #include "/usr/local/include/gsl/gsl_fft_halfcomplex.h" - #include "/usr/local/include/gsl/gsl_fft_real.h" - #include "/usr/local/include/gsl/gsl_complex.h" + #include "gsl/gsl_fft.h" + #include "gsl/gsl_fft_complex.h" + #include "gsl/gsl_fft_halfcomplex.h" + #include "gsl/gsl_fft_real.h" + #include "gsl/gsl_complex.h" %} -%include "/usr/local/include/gsl/gsl_complex.h" -%include "/usr/local/include/gsl/gsl_fft.h" -%include "/usr/local/include/gsl/gsl_fft_complex.h" -%include "/usr/local/include/gsl/gsl_fft_halfcomplex.h" -%include "/usr/local/include/gsl/gsl_fft_real.h" +%include "gsl/gsl_complex.h" +%include "gsl/gsl_fft.h" +%include "gsl/gsl_fft_complex.h" +%include "gsl/gsl_fft_halfcomplex.h" +%include "gsl/gsl_fft_real.h" %perlcode %{ @EXPORT_OK = qw/ diff --git a/Fit.i b/Fit.i index c081b98..c25160d 100644 --- a/Fit.i +++ b/Fit.i @@ -1,9 +1,9 @@ %module Fit %{ -#include "/usr/local/include/gsl/gsl_fit.h" +#include "gsl/gsl_fit.h" %} -%include "/usr/local/include/gsl/gsl_fit.h" +%include "gsl/gsl_fit.h" %perlcode %{ diff --git a/GSL.i b/GSL.i index 9a34cb7..ef66475 100644 --- a/GSL.i +++ b/GSL.i @@ -1,9 +1,9 @@ %module "Math::GSL" %{ - #include "/usr/local/include/gsl/gsl_sys.h" + #include "gsl/gsl_sys.h" %} -%include "/usr/local/include/gsl/gsl_sys.h" +%include "gsl/gsl_sys.h" %perlcode %{ diff --git a/Heapsort.i b/Heapsort.i index e29d45a..54a2e10 100644 --- a/Heapsort.i +++ b/Heapsort.i @@ -1,9 +1,9 @@ %module Heapsort %{ -#include "/usr/local/include/gsl/gsl_heapsort.h" + #include "gsl/gsl_heapsort.h" %} -%include "/usr/local/include/gsl/gsl_heapsort.h" +%include "gsl/gsl_heapsort.h" %perlcode %{ diff --git a/Histogram.i b/Histogram.i index 7c02742..b23d637 100644 --- a/Histogram.i +++ b/Histogram.i @@ -1,9 +1,9 @@ %module Histogram %{ - #include "/usr/local/include/gsl/gsl_histogram.h" + #include "gsl/gsl_histogram.h" %} -%include "/usr/local/include/gsl/gsl_histogram.h" +%include "gsl/gsl_histogram.h" %perlcode %{ diff --git a/Histogram2D.i b/Histogram2D.i index 096d5c9..4d53a3e 100644 --- a/Histogram2D.i +++ b/Histogram2D.i @@ -1,9 +1,9 @@ %module Histogram2D %{ - #include "/usr/local/include/gsl/gsl_histogram2d.h" + #include "gsl/gsl_histogram2d.h" %} -%include "/usr/local/include/gsl/gsl_histogram2d.h" +%include "gsl/gsl_histogram2d.h" %perlcode %{ diff --git a/IEEEUtils.i b/IEEEUtils.i index cfe8fd5..2f384d8 100644 --- a/IEEEUtils.i +++ b/IEEEUtils.i @@ -1,9 +1,9 @@ %module IEEEUtils %{ - #include "/usr/local/include/gsl/gsl_ieee_utils.h" + #include "gsl/gsl_ieee_utils.h" %} -%include "/usr/local/include/gsl/gsl_ieee_utils.h" +%include "gsl/gsl_ieee_utils.h" %perlcode %{ @EXPORT_OK = qw/ diff --git a/Integration.i b/Integration.i index c445909..d99f90f 100644 --- a/Integration.i +++ b/Integration.i @@ -1,9 +1,9 @@ %module Integration %{ - #include "/usr/local/include/gsl/gsl_integration.h" + #include "gsl/gsl_integration.h" %} -%include "/usr/local/include/gsl/gsl_integration.h" +%include "gsl/gsl_integration.h" %perlcode %{ @EXPORT_OK = qw/ diff --git a/Interp.i b/Interp.i index 8f7e7e1..90429e8 100644 --- a/Interp.i +++ b/Interp.i @@ -1,10 +1,10 @@ %module Interp %{ - #include "/usr/local/include/gsl/gsl_types.h" - #include "/usr/local/include/gsl/gsl_interp.h" + #include "gsl/gsl_types.h" + #include "gsl/gsl_interp.h" %} -%include "/usr/local/include/gsl/gsl_types.h" -%include "/usr/local/include/gsl/gsl_interp.h" +%include "gsl/gsl_types.h" +%include "gsl/gsl_interp.h" %perlcode %{ diff --git a/Linalg.i b/Linalg.i index 9f6881f..52286ea 100644 --- a/Linalg.i +++ b/Linalg.i @@ -2,12 +2,12 @@ %apply int *OUTPUT { int *signum }; %{ - #include "/usr/local/include/gsl/gsl_linalg.h" - #include "/usr/local/include/gsl/gsl_permutation.h" + #include "gsl/gsl_linalg.h" + #include "gsl/gsl_permutation.h" %} -%include "/usr/local/include/gsl/gsl_linalg.h" -%include "/usr/local/include/gsl/gsl_permutation.h" +%include "gsl/gsl_linalg.h" +%include "gsl/gsl_permutation.h" %perlcode %{ @EXPORT_OK = qw/$GSL_LINALG_MOD_NONE $GSL_LINALG_MOD_TRANSPOSE $GSL_LINALG_MOD_CONJUGATE diff --git a/Machine.i b/Machine.i index 2d9d142..021f343 100644 --- a/Machine.i +++ b/Machine.i @@ -1,9 +1,9 @@ %module Machine %{ - #include "/usr/local/include/gsl/gsl_machine.h" + #include "gsl/gsl_machine.h" %} -%include "/usr/local/include/gsl/gsl_machine.h" +%include "gsl/gsl_machine.h" %perlcode %{ diff --git a/Matrix.i b/Matrix.i index bdc51fd..16a06cd 100644 --- a/Matrix.i +++ b/Matrix.i @@ -4,22 +4,22 @@ %apply double *OUTPUT { double * min_out, double * max_out }; %{ - #include "/usr/local/include/gsl/gsl_matrix.h" - #include "/usr/local/include/gsl/gsl_complex.h" - #include "/usr/local/include/gsl/gsl_vector_double.h" - #include "/usr/local/include/gsl/gsl_matrix_double.h" - #include "/usr/local/include/gsl/gsl_matrix_int.h" - #include "/usr/local/include/gsl/gsl_matrix_complex_double.h" - #include "/usr/local/include/gsl/gsl_matrix_char.h" + #include "gsl/gsl_matrix.h" + #include "gsl/gsl_complex.h" + #include "gsl/gsl_vector_double.h" + #include "gsl/gsl_matrix_double.h" + #include "gsl/gsl_matrix_int.h" + #include "gsl/gsl_matrix_complex_double.h" + #include "gsl/gsl_matrix_char.h" %} -%include "/usr/local/include/gsl/gsl_matrix.h" -%include "/usr/local/include/gsl/gsl_complex.h" -%include "/usr/local/include/gsl/gsl_vector_double.h" -%include "/usr/local/include/gsl/gsl_matrix_double.h" -%include "/usr/local/include/gsl/gsl_matrix_int.h" -%include "/usr/local/include/gsl/gsl_matrix_complex_double.h" -%include "/usr/local/include/gsl/gsl_matrix_char.h" +%include "gsl/gsl_matrix.h" +%include "gsl/gsl_complex.h" +%include "gsl/gsl_vector_double.h" +%include "gsl/gsl_matrix_double.h" +%include "gsl/gsl_matrix_int.h" +%include "gsl/gsl_matrix_complex_double.h" +%include "gsl/gsl_matrix_char.h" %perlcode %{ diff --git a/Message.i b/Message.i index e18b6ef..07ef5dd 100644 --- a/Message.i +++ b/Message.i @@ -1,6 +1,6 @@ %module Message %{ - #include "/usr/local/include/gsl/gsl_message.h" + #include "gsl/gsl_message.h" %} -%include "/usr/local/include/gsl/gsl_message.h" +%include "gsl/gsl_message.h" diff --git a/Min.i b/Min.i index 4aae36c..1f7eae9 100644 --- a/Min.i +++ b/Min.i @@ -1,11 +1,11 @@ %module Min %{ - #include "/usr/local/include/gsl/gsl_types.h" - #include "/usr/local/include/gsl/gsl_min.h" + #include "gsl/gsl_types.h" + #include "gsl/gsl_min.h" %} -%include "/usr/local/include/gsl/gsl_types.h" -%include "/usr/local/include/gsl/gsl_min.h" +%include "gsl/gsl_types.h" +%include "gsl/gsl_min.h" %perlcode %{ diff --git a/Mode.i b/Mode.i index 78515da..7b93e33 100644 --- a/Mode.i +++ b/Mode.i @@ -1,7 +1,7 @@ %module Mode %{ - #include "/usr/local/include/gsl/gsl_mode.h" + #include "gsl/gsl_mode.h" %} -%include "/usr/local/include/gsl/gsl_mode.h" +%include "gsl/gsl_mode.h" diff --git a/Monte.i b/Monte.i index 0a374de..8593656 100644 --- a/Monte.i +++ b/Monte.i @@ -1,15 +1,15 @@ %module Monte %{ - #include "/usr/local/include/gsl/gsl_monte.h" - #include "/usr/local/include/gsl/gsl_monte_miser.h" - #include "/usr/local/include/gsl/gsl_monte_plain.h" - #include "/usr/local/include/gsl/gsl_monte_vegas.h" + #include "gsl/gsl_monte.h" + #include "gsl/gsl_monte_miser.h" + #include "gsl/gsl_monte_plain.h" + #include "gsl/gsl_monte_vegas.h" %} -%include "/usr/local/include/gsl/gsl_monte.h" -%include "/usr/local/include/gsl/gsl_monte_miser.h" -%include "/usr/local/include/gsl/gsl_monte_plain.h" -%include "/usr/local/include/gsl/gsl_monte_vegas.h" +%include "gsl/gsl_monte.h" +%include "gsl/gsl_monte_miser.h" +%include "gsl/gsl_monte_plain.h" +%include "gsl/gsl_monte_vegas.h" %perlcode %{ diff --git a/Multifit.i b/Multifit.i index 202ae1f..4f7c173 100644 --- a/Multifit.i +++ b/Multifit.i @@ -1,13 +1,13 @@ %module Multifit %{ - #include "/usr/local/include/gsl/gsl_types.h" - #include "/usr/local/include/gsl/gsl_multifit.h" - #include "/usr/local/include/gsl/gsl_multifit_nlin.h" + #include "gsl/gsl_types.h" + #include "gsl/gsl_multifit.h" + #include "gsl/gsl_multifit_nlin.h" %} -%include "/usr/local/include/gsl/gsl_types.h" -%include "/usr/local/include/gsl/gsl_multifit.h" -%include "/usr/local/include/gsl/gsl_multifit_nlin.h" +%include "gsl/gsl_types.h" +%include "gsl/gsl_multifit.h" +%include "gsl/gsl_multifit_nlin.h" %perlcode %{ @EXPORT_OK = qw/ diff --git a/Multimin.i b/Multimin.i index 5887591..36ca7de 100644 --- a/Multimin.i +++ b/Multimin.i @@ -1,10 +1,10 @@ %module Multimin %{ - #include "/usr/local/include/gsl/gsl_types.h" - #include "/usr/local/include/gsl/gsl_multimin.h" + #include "gsl/gsl_types.h" + #include "gsl/gsl_multimin.h" %} -%include "/usr/local/include/gsl/gsl_types.h" -%include "/usr/local/include/gsl/gsl_multimin.h" +%include "gsl/gsl_types.h" +%include "gsl/gsl_multimin.h" diff --git a/Multiroots.i b/Multiroots.i index 8d86284..1b666b0 100644 --- a/Multiroots.i +++ b/Multiroots.i @@ -1,11 +1,11 @@ %module Multiroots %{ -#include "/usr/local/include/gsl/gsl_types.h" -#include "/usr/local/include/gsl/gsl_multiroots.h" +#include "gsl/gsl_types.h" +#include "gsl/gsl_multiroots.h" %} -%include "/usr/local/include/gsl/gsl_types.h" -%include "/usr/local/include/gsl/gsl_multiroots.h" +%include "gsl/gsl_types.h" +%include "gsl/gsl_multiroots.h" %perlcode %{ diff --git a/NTuple.i b/NTuple.i index 32cd3eb..a11dc76 100644 --- a/NTuple.i +++ b/NTuple.i @@ -1,9 +1,9 @@ %module NTuple %{ - #include "/usr/local/include/gsl/gsl_ntuple.h" + #include "gsl/gsl_ntuple.h" %} -%include "/usr/local/include/gsl/gsl_ntuple.h" +%include "gsl/gsl_ntuple.h" %perlcode %{ diff --git a/ODEIV.i b/ODEIV.i index 226c4b6..5e837af 100644 --- a/ODEIV.i +++ b/ODEIV.i @@ -1,10 +1,10 @@ %module ODEIV %{ - #include "/usr/local/include/gsl/gsl_odeiv.h" + #include "gsl/gsl_odeiv.h" %} -%import "/usr/local/include/gsl/gsl_types.h" -%include "/usr/local/include/gsl/gsl_odeiv.h" +%import "gsl/gsl_types.h" +%include "gsl/gsl_odeiv.h" %perlcode %{ @EXPORT_OK = qw/ diff --git a/Permutation.i b/Permutation.i index c730399..e58db23 100644 --- a/Permutation.i +++ b/Permutation.i @@ -4,21 +4,21 @@ FILE * fopen(char *, char *); int fclose(FILE *); %{ - #include "/usr/local/include/gsl/gsl_permute.h" - #include "/usr/local/include/gsl/gsl_permute_double.h" - #include "/usr/local/include/gsl/gsl_permute_int.h" - #include "/usr/local/include/gsl/gsl_permute_vector.h" - #include "/usr/local/include/gsl/gsl_permute_vector_double.h" - #include "/usr/local/include/gsl/gsl_permute_vector_int.h" - #include "/usr/local/include/gsl/gsl_permutation.h" + #include "gsl/gsl_permute.h" + #include "gsl/gsl_permute_double.h" + #include "gsl/gsl_permute_int.h" + #include "gsl/gsl_permute_vector.h" + #include "gsl/gsl_permute_vector_double.h" + #include "gsl/gsl_permute_vector_int.h" + #include "gsl/gsl_permutation.h" %} -%include "/usr/local/include/gsl/gsl_permute.h" -%include "/usr/local/include/gsl/gsl_permute_double.h" -%include "/usr/local/include/gsl/gsl_permute_int.h" -%include "/usr/local/include/gsl/gsl_permute_vector.h" -%include "/usr/local/include/gsl/gsl_permute_vector_double.h" -%include "/usr/local/include/gsl/gsl_permute_vector_int.h" -%include "/usr/local/include/gsl/gsl_permutation.h" +%include "gsl/gsl_permute.h" +%include "gsl/gsl_permute_double.h" +%include "gsl/gsl_permute_int.h" +%include "gsl/gsl_permute_vector.h" +%include "gsl/gsl_permute_vector_double.h" +%include "gsl/gsl_permute_vector_int.h" +%include "gsl/gsl_permutation.h" %perlcode %{ @EXPORT_OK = qw/fopen fclose diff --git a/Poly.i b/Poly.i index b2d8727..73d085b 100644 --- a/Poly.i +++ b/Poly.i @@ -2,9 +2,9 @@ %include "gsl_typemaps.i" %{ - #include "/usr/local/include/gsl/gsl_sys.h" + #include "gsl/gsl_sys.h" %} -%include "/usr/local/include/gsl/gsl_sys.h" +%include "gsl/gsl_sys.h" %typemap(in) double * (double dvalue) { SV* tempsv; @@ -69,16 +69,16 @@ } } %{ - #include "/usr/local/include/gsl/gsl_nan.h" - #include "/usr/local/include/gsl/gsl_poly.h" - #include "/usr/local/include/gsl/gsl_complex.h" - #include "/usr/local/include/gsl/gsl_complex_math.h" + #include "gsl/gsl_nan.h" + #include "gsl/gsl_poly.h" + #include "gsl/gsl_complex.h" + #include "gsl/gsl_complex_math.h" %} -%include "/usr/local/include/gsl/gsl_nan.h" -%include "/usr/local/include/gsl/gsl_poly.h" -%include "/usr/local/include/gsl/gsl_complex.h" -%include "/usr/local/include/gsl/gsl_complex_math.h" +%include "gsl/gsl_nan.h" +%include "gsl/gsl_poly.h" +%include "gsl/gsl_complex.h" +%include "gsl/gsl_complex_math.h" %perlcode %{ diff --git a/PowInt.i b/PowInt.i index 18c826b..9fa1ebe 100644 --- a/PowInt.i +++ b/PowInt.i @@ -1,9 +1,9 @@ %module PowInt %{ -#include "/usr/local/include/gsl/gsl_pow_int.h" +#include "gsl/gsl_pow_int.h" %} -%include "/usr/local/include/gsl/gsl_pow_int.h" +%include "gsl/gsl_pow_int.h" %perlcode %{ diff --git a/QRNG.i b/QRNG.i index f6c28f7..6fa1555 100644 --- a/QRNG.i +++ b/QRNG.i @@ -5,12 +5,12 @@ %apply double *OUTPUT { double x[] }; %{ - #include "/usr/local/include/gsl/gsl_types.h" - #include "/usr/local/include/gsl/gsl_qrng.h" + #include "gsl/gsl_types.h" + #include "gsl/gsl_qrng.h" %} -%include "/usr/local/include/gsl/gsl_types.h" -%include "/usr/local/include/gsl/gsl_qrng.h" +%include "gsl/gsl_types.h" +%include "gsl/gsl_qrng.h" %perlcode %{ diff --git a/README b/README index 87cb1b8..86af41a 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ Scientific Library (GSL) is a numerical library for C and C++ programmers. It is free software under the GNU General Public License. Math::GSL uses SWIG to generate Perl bindings to *most* GSL functionality. -Currently Math::GSL requires at least Perl 5.8.6, GSL 1.10, and SWIG 1.3.35 . +Currently Math::GSL requires at least Perl 5.6, GSL 1.11, and SWIG 1.3.35 . INSTALLATION diff --git a/RNG.i b/RNG.i index bfa5725..f19d571 100644 --- a/RNG.i +++ b/RNG.i @@ -1,10 +1,10 @@ %module RNG %{ - #include "/usr/local/include/gsl/gsl_rng.h" + #include "gsl/gsl_rng.h" %} -%import "/usr/local/include/gsl/gsl_types.h" +%import "gsl/gsl_types.h" -%include "/usr/local/include/gsl/gsl_rng.h" +%include "gsl/gsl_rng.h" FILE *fopen(char *, char *); int fclose(FILE *); diff --git a/Randist.i b/Randist.i index c10df7b..1e9762a 100644 --- a/Randist.i +++ b/Randist.i @@ -32,9 +32,9 @@ void gsl_ran_bivariate_gaussian (const gsl_rng * r, double sigma_x, double sigma } %{ - #include "/usr/local/include/gsl/gsl_randist.h" + #include "gsl/gsl_randist.h" %} -%include "/usr/local/include/gsl/gsl_randist.h" +%include "gsl/gsl_randist.h" %perlcode %{ diff --git a/Roots.i b/Roots.i index cda4de8..1d4e4b9 100644 --- a/Roots.i +++ b/Roots.i @@ -1,10 +1,10 @@ %module Roots %{ - #include "/usr/local/include/gsl/gsl_types.h" - #include "/usr/local/include/gsl/gsl_roots.h" + #include "gsl/gsl_types.h" + #include "gsl/gsl_roots.h" %} -%include "/usr/local/include/gsl/gsl_types.h" -%include "/usr/local/include/gsl/gsl_roots.h" +%include "gsl/gsl_types.h" +%include "gsl/gsl_roots.h" %perlcode %{ diff --git a/SF.i b/SF.i index 8c93cb8..cb26103 100644 --- a/SF.i +++ b/SF.i @@ -1,72 +1,72 @@ %module SF %{ - #include "/usr/local/include/gsl/gsl_mode.h" - #include "/usr/local/include/gsl/gsl_sf.h" - #include "/usr/local/include/gsl/gsl_sf_airy.h" - #include "/usr/local/include/gsl/gsl_sf_bessel.h" - #include "/usr/local/include/gsl/gsl_sf_clausen.h" - #include "/usr/local/include/gsl/gsl_sf_coulomb.h" - #include "/usr/local/include/gsl/gsl_sf_coupling.h" - #include "/usr/local/include/gsl/gsl_sf_dawson.h" - #include "/usr/local/include/gsl/gsl_sf_debye.h" - #include "/usr/local/include/gsl/gsl_sf_dilog.h" - #include "/usr/local/include/gsl/gsl_sf_elementary.h" - #include "/usr/local/include/gsl/gsl_sf_ellint.h" - #include "/usr/local/include/gsl/gsl_sf_elljac.h" - #include "/usr/local/include/gsl/gsl_sf_erf.h" - #include "/usr/local/include/gsl/gsl_sf_exp.h" - #include "/usr/local/include/gsl/gsl_sf_expint.h" - #include "/usr/local/include/gsl/gsl_sf_fermi_dirac.h" - #include "/usr/local/include/gsl/gsl_sf_gamma.h" - #include "/usr/local/include/gsl/gsl_sf_gegenbauer.h" - #include "/usr/local/include/gsl/gsl_sf_hyperg.h" - #include "/usr/local/include/gsl/gsl_sf_laguerre.h" - #include "/usr/local/include/gsl/gsl_sf_lambert.h" - #include "/usr/local/include/gsl/gsl_sf_legendre.h" - #include "/usr/local/include/gsl/gsl_sf_log.h" - #include "/usr/local/include/gsl/gsl_sf_mathieu.h" - #include "/usr/local/include/gsl/gsl_sf_pow_int.h" - #include "/usr/local/include/gsl/gsl_sf_psi.h" - #include "/usr/local/include/gsl/gsl_sf_result.h" - #include "/usr/local/include/gsl/gsl_sf_synchrotron.h" - #include "/usr/local/include/gsl/gsl_sf_transport.h" - #include "/usr/local/include/gsl/gsl_sf_trig.h" - #include "/usr/local/include/gsl/gsl_sf_zeta.h" + #include "gsl/gsl_mode.h" + #include "gsl/gsl_sf.h" + #include "gsl/gsl_sf_airy.h" + #include "gsl/gsl_sf_bessel.h" + #include "gsl/gsl_sf_clausen.h" + #include "gsl/gsl_sf_coulomb.h" + #include "gsl/gsl_sf_coupling.h" + #include "gsl/gsl_sf_dawson.h" + #include "gsl/gsl_sf_debye.h" + #include "gsl/gsl_sf_dilog.h" + #include "gsl/gsl_sf_elementary.h" + #include "gsl/gsl_sf_ellint.h" + #include "gsl/gsl_sf_elljac.h" + #include "gsl/gsl_sf_erf.h" + #include "gsl/gsl_sf_exp.h" + #include "gsl/gsl_sf_expint.h" + #include "gsl/gsl_sf_fermi_dirac.h" + #include "gsl/gsl_sf_gamma.h" + #include "gsl/gsl_sf_gegenbauer.h" + #include "gsl/gsl_sf_hyperg.h" + #include "gsl/gsl_sf_laguerre.h" + #include "gsl/gsl_sf_lambert.h" + #include "gsl/gsl_sf_legendre.h" + #include "gsl/gsl_sf_log.h" + #include "gsl/gsl_sf_mathieu.h" + #include "gsl/gsl_sf_pow_int.h" + #include "gsl/gsl_sf_psi.h" + #include "gsl/gsl_sf_result.h" + #include "gsl/gsl_sf_synchrotron.h" + #include "gsl/gsl_sf_transport.h" + #include "gsl/gsl_sf_trig.h" + #include "gsl/gsl_sf_zeta.h" %} -//%import "/usr/local/include/gsl/gsl_types.h" - -%include "/usr/local/include/gsl/gsl_mode.h" -%include "/usr/local/include/gsl/gsl_sf.h" -%include "/usr/local/include/gsl/gsl_sf_airy.h" -%include "/usr/local/include/gsl/gsl_sf_bessel.h" -%include "/usr/local/include/gsl/gsl_sf_clausen.h" -%include "/usr/local/include/gsl/gsl_sf_coulomb.h" -%include "/usr/local/include/gsl/gsl_sf_coupling.h" -%include "/usr/local/include/gsl/gsl_sf_dawson.h" -%include "/usr/local/include/gsl/gsl_sf_debye.h" -%include "/usr/local/include/gsl/gsl_sf_dilog.h" -%include "/usr/local/include/gsl/gsl_sf_elementary.h" -%include "/usr/local/include/gsl/gsl_sf_ellint.h" -%include "/usr/local/include/gsl/gsl_sf_elljac.h" -%include "/usr/local/include/gsl/gsl_sf_erf.h" -%include "/usr/local/include/gsl/gsl_sf_exp.h" -%include "/usr/local/include/gsl/gsl_sf_expint.h" -%include "/usr/local/include/gsl/gsl_sf_fermi_dirac.h" -%include "/usr/local/include/gsl/gsl_sf_gamma.h" -%include "/usr/local/include/gsl/gsl_sf_gegenbauer.h" -%include "/usr/local/include/gsl/gsl_sf_hyperg.h" -%include "/usr/local/include/gsl/gsl_sf_laguerre.h" -%include "/usr/local/include/gsl/gsl_sf_lambert.h" -%include "/usr/local/include/gsl/gsl_sf_legendre.h" -%include "/usr/local/include/gsl/gsl_sf_log.h" -%include "/usr/local/include/gsl/gsl_sf_mathieu.h" -%include "/usr/local/include/gsl/gsl_sf_pow_int.h" -%include "/usr/local/include/gsl/gsl_sf_psi.h" -%include "/usr/local/include/gsl/gsl_sf_result.h" -%include "/usr/local/include/gsl/gsl_sf_synchrotron.h" -%include "/usr/local/include/gsl/gsl_sf_transport.h" -%include "/usr/local/include/gsl/gsl_sf_trig.h" -%include "/usr/local/include/gsl/gsl_sf_zeta.h" +//%import "gsl/gsl_types.h" + +%include "gsl/gsl_mode.h" +%include "gsl/gsl_sf.h" +%include "gsl/gsl_sf_airy.h" +%include "gsl/gsl_sf_bessel.h" +%include "gsl/gsl_sf_clausen.h" +%include "gsl/gsl_sf_coulomb.h" +%include "gsl/gsl_sf_coupling.h" +%include "gsl/gsl_sf_dawson.h" +%include "gsl/gsl_sf_debye.h" +%include "gsl/gsl_sf_dilog.h" +%include "gsl/gsl_sf_elementary.h" +%include "gsl/gsl_sf_ellint.h" +%include "gsl/gsl_sf_elljac.h" +%include "gsl/gsl_sf_erf.h" +%include "gsl/gsl_sf_exp.h" +%include "gsl/gsl_sf_expint.h" +%include "gsl/gsl_sf_fermi_dirac.h" +%include "gsl/gsl_sf_gamma.h" +%include "gsl/gsl_sf_gegenbauer.h" +%include "gsl/gsl_sf_hyperg.h" +%include "gsl/gsl_sf_laguerre.h" +%include "gsl/gsl_sf_lambert.h" +%include "gsl/gsl_sf_legendre.h" +%include "gsl/gsl_sf_log.h" +%include "gsl/gsl_sf_mathieu.h" +%include "gsl/gsl_sf_pow_int.h" +%include "gsl/gsl_sf_psi.h" +%include "gsl/gsl_sf_result.h" +%include "gsl/gsl_sf_synchrotron.h" +%include "gsl/gsl_sf_transport.h" +%include "gsl/gsl_sf_trig.h" +%include "gsl/gsl_sf_zeta.h" %include "typemaps.i" diff --git a/Siman.i b/Siman.i index e7fe749..eb74b90 100644 --- a/Siman.i +++ b/Siman.i @@ -1,9 +1,9 @@ %module Siman %{ - #include "/usr/local/include/gsl/gsl_siman.h" + #include "gsl/gsl_siman.h" %} -%include "/usr/local/include/gsl/gsl_siman.h" +%include "gsl/gsl_siman.h" %perlcode %{ diff --git a/Sort.i b/Sort.i index 3683602..1825a10 100644 --- a/Sort.i +++ b/Sort.i @@ -42,21 +42,21 @@ %apply double * { double *data }; %{ - #include "/usr/local/include/gsl/gsl_nan.h" - #include "/usr/local/include/gsl/gsl_sort.h" - #include "/usr/local/include/gsl/gsl_sort_double.h" - #include "/usr/local/include/gsl/gsl_sort_int.h" - #include "/usr/local/include/gsl/gsl_sort_vector.h" - #include "/usr/local/include/gsl/gsl_sort_vector_double.h" - #include "/usr/local/include/gsl/gsl_sort_vector_int.h" + #include "gsl/gsl_nan.h" + #include "gsl/gsl_sort.h" + #include "gsl/gsl_sort_double.h" + #include "gsl/gsl_sort_int.h" + #include "gsl/gsl_sort_vector.h" + #include "gsl/gsl_sort_vector_double.h" + #include "gsl/gsl_sort_vector_int.h" %} -%include "/usr/local/include/gsl/gsl_nan.h" -%include "/usr/local/include/gsl/gsl_sort.h" -%include "/usr/local/include/gsl/gsl_sort_double.h" -%include "/usr/local/include/gsl/gsl_sort_int.h" -%include "/usr/local/include/gsl/gsl_sort_vector.h" -%include "/usr/local/include/gsl/gsl_sort_vector_double.h" -%include "/usr/local/include/gsl/gsl_sort_vector_int.h" +%include "gsl/gsl_nan.h" +%include "gsl/gsl_sort.h" +%include "gsl/gsl_sort_double.h" +%include "gsl/gsl_sort_int.h" +%include "gsl/gsl_sort_vector.h" +%include "gsl/gsl_sort_vector_double.h" +%include "gsl/gsl_sort_vector_int.h" %perlcode %{ diff --git a/Spline.i b/Spline.i index 6962832..cf6fa2c 100644 --- a/Spline.i +++ b/Spline.i @@ -1,9 +1,9 @@ %module Spline %{ - #include "/usr/local/include/gsl/gsl_spline.h" + #include "gsl/gsl_spline.h" %} -%include "/usr/local/include/gsl/gsl_spline.h" +%include "gsl/gsl_spline.h" %perlcode %{ diff --git a/Statistics.i b/Statistics.i index c9f105a..4f6adb7 100644 --- a/Statistics.i +++ b/Statistics.i @@ -1,13 +1,13 @@ %module Statistics %{ - #include "/usr/local/include/gsl/gsl_statistics_double.h" - #include "/usr/local/include/gsl/gsl_statistics_int.h" - #include "/usr/local/include/gsl/gsl_statistics_char.h" + #include "gsl/gsl_statistics_double.h" + #include "gsl/gsl_statistics_int.h" + #include "gsl/gsl_statistics_char.h" %} -%include "/usr/local/include/gsl/gsl_statistics_double.h" -%include "/usr/local/include/gsl/gsl_statistics_int.h" -%include "/usr/local/include/gsl/gsl_statistics_char.h" +%include "gsl/gsl_statistics_double.h" +%include "gsl/gsl_statistics_int.h" +%include "gsl/gsl_statistics_char.h" %perlcode %{ diff --git a/Sum.i b/Sum.i index d1d9bc4..185a2de 100644 --- a/Sum.i +++ b/Sum.i @@ -1,9 +1,9 @@ %module Sum %{ - #include "/usr/local/include/gsl/gsl_sum.h" + #include "gsl/gsl_sum.h" %} -%include "/usr/local/include/gsl/gsl_sum.h" +%include "gsl/gsl_sum.h" %perlcode %{ @EXPORT_OK = qw/ diff --git a/Sys.i b/Sys.i index 5f527af..60b4db2 100644 --- a/Sys.i +++ b/Sys.i @@ -1,7 +1,7 @@ %{ - #include "/usr/local/include/gsl/gsl_sys.h" + #include "gsl/gsl_sys.h" %} -%include "/usr/local/include/gsl/gsl_sys.h" +%include "gsl/gsl_sys.h" %perlcode %{ our @EXPORT = qw(); our @EXPORT_OK = qw/ diff --git a/Vector.i b/Vector.i index d1de37d..8d5d55c 100644 --- a/Vector.i +++ b/Vector.i @@ -29,23 +29,23 @@ FILE * fopen(char *, char *); int fclose(FILE *); %{ - #include "/usr/local/include/gsl/gsl_nan.h" - #include "/usr/local/include/gsl/gsl_vector.h" - #include "/usr/local/include/gsl/gsl_vector_char.h" - #include "/usr/local/include/gsl/gsl_vector_complex.h" - #include "/usr/local/include/gsl/gsl_vector_complex_double.h" - #include "/usr/local/include/gsl/gsl_vector_double.h" - #include "/usr/local/include/gsl/gsl_vector_float.h" - #include "/usr/local/include/gsl/gsl_vector_int.h" + #include "gsl/gsl_nan.h" + #include "gsl/gsl_vector.h" + #include "gsl/gsl_vector_char.h" + #include "gsl/gsl_vector_complex.h" + #include "gsl/gsl_vector_complex_double.h" + #include "gsl/gsl_vector_double.h" + #include "gsl/gsl_vector_float.h" + #include "gsl/gsl_vector_int.h" %} -%include "/usr/local/include/gsl/gsl_nan.h" -%include "/usr/local/include/gsl/gsl_vector.h" -%include "/usr/local/include/gsl/gsl_vector_char.h" -%include "/usr/local/include/gsl/gsl_vector_complex.h" -%include "/usr/local/include/gsl/gsl_vector_complex_double.h" -%include "/usr/local/include/gsl/gsl_vector_double.h" -%include "/usr/local/include/gsl/gsl_vector_int.h" +%include "gsl/gsl_nan.h" +%include "gsl/gsl_vector.h" +%include "gsl/gsl_vector_char.h" +%include "gsl/gsl_vector_complex.h" +%include "gsl/gsl_vector_complex_double.h" +%include "gsl/gsl_vector_double.h" +%include "gsl/gsl_vector_int.h" diff --git a/Wavelet.i b/Wavelet.i index 0edf8c2..4daacc5 100644 --- a/Wavelet.i +++ b/Wavelet.i @@ -1,13 +1,13 @@ %module Wavelet %{ - #include "/usr/local/include/gsl/gsl_types.h" - #include "/usr/local/include/gsl/gsl_wavelet.h" + #include "gsl/gsl_types.h" + #include "gsl/gsl_wavelet.h" %} typedef int size_t; -%include "/usr/local/include/gsl/gsl_types.h" -%include "/usr/local/include/gsl/gsl_wavelet.h" +%include "gsl/gsl_types.h" +%include "gsl/gsl_wavelet.h" %include "carrays.i" %include "typemaps.i" diff --git a/Wavelet2D.i b/Wavelet2D.i index 7fc992f..5db0138 100644 --- a/Wavelet2D.i +++ b/Wavelet2D.i @@ -1,11 +1,11 @@ %module Wavelet2D %{ - #include "/usr/local/include/gsl/gsl_types.h" - #include "/usr/local/include/gsl/gsl_wavelet2d.h" + #include "gsl/gsl_types.h" + #include "gsl/gsl_wavelet2d.h" %} -%include "/usr/local/include/gsl/gsl_types.h" -%include "/usr/local/include/gsl/gsl_wavelet2d.h" +%include "gsl/gsl_types.h" +%include "gsl/gsl_wavelet2d.h" %perlcode %{ -- 2.11.4.GIT