Changeset 19331

Show
Ignore:
Timestamp:
09/30/06 12:27:32 (2 years ago)
Author:
patrick
Message:

Fix up uses of VJ_APP_COMPILER() and VJ_APP_LINKER() that did not make
proper use of versioning information.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/trunk/modules/gadgeteer/configure.ac

    r19126 r19331  
    248248#fi 
    249249 
    250  
    251  
    252250CXXFLAGS="$CXXFLAGS $CXX_VISIBILITY_FLAGS $VPR_CXXFLAGS $JCCL_CXXFLAGS $GMTL_INCLUDES $VPR_BUILD_INCLUDES" 
    253251BASE_APP_LINK_FLAGS="$STDFLAGS $BASE_APP_LINK_FLAGS" 
    …… 
    320318fi 
    321319 
    322  
     320gadget_lib_name="gadget$LIBRARY_VERSION" 
     321gadget_prof_lib_name="gadget_p$LIBRARY_VERSION" 
    323322 
    324323# Remove duplicated arguments from each of the following.  This can help speed 
    …… 
    335334# Put together the basic information needed to compile Gadgeteer applications. 
    336335VJ_APP_COMPILER($CC, $CFLAGS, $CXX, $CXXFLAGS, $DBG_FLAGS, $OPT_FLAGS, 
    337                 GADGET_BASE_DIR, $DEFS, $INCLUDES, ${_EXTRA_FLAGS}) 
     336                GADGET_BASE_DIR, $DEFS, $INCLUDES, ${_EXTRA_FLAGS}, 
     337                $HEADER_VERSION) 
    338338VJ_APP_LINKER([$CXX], [$BASE_APP_LINK_FLAGS], [$LDOPTS_DBG], [$LDOPTS_OPT], 
    339               [GADGET_BASE_DIR], [gadget], [$APP_EXTRA_LIBS]) 
     339              [GADGET_BASE_DIR], [$gadget_lib_name], [$APP_EXTRA_LIBS]) 
    340340 
    341341APP_BASE_DIR='$(topdir)/instlinks' 
    …… 
    381381data_subdir=`echo "$datadir" | sed -e 's|^${prefix}/||' -e "${_prefix_exp}"` 
    382382GADGET_SHARE_DIR="$data_subdir/$DATA_VERSION" 
    383  
    384 gadget_lib_name="gadget$LIBRARY_VERSION" 
    385 gadget_prof_lib_name="gadget_p$LIBRARY_VERSION" 
    386383 
    387384# Information needed to generate gadgeteer-config. 

  • juggler/trunk/modules/jackal/configure.ac

    r19128 r19331  
    294294fi 
    295295 
     296jccl_lib_name="jccl$LIBRARY_VERSION" 
     297jccl_prof_lib_name="jccl_p$LIBRARY_VERSION" 
     298 
    296299# Variables set in Makefiles found in the application trees.  All variables 
    297300# listed are for use only in the Makefile.in's found in that tree unless 
    …… 
    303306VJ_APP_COMPILER([$CC], [$CFLAGS], [$CXX], [$CXXFLAGS], [$DBG_FLAGS], 
    304307                [$OPT_FLAGS], [JCCL_BASE_DIR], [$DEFS], [$INCLUDES], 
    305                 [${_EXTRA_FLAGS}]) 
     308                [${_EXTRA_FLAGS}], [$HEADER_VERSION]) 
    306309VJ_APP_LINKER([$CXX], [$BASE_APP_LINK_FLAGS], [$LDOPTS_DBG], [$LDOPTS_OPT], 
    307               [JCCL_BASE_DIR], [jccl], [$APP_EXTRA_LIBS]) 
     310              [JCCL_BASE_DIR], [$jccl_lib_name], [$APP_EXTRA_LIBS]) 
    308311 
    309312APP_BASE_DIR='$(topdir)/instlinks' 
    …… 
    356359data_subdir=`echo "$datadir" | sed -e 's|^${prefix}/||' -e "${_prefix_exp}"` 
    357360JCCL_SHARE_DIR="$data_subdir/$DATA_VERSION" 
    358  
    359 jccl_lib_name="jccl$LIBRARY_VERSION" 
    360 jccl_prof_lib_name="jccl_p$LIBRARY_VERSION" 
    361361 
    362362# Information needed to generate jccl-config. 

  • juggler/trunk/modules/sonix/configure.ac

    r19126 r19331  
    241241fi 
    242242 
     243snx_lib_name="sonix$LIBRARY_VERSION" 
     244snx_prof_lib_name="sonix_p$LIBRARY_VERSION" 
     245 
    243246# Put together the basic information needed to compile Sonix applications. 
    244247VJ_APP_COMPILER([$CC], [$CFLAGS], [$CXX], [$CXXFLAGS], [$DBG_FLAGS], 
    245248                [$OPT_FLAGS], [SNX_BASE_DIR], [$DEFS], [$INCLUDES], 
    246                 [${_EXTRA_FLAGS}]) 
     249                [${_EXTRA_FLAGS}], [$HEADER_VERSION]) 
    247250VJ_APP_LINKER([$CXX], [$BASE_APP_LINK_FLAGS], [$LDOPTS_DBG], [$LDOPTS_OPT], 
    248               [SNX_BASE_DIR], [snx], [$APP_EXTRA_LIBS]) 
     251              [SNX_BASE_DIR], [$snx_lib_name], [$APP_EXTRA_LIBS]) 
    249252 
    250253APP_BASE_DIR='$(topdir)/instlinks' 
    …… 
    300303data_subdir=`echo "$datadir" | sed -e 's|^${prefix}/||' -e "${_prefix_exp}"` 
    301304SNX_SHARE_DIR="$data_subdir/$DATA_VERSION" 
    302  
    303 snx_lib_name="sonix$LIBRARY_VERSION" 
    304 snx_prof_lib_name="sonix_p$LIBRARY_VERSION" 
    305305 
    306306# Information needed to generate sonix-config. 

  • juggler/trunk/modules/tweek/configure.ac

    r19126 r19331  
    12451245VJ_APP_COMPILER($CC, $CFLAGS, $CXX, $CXXFLAGS $IDL_GEN_INCLUDES, $DBG_FLAGS, 
    12461246                $OPT_FLAGS, TWEEK_BASE_DIR, $DEFS $EXTRA_DEFS, $INCLUDES, 
    1247                 $ABI_FLAGS) 
     1247                $ABI_FLAGS, $HEADER_VERSION) 
    12481248VJ_APP_LINKER_DOOZER([$CXX], [$BASE_APP_LINK_FLAGS], [$LDOPTS_DBG], 
    12491249                     [$LDOPTS_OPT], ['$(TWEEK_LIBS_MIN)'], 

  • juggler/trunk/modules/vapor/configure.ac

    r19321 r19331  
    917917 
    918918VJ_APP_COMPILER($CC, $CFLAGS, $CXX, $CXXFLAGS, $DBG_FLAGS, $OPT_FLAGS, 
    919                 VPR_BASE_DIR, $DEFS, $INCLUDES, $ABI_FLAGS) 
     919                VPR_BASE_DIR, $DEFS, $INCLUDES, $ABI_FLAGS, $HEADER_VERSION) 
    920920VJ_APP_LINKER([$CXX], [$BASE_APP_LINK_FLAGS], [$LDOPTS_DBG], [$LDOPTS_OPT], 
    921921              [VPR_BASE_DIR], [$vpr_lib_name], [$APP_EXTRA_LIBS]) 

  • juggler/trunk/modules/vrjuggler/configure.ac

    r19208 r19331  
    418418# Put together the basic information needed to compile VR Juggler applications. 
    419419VJ_APP_COMPILER($CC, $CFLAGS, $CXX, $VJ_APP_CXXFLAGS, $DBG_FLAGS, $OPT_FLAGS, 
    420                 VJ_BASE_DIR, $DEFS, , ${_EXTRA_FLAGS}) 
     420                VJ_BASE_DIR, $DEFS, , ${_EXTRA_FLAGS}, $HEADER_VERSION) 
    421421VJ_APP_LINKER_DOOZER([$CXX], [$BASE_APP_LINK_FLAGS], [$LDOPTS_DBG], 
    422422                     [$LDOPTS_OPT], ['$(VRJ_LIBS)'],