Ignore:
Timestamp:
May 7, 2007 11:07:32 AM (14 years ago)
Author:
dkearney
Message:

updateing build system for rappture and language bindings.
librappture now includes a static version of libscew.
this means librappture needs to be linked directly against libexpat.
removed references to libscew from language bindings' makefiles.
corrected matlab and octave makefiles to only compile when dependencies are updated.
added --libdir flag so you can install platform dependent files into lib64 on 64-bit systems.
adjusted the rappture.env file to add lib64 directories to search paths incase they exist.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/perl/Makefile.PL.in

    r546 r708  
    2222                     );
    2323    }
    24     @SCEW_INC_SEARCHPATH = ( "@prefix@/include",
     24    @EXPAT_INC_SEARCHPATH = ( "@prefix@/include",
    2525        "/apps/rappture/include", "/opt/rappture/include",
    26         "/usr/local/include", "/opt/include", "../../scew-0.4.0",
    27         "../../scew", "/apps/scew-0.4.0", "/apps/scew", "/opt/scew-0.4.0",
    28         "/opt/scew" );
    29     $SCEW_INC="scew/scew.h";
    30     @EXPAT_INC_SEARCHPATH = ( "@prefix@/include",
    31         "/apps/rappture/include", "/opt/rappture/include",
    32         "/usr/local/include", "/opt/include", "../../expat-2.0.0/lib",
    33         "../../expat/lib", "/apps/expat-2.0.0/lib", "/apps/expat/lib",
     26        "/usr/local/include", "/opt/include", "../../expat-2.0.0/lib",
     27        "../../expat/lib", "/apps/expat-2.0.0/lib", "/apps/expat/lib",
    3428        "/opt/expat-2.0.0/lib", "/opt/expat/lib" );
    3529    $EXPAT_INC="expat.h";
    3630    @RAPPTURE_INC_SEARCHPATH = ( "@prefix@/include",
    37         "/apps/rappture/include",
    38         "/opt/rappture/include", "/usr/local/include", "/opt/include",
    39         "../include" );
     31        "../src/core", "../include", "/apps/rappture/include",
     32        "/opt/rappture/include", "/usr/local/include", "/opt/include");
    4033    $RAPPTURE_INC = "rappture.h";
    41     @SCEW_LIB_SEARCHPATH = ( "@prefix@/lib",
    42         "/apps/rappture/lib", "/opt/rappture/lib",
    43         "/usr/local/lib", "/opt/lib", "../../scew-0.4.0/scew",
    44         "../../scew/scew", "/apps/scew-0.4.0/scew", "/apps/scew/scew",
    45         "/opt/scew-0.4.0/scew", "/opt/scew/scew" );
    46     @SCEW_LIBS=("libscew.so","libscew.a");
    4734    @EXPAT_LIB_SEARCHPATH = ( "@prefix@/lib",
    48         "/apps/rappture/lib", "/opt/rappture/lib", 
    49         "/usr/local/lib", "/opt/lib", "../../expat-2.0.0/lib", 
    50         "../../expat/lib", "/apps/expat-2.0.0/lib", "/apps/expat/lib", 
     35        "/apps/rappture/lib", "/opt/rappture/lib",
     36        "/usr/local/lib", "/opt/lib", "../../expat-2.0.0/lib",
     37        "../../expat/lib", "/apps/expat-2.0.0/lib", "/apps/expat/lib",
    5138        "/opt/expat-2.0.0/lib", "/opt/expat/lib" );
    5239    @EXPAT_LIBS=("libexpat.so", "libexpat.a");
    5340    @RAPPTURE_LIB_SEARCHPATH = ( "@prefix@/lib",
    54         "/apps/rappture/lib", "/opt/rappture/lib",
    55         "/usr/local/lib", "/opt/lib", "../src" );
     41        "../src", "/apps/rappture/lib", "/opt/rappture/lib",
     42        "/usr/local/lib", "/opt/lib" );
    5643    @RAPPTURE_LIBS=("librappture.so","librappture.a");
    57 } 
     44}
    5845else {
    5946    if ($Config{"cc"} eq "cl") {
    60         $CFLAGS = "/TP /EHsc";
     47        $CFLAGS = "/TP /EHsc";
    6148        @LIBS = ("msvcprt.lib");
    6249    }
    6350
    64     @SCEW_INC_SEARCHPATH = ( "C:\\Program Files\\Rappture\\include",
    65         "C:\\opt\\rappture\\include", "C:\\opt\\include", "..\\..\\scew-0.4.0",
    66         "..\\..\\scew", "C:\\Program Files\\scew-0.4.0",
    67         "C:\\Program Files\\scew", "C:\\opt\\scew-0.4.0", "C:\\opt\\scew" );
    68     $SCEW_INC="scew\\scew.h";
    6951    @EXPAT_INC_SEARCHPATH = ( "C:\\Program Files\\Rappture\\include",
    7052        "C:\\opt\\rappture\\include", "C:\\opt\\include",
     
    7759        "C:\\opt\\rappture\\include", "C:\\opt\\include", "..\\include" );
    7860    $RAPPTURE_INC = "rappture.h";
    79     @SCEW_LIB_SEARCHPATH = ( "C:\\Program Files\\Rappture\\lib",
    80         "C:\\opt\\rappture\\lib", "C:\\opt\\lib",
    81         "..\\..\\scew-0.4.0\\win32\\lib", "..\\..\\scew\\win32\\lib",
    82         "C:\\Program Files\\scew-0.4.0\\win32\\lib",
    83         "C:\\Program Files\\scew\\win32\\lib",
    84         "C:\\opt\\scew-0.4.0\\win32\\lib", "C:\\opt\\scew\\win32\\lib" );
    85     @SCEW_LIBS=("scew_s.lib", "libscew_s.lib", "scew.lib", "libscew.lib");
    86     @SCEWD_LIBS=("scew_sd.lib", "libscew_sd.lib", "scewd.lib", "libscewd.lib");
    8761    @EXPAT_LIB_SEARCHPATH = ( "C:\\Program Files\\Rappture\\lib",
    8862        "C:\\opt\\rappture\\lib", "C:\\opt\\lib",
     
    143117}
    144118
    145 find_include(\@SCEW_INC_SEARCHPATH, $SCEW_INC, \@INCLUDES);
    146119find_include(\@EXPAT_INC_SEARCHPATH, $EXPAT_INC, \@INCLUDES);
    147120find_include(\@RAPPTURE_INC_SEARCHPATH, $RAPPTURE_INC, \@INCLUDES);
    148121find_lib(\@EXPAT_LIB_SEARCHPATH, \@EXPAT_LIBS, \@LIBS);
    149122find_lib(\@RAPPTURE_LIB_SEARCHPATH, \@RAPPTURE_LIBS, \@LIBS);
    150 find_lib(\@SCEW_LIB_SEARCHPATH, \@SCEW_LIBS, \@LIBS);
    151 if ($DEBUG) {
    152     if (!find_lib(\@SCEW_LIB_SEARCHPATH, \@SCEWD_LIBS, \@LIBS)) {
    153         find_lib(\@SCEW_LIB_SEARCHPATH, \@SCEW_LIBS, \@LIBS);
    154     }
    155 }
    156123
    157124WriteMakefile(
Note: See TracChangeset for help on using the changeset viewer.