Navigation

Changeset 561:1cb9352359f4 in freeDiameter


Ignore:
Timestamp:
Sep 16, 2010, 1:53:19 PM (14 years ago)
Author:
Sebastien Decugis <sdecugis@nict.go.jp>
Branch:
default
Phase:
public
Message:

More cleanups in the packaging. Also removed rgw_common.so which was quite useless

Files:
6 edited

Legend:

Unmodified
Added
Removed

  • CMakeLists.txt

    r460 r561  
    6464# how to do the check with cmake???
    6565
     66# Add this to workaround an apparent bug in FreeBSD cmake (already defined in Linux)
     67SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-rdynamic")
     68
    6669# Location for the include files
    6770INCLUDE_DIRECTORIES(include)
    … …  
    7376SUBDIRS(freeDiameter)
    7477
    75 # Extensions (there is no point in freeDiameter without any extension)
     78# Extensions (there is no use of freeDiameter without any extension)
    7679SUBDIRS(extensions)

  • contrib/debian/control

    r483 r561  
    8989Package: freediameter-radius-gateway
    9090Architecture: any
    91 Depends: ${misc:Depends}, freediameter-dictionary-rfc4072 (= ${binary:Version}), freediameter-dictionary-rfc4740 (= ${binary:Version})
     91Depends: ${misc:Depends}, freediameter-daemon (= ${binary:Version}), freediameter-dictionary-rfc4072 (= ${binary:Version}), freediameter-dictionary-rfc4740 (= ${binary:Version})
    9292Description: RADIUS/Diameter extensible gateway.
    9393 This freeDiameter extension implements a RADIUS to Diameter
    … …  
    119119Architecture: any
    120120Depends: ${misc:Depends}, freediameter-daemon (= ${binary:Version}), libpq5
     121Suggests: freediameter-dictionary-rfc4072
    121122Description: freeDiameter simple Accounting server.
    122123 This freeDiameter extension implements the Diameter Base
    … …  
    131132 This extension requires a configuration file.
    132133 See app_acct.conf.sample for more details.
     134 .
     135 You may find some useful resources to parse the saved records
     136 in the contrib/app_acct_tools folder in source package.
    133137
    134138Package: freediameter-eap-server
    135139Architecture: any
    136 Depends: ${misc:Depends}, freediameter-daemon (= ${binary:Version}), mysql-client, freediameter-dictionary-rfc4072 (= ${binary:Version})
     140Depends: ${misc:Depends}, freediameter-daemon (= ${binary:Version}), libmysqlclient16, freediameter-dictionary-rfc4072 (= ${binary:Version})
    137141Description: freeDiameter Diameter EAP server implementation.
    138142 This freeDiameter extension implements a Diameter EAP server.
    … …  
    149153Package: freediameter-sip-server
    150154Architecture: any
    151 Depends: ${misc:Depends}, freediameter-daemon (= ${binary:Version}), mysql-client, freediameter-dictionary-rfc4740 (= ${binary:Version})
     155Depends: ${misc:Depends}, freediameter-daemon (= ${binary:Version}), libmysqlclient16, freediameter-dictionary-rfc4740 (= ${binary:Version})
    152156Description: freeDiameter Diameter SIP server implementation.
    153157 This freeDiameter extension implements a Diameter SIP server.

  • contrib/debian/freediameter-radius-gateway.install

    r497 r561  
    11usr/lib/freeDiameter/app_radgw.fdx
    22usr/lib/freeDiameter/*.rgwx
    3 usr/lib/rgw_common.*

  • extensions/app_radgw/CMakeLists.txt

    r551 r561  
    1313
    1414
    15 ########### Utility library #############
    16 # utility libray for the extension and its plugins
    17 # See rgw_common.h for detail
    18 
    19 SET( RG_COMMON_SRC
    20         radius.c
    21         md5.c
    22         rgw_msg_codes.c
    23         rgw_msg_attrtype.c
    24 )
    25 SET( RG_COMMON_HEADER
    26         rgw_common.h
    27         radius.h
    28         md5.h
    29         hostap_compat.h
    30 )
    31 ADD_LIBRARY(rgw_common SHARED ${RG_COMMON_SRC})
    32 SET_TARGET_PROPERTIES(rgw_common PROPERTIES PREFIX "" )
    33 
    34 
    35 
    3615########### Main app_radgw extension #############
    3716
    … …  
    4322# List of source files
    4423SET( RGW_DEFAULT_SRC
     24        radius.c
     25        md5.c
     26        rgw_msg_codes.c
     27        rgw_msg_attrtype.c
    4528        rgw_main.c
    4629        lex.rgw_conf.c
    … …  
    5336)
    5437
     38SET( RG_COMMON_HEADER
     39        rgw_common.h
     40        radius.h
     41        md5.h
     42        hostap_compat.h
     43)
     44
    5545# Compile these files as a freeDiameter extension.
    5646FD_ADD_EXTENSION(app_radgw ${RGW_DEFAULT_SRC} ${RG_COMMON_HEADER})
    57 TARGET_LINK_LIBRARIES(app_radgw rgw_common)
    58 
    5947
    6048
    … …  
    6755  SET_TARGET_PROPERTIES(${PLGNAME} PROPERTIES PREFIX "" )
    6856  SET_TARGET_PROPERTIES(${PLGNAME} PROPERTIES SUFFIX ".rgwx" )
    69   TARGET_LINK_LIBRARIES(${PLGNAME} rgw_common)
    7057  INSTALL(TARGETS ${PLGNAME}
    7158        LIBRARY DESTINATION ${INSTALL_EXTENSIONS_SUFFIX}
    … …  
    126113        COMPONENT freeDiameter-radius-gateway)
    127114       
    128 INSTALL(TARGETS rgw_common
    129         LIBRARY DESTINATION ${INSTALL_LIBRARY_SUFFIX}
    130         COMPONENT freeDiameter-radius-gateway)
    131 
    132115# Note that all compiled plugins are added by the RGWX_ADD_PLUGIN macro in the component freeDiameter-radius-gateway as well.

  • freeDiameter/CMakeLists.txt

    r493 r561  
    6868        VERSION ${FD_PROJECT_VERSION_MAJOR}.${FD_PROJECT_VERSION_MINOR}.${FD_PROJECT_VERSION_REV})
    6969
    70 # Add this to workaround an apparent bug in FreeBSD cmake (already defined in Linux)
    71 SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "-rdynamic")
    72 
    7370# The link command
    7471LINK_DIRECTORIES(${CURRENT_BINARY_DIR}/../libfreeDiameter)

  • include/freeDiameter/CMakeLists.txt

    r493 r561  
    113113SET(FD_LIBS  ${FD_LIBS}  PARENT_SCOPE)
    114114SET(LFD_LIBS ${LFD_LIBS} PARENT_SCOPE)
     115SET(CMAKE_THREAD_LIBS_INIT ${CMAKE_THREAD_LIBS_INIT} PARENT_SCOPE)
    115116
    116117####
Note: See TracChangeset for help on using the changeset viewer.