Changeset 4397

Show
Ignore:
Timestamp:
07/17/07 16:02:53 (6 years ago)
Author:
jgaeddert
Message:

updating to new /sdr

Location:
components/USRP_Ctrl/trunk/USRP_Ctrl
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • components/USRP_Ctrl/trunk/USRP_Ctrl/Makefile.am

    r1618 r4397  
    44ossieName = USRP_Ctrl 
    55bin_PROGRAMS = USRP_Ctrl 
     6bindir = $(prefix)/dom/bin 
    67 
    7 xmldir = $(prefix)/xml/$(ossieName) 
     8xmldir = $(prefix)/dom/xml/$(ossieName) 
    89dist_xml_DATA = USRP_Ctrl.prf.xml USRP_Ctrl.scd.xml USRP_Ctrl.spd.xml  
    910 

  • components/USRP_Ctrl/trunk/USRP_Ctrl/USRP_Ctrl.spd.xml

    r3242 r4397  
    55<softpkg type="sca_compliant" name="USRP_Ctrl" id="DCE:46a861a6-e9c0-11da-95e6-000129227b11"> 
    66    <title/> 
     7    <description>Sends receive commands to the USRP device</description> 
    78    <author> 
    89        <name>OSSIE Project</name>  
    … …  
    1112    </author> 
    1213    <propertyfile type="PRF"> 
    13         <localfile name="xml/USRP_Ctrl/USRP_Ctrl.prf.xml"/> 
     14        <localfile name="USRP_Ctrl.prf.xml"/> 
    1415    </propertyfile> 
    1516    <descriptor> 
    16         <localfile name="xml/USRP_Ctrl/USRP_Ctrl.scd.xml"/> 
     17        <localfile name="USRP_Ctrl.scd.xml"/> 
    1718    </descriptor> 
    1819    <implementation id="DCE:46a9e792-e9c0-11da-bf30-000129227b11" aepcompliance="aep_compliant"> 
    19         <description>Default Description</description>  
     20        <description>Default implementation description</description> 
    2021        <code type="Executable"> 
    21             <localfile name="bin/USRP_Ctrl"/> 
     22            <localfile name="/bin/USRP_Ctrl"/> 
    2223        </code> 
    2324        <processor name="x86"/> 

  • components/USRP_Ctrl/trunk/USRP_Ctrl/configure.ac

    r2956 r4397  
    1 AC_INIT(USRP_Ctrl, 0.6.0) 
     1AC_INIT(USRP_Ctrl, 0.7.0) 
    22AM_INIT_AUTOMAKE 
    33 
    … …  
    1414AC_LANG_PUSH([C++]) 
    1515 
    16 AC_CHECK_LIB([omniORB4], [main], [], [AC_MSG_ERROR([cannot find omniORB library])]) 
    17 AC_CHECK_LIB([omniDynamic4], [main], [], [AC_MSG_ERROR([cannot find omniDynamic library])]) 
     16AC_CHECK_LIB([omniORB4], [main], [], [AC_MSG_ERROR([cannot find omniORBi4 library])]) 
     17AC_CHECK_LIB([omnithread], [main], [], [AC_MSG_ERROR([cannot find omnithread library])]) 
     18AC_CHECK_LIB([omniDynamic4], [main], [], [AC_MSG_ERROR([cannot find omniDynamic4 library])]) 
    1819AC_CHECK_HEADERS([omniORB4/CORBA.h], [], [AC_MSG_ERROR([cannot find omniORB4 header files])]) 
     20 
     21AC_CHECK_LIB([standardInterfaces], [main], [], [AC_MSG_ERROR([cannot find standardInterfaces])]) 
     22AC_CHECK_HEADERS([standardinterfaces/complexShort.h], [], [AC_MSG_ERROR([cannot find standardInterfaces header files])]) 
    1923 
    2024AC_LANG_POP 
    … …  
    2630AC_SUBST(IDL_FLAGS) 
    2731 
    28 PKG_CHECK_MODULES(SI, standardInterfaces >= 0.6.0,,exit) 
    29 SI_PATH=`pkg-config --variable=includedir standardInterfaces` 
    30 AC_SUBST(SI_PATH) 
    31  
    32 LIBS="$LIBS $OSSIE_LIBS $SI_LIBS" 
     32LIBS="$LIBS $OSSIE_LIBS" 
    3333 
    3434AC_CONFIG_FILES(Makefile) 
    3535 
    3636AC_OUTPUT 
     37