Changeset 20573

Show
Ignore:
Timestamp:
07/20/07 12:04:54 (1 year ago)
Author:
patrick
Message:

Use Flagpoll in the Sonix plug-in build process to figure out where to
install things.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/branches/2.2/macros/sonix.m4

    r19729 r20573  
    9494            SNX_EXTRA_LIBS=`$FLAGPOLL $sonix_flagpoll_args --get-extra-libs` 
    9595            SNX_VERSION=`$FLAGPOLL $sonix_flagpoll_args --modversion` 
     96            SNX_DATA_SUBDIR=`$FLAGPOLL $sonix_flagpoll_args --get-snx-data-subdir` 
     97            SNX_PLUGIN_SUBDIR=`$FLAGPOLL $sonix_flagpoll_args --get-snx-plugin-subdir` 
    9698 
    9799            DPP_VERSION_CHECK_MSG_NO_CACHE([Sonix], [$SNX_VERSION], 
    …… 
    124126    AC_SUBST(SNX_EXTRA_LIBS) 
    125127    AC_SUBST(SNX_VERSION) 
    126  
     128    AC_SUBST(SNX_DATA_SUBDIR) 
     129    AC_SUBST(SNX_PLUGIN_SUBDIR) 
    127130]) 

  • juggler/branches/2.2/modules/sonix/configure.ac

    r20500 r20573  
    169169   LIBRARY_VERSION="-$VERSION_UNDERSCORE" 
    170170   DATA_VERSION="sonix-$VERSION_DOT" 
     171   PLUGIN_VERSION="sonix-$VERSION_DOT" 
    171172 
    172173   AC_DEFINE([SNX_USE_VERSIONING], , 
    …… 
    176177 
    177178# If versioning is disabled, then none of the version variables need to be 
    178 # set except for $DATA_VERSION. Its use is different than the others. The 
    179 # important thing to note is that the directory name is unversioned in this 
    180 # case. 
     179# set except for $DATA_VERSION and $PLUGIN_VERSION. Their use is different 
     180# than the others. The important thing to note is that the directory name is 
     181# unversioned in this case. 
    181182else 
    182183   DATA_VERSION="sonix" 
     184   PLUGIN_VERSION="sonix" 
    183185fi 
    184186 
    …… 
    338340 
    339341includedir="$includedir/$HEADER_VERSION" 
     342snx_header_subdir="$HEADER_VERSION" 
     343snx_data_subdir="$DATA_VERSION" 
     344snx_plugin_subdir="$PLUGIN_VERSION" 
    340345 
    341346DPP_SUBST 
    …… 
    356361AC_SUBST(LIBRARY_VERSION) 
    357362AC_SUBST(DATA_VERSION) 
     363AC_SUBST(PLUGIN_VERSION) 
    358364 
    359365AC_SUBST(MIN_VPR_VERSION) 
    …… 
    380386AC_SUBST(snx32_flags) 
    381387AC_SUBST(snx64_flags) 
     388AC_SUBST(snx_header_subdir) 
     389AC_SUBST(snx_data_subdir) 
     390AC_SUBST(snx_plugin_subdir) 
    382391 
    383392# ----------------------------------------------------------------------------- 

  • juggler/branches/2.2/modules/sonix/plugins/configure.ac

    r19729 r20573  
    7171              [AUDIERE_ENABLED="$enableval"], [AUDIERE_ENABLED='yes']) 
    7272 
    73 # Enable versioning by default 
    74 AC_ARG_ENABLE([versioning], 
    75               [  --disable-versioning    Disable all versioning capabilities], 
    76               [ENABLE_VERSIONING="$enableval"], [ENABLE_VERSIONING='yes']) 
    7773# -------------------------------------------- # 
    7874# --with-pkg[=arg] and --without-pkg arguments # 
    …… 
    304300# ----------------------------------------------------------------------------- 
    305301 
    306 # Set the form of the version number used for versioned directory and file 
    307 # naming. Unstable builds use all three version numbers; stable builds use 
    308 # only the major and minor version numbers. 
    309 if test "x$ENABLE_VERSIONING" = "xyes" ; then 
    310  
    311    DATA_VERSION="sonix-$SNX_VERSION" 
    312    PLUGIN_DIR_VERSION="sonix-$SNX_VERSION" 
    313  
    314 # If versioning is disabled, then none of the version variables need to be 
    315 # set except for $DATA_VERSION. Its use is different than the others. The 
    316 # important thing to note is that the directory name is unversioned in this 
    317 # case. 
    318 else 
    319    DATA_VERSION="sonix" 
    320    PLUGIN_DIR_VERSION="sonix" 
    321 fi 
     302DATA_SUBDIR="$SNX_DATA_SUBDIR" 
     303PLUGIN_SUBDIR="$SNX_PLUGIN_SUBDIR" 
    322304 
    323305# Add these C++ options when compiling with G++. 
    …… 
    388370AC_SUBST(JUGGLERROOT_ABS) 
    389371 
    390 AC_SUBST(DATA_VERSION) 
    391 AC_SUBST(PLUGIN_DIR_VERSION) 
     372AC_SUBST(DATA_SUBDIR) 
     373AC_SUBST(PLUGIN_SUBDIR) 
    392374 
    393375AC_SUBST(EXTRA_LDFLAGS) 

  • juggler/branches/2.2/modules/sonix/plugins/make.defs.mk.in

    r19729 r20573  
    7171# ----------------------------------------------------------------------------- 
    7272mtreedir=               $(topdir)/mtree 
    73 projdatadir=            $(datadir)/@DATA_VERSION@ 
     73projdatadir=            $(datadir)/@DATA_SUBDIR@ 
    7474releasedir=             @JUGGLERROOT_ABS@/release 
    7575scriptdir=              $(releasedir)/scripts 
    …… 
    9393PLUGIN_ROOT_ABS=        @PLUGIN_ROOT_ABS@ 
    9494JUGGLERROOT_ABS=        @JUGGLERROOT_ABS@ 
    95 PLUGIN_DIR_VERSION=     @PLUGIN_DIR_VERSION@ 
     95SNX_PLUGIN_SUBDIR=     @PLUGIN_SUBDIR@ 
    9696 
    9797STATICLIB_EXT=          @STATICLIB_EXT@ 

  • juggler/branches/2.2/modules/sonix/plugins/plugin.defs.mk.in

    r19729 r20573  
    4444LIBDIR_BASE?=   $(topdir)/$(LIBDIR_NAME) 
    4545 
    46 DSO_PLUGIN_SUBDIR=      $(PLUGIN_DIR_VERSION)/plugins 
     46DSO_PLUGIN_SUBDIR=      $(SNX_PLUGIN_SUBDIR)/plugins 
    4747DSO_PLUGIN_BASE_DIR=    $(LIBDIR_BASE)/$(DSO_PLUGIN_SUBDIR) 
    4848DSO_PLUGIN_DIR=         $(DSO_PLUGIN_BASE_DIR)/$(BUILD_TYPE_DIR) 

  • juggler/branches/2.2/modules/sonix/sonix.fpc.in

    r19450 r20573  
    3939snx_extra_cxxflags = @snx_extra_cxxflags@ 
    4040 
     41snx_header_subdir = @snx_header_subdir@ 
     42snx_data_subdir   = @snx_data_subdir@ 
     43snx_plugin_subdir = @snx_plugin_subdir@ 
    4144########################### Public Variables ############################ 
    4245 
    …… 
    5962profiled_libs: ${libs} ${snx_prof_libs} 
    6063profiled_static_libs: ${static_begin} ${libs} ${snx_prof_libs} ${static_end} 
     64 
     65snx_header_subdir: ${snx_header_subdir} 
     66snx_data_subdir: ${snx_data_subdir} 
     67snx_plugin_subdir: ${snx_plugin_subdir}