Changeset 19126

Show
Ignore:
Timestamp:
08/07/06 11:13:14 (2 years ago)
Author:
dshipton
Message:

Add in a VPR_BUILD_INCLUDES that takes care of filling in the instlinks/include for external deps. vpr.fpc now needs to strip out vpr_build_includes and refer back to $VJ_DEPS_DIR when installed.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/trunk/macros/vpr.m4

    r19112 r19126  
    7777        VPR_PROF_LIBS_STATIC="`$FLAGPOLL $vpr_flagpoll_args --get-profiled-static-libs`" 
    7878        VPR_EXTRA_LIBS=`$FLAGPOLL $vpr_flagpoll_args --get-extra-libs` 
     79        VPR_BUILD_INCLUDES=`$FLAGPOLL $vpr_flagpoll_args --get-build-includes` 
    7980 
    8081        VPR_SUBSYSTEM=`$FLAGPOLL $vpr_flagpoll_args --get-subsystem` 
    …… 
    110111    AC_SUBST(VPR_PROF_LIBS_STATIC) 
    111112    AC_SUBST(VPR_EXTRA_LIBS) 
     113    AC_SUBST(VPR_BUILD_INCLUDES) 
    112114 
    113115    AC_SUBST(VPR_SUBSYSTEM) 

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

    r19115 r19126  
    250250 
    251251 
    252 CXXFLAGS="$CXXFLAGS $CXX_VISIBILITY_FLAGS $VPR_CXXFLAGS $JCCL_CXXFLAGS $GMTL_INCLUDES" 
     252CXXFLAGS="$CXXFLAGS $CXX_VISIBILITY_FLAGS $VPR_CXXFLAGS $JCCL_CXXFLAGS $GMTL_INCLUDES $VPR_BUILD_INCLUDES" 
    253253BASE_APP_LINK_FLAGS="$STDFLAGS $BASE_APP_LINK_FLAGS" 
    254 DEPEND_FLAGS="$VPR_CXXFLAGS $JCCL_CXXFLAGS $GMTL_INCLUDES" 
     254DEPEND_FLAGS="$VPR_CXXFLAGS $JCCL_CXXFLAGS $GMTL_INCLUDES $VPR_BUILD_INCLUDES" 
    255255gadget_cxxflags="$STDFLAGS" 
    256256 

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

    r19115 r19126  
    504504#fi 
    505505 
    506 CXXFLAGS="$CXXFLAGS $CXX_VISIBILITY_FLAGS $GADGET_CXXFLAGS $VPR_CXXFLAGS $JCCL_CXXFLAGS" 
    507 DEPEND_FLAGS="$GADGET_CXXFLAGS $VPR_CXXFLAGS $JCCL_CXXFLAGS" 
     506CXXFLAGS="$CXXFLAGS $CXX_VISIBILITY_FLAGS $GADGET_CXXFLAGS $VPR_CXXFLAGS $JCCL_CXXFLAGS $VPR_BUILD_INCLUDES" 
     507DEPEND_FLAGS="$GADGET_CXXFLAGS $VPR_CXXFLAGS $JCCL_CXXFLAGS $VPR_BUILD_INCLUDES" 
    508508 
    509509# Note that we do not have to add to $gadget_cxxflags because user code 

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

    r19115 r19126  
    197197#fi 
    198198 
    199 CXXFLAGS="$CXXFLAGS $CXX_VISIBILITY_FLAGS $GADGET_CXXFLAGS $VPR_CXXFLAGS $JCCL_CXXFLAGS" 
    200 DEPEND_FLAGS="$GADGET_CXXFLAGS $VPR_CXXFLAGS $JCCL_CXXFLAGS" 
     199CXXFLAGS="$CXXFLAGS $CXX_VISIBILITY_FLAGS $GADGET_CXXFLAGS $VPR_CXXFLAGS $JCCL_CXXFLAGS $VPR_BUILD_INCLUDES" 
     200DEPEND_FLAGS="$GADGET_CXXFLAGS $VPR_CXXFLAGS $JCCL_CXXFLAGS $VPR_BUILD_INCLUDES" 
    201201 
    202202if test "x$PLATFORM" = "xIRIX" -a "x$USE_GCC" != "xyes" ; then 

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

    r19105 r19126  
    234234#fi 
    235235 
    236 CXXFLAGS="$CXXFLAGS $CXX_VISIBILITY_FLAGS $VPR_CXXFLAGS" 
     236CXXFLAGS="$CXXFLAGS $CXX_VISIBILITY_FLAGS $VPR_CXXFLAGS VPR_BUILD_INCLUDES" 
    237237BASE_APP_LINK_FLAGS="$STDFLAGS $BASE_APP_LINK_FLAGS" 
    238 DEPEND_FLAGS="$VPR_CXXFLAGS" 
     238DEPEND_FLAGS="$VPR_CXXFLAGS $VPR_BUILD_INCLUDES" 
    239239jccl_cxxflags="$STD_FLAGS" 
    240240 

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

    r19105 r19126  
    202202#fi 
    203203 
    204 CXXFLAGS="$CXXFLAGS $CXX_VISIBILITY_FLAGS $JCCL_CXXFLAGS $TWEEK_CXXFLAGS $VPR_CXXFLAGS" 
     204CXXFLAGS="$CXXFLAGS $CXX_VISIBILITY_FLAGS $JCCL_CXXFLAGS $TWEEK_CXXFLAGS $VPR_CXXFLAGS $VPR_BUILD_INCLUDES" 
    205205BASE_APP_LINK_FLAGS="$STDFLAGS $BASE_APP_LINK_FLAGS" 
    206 DEPEND_FLAGS="$JCCL_CXXFLAGS $TWEEK_CXXFLAGS $VPR_CXXFLAGS" 
     206DEPEND_FLAGS="$JCCL_CXXFLAGS $TWEEK_CXXFLAGS $VPR_CXXFLAGS $VPR_BUILD_INCLUDES" 
    207207 
    208208if test "x$PLATFORM" = "xIRIX" -a "x$USE_GCC" = "xno" ; then 

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

    r19109 r19126  
    186186 
    187187 
    188 CXXFLAGS="$CXXFLAGS $CXX_VISIBILITY_FLAGS $VPR_CXXFLAGS $GMTL_INCLUDES" 
     188CXXFLAGS="$CXXFLAGS $CXX_VISIBILITY_FLAGS $VPR_CXXFLAGS $GMTL_INCLUDES $VPR_BUILD_INCLUDES" 
    189189BASE_APP_LINK_FLAGS="$STDFLAGS $BASE_APP_LINK_FLAGS" 
    190 DEPEND_FLAGS="$VPR_CXXFLAGS $GMTL_INCLUDES" 
     190DEPEND_FLAGS="$VPR_CXXFLAGS $GMTL_INCLUDES $VPR_BUILD_INCLUDES" 
    191191snx_cxxflags="$STDFLAGS" 
    192192 

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

    r19114 r19126  
    297297#fi 
    298298 
    299 CXXFLAGS="$CXXFLAGS $CXX_VISIBILITY_FLAGS $VPR_CXXFLAGS $SNX_CXXFLAGS" 
     299CXXFLAGS="$CXXFLAGS $CXX_VISIBILITY_FLAGS $VPR_CXXFLAGS $SNX_CXXFLAGS $VPR_BUILD_INCLUDES" 
    300300BASE_APP_LINK_FLAGS="$STDFLAGS $BASE_APP_LINK_FLAGS" 
    301 DEPEND_FLAGS="$VPR_CXXFLAGS $SNX_CXXFLAGS" 
     301DEPEND_FLAGS="$VPR_CXXFLAGS $SNX_CXXFLAGS $VPR_BUILD_INCLUDES" 
    302302 
    303303if test "x$PLATFORM" = "xIRIX" -a "x$USE_GCC" = "xno" ; then 

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

    r19114 r19126  
    11831183#done 
    11841184 
    1185 CXXFLAGS="$CXXFLAGS $CXX_VISIBILITY_FLAGS $VPR_CXXFLAGS" 
     1185CXXFLAGS="$CXXFLAGS $CXX_VISIBILITY_FLAGS $VPR_CXXFLAGS $VPR_BUILD_INCLUDES" 
    11861186tweek_cxxflags="$STDFLAGS $EXTRA_DEFS $INCLUDES $tweek_idl_gen_includes" 
    11871187INCLUDES="$INCLUDES $CXX_ORB_INCLUDES" 
    1188 DEPEND_FLAGS="$VPR_CXXFLAGS" 
     1188DEPEND_FLAGS="$VPR_CXXFLAGS $VPR_BUILD_INCLUDES" 
    11891189 
    11901190if test "x$PLATFORM" = "xIRIX" -a "x$USE_GCC" != "xyes" ; then 

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

    r19096 r19126  
    921921APP_BASE_DIR_INST='$(VPR_BASE_DIR)' 
    922922 
     923 
    923924# Translate paths from UNIX-style to Win32. 
    924925if test "x$OS_TYPE" = "xWin32" ; then 
    …… 
    962963   _prefix_exp="s|^$prefix/||" 
    963964fi 
     965 
    964966 
    965967# Make a best-effort attempt to extract the actual share directory from the 
    …… 
    986988        vpr_libs="-l$vpr_lib_name" 
    987989        vpr_prof_libs="-l$vpr_prof_lib_name" 
     990        vpr_build_includes="-I\${prefix}/include/boost/compatibility/cpp_c_headers" 
    988991        ;; 
    989992    POSIX) 
    …… 
    10401043        ;; 
    10411044esac 
     1045if test "x$GLOBAL_BUILD" != "x" ; then 
     1046   vpr_build_includes="$vpr_build_includes -I\${prefix}/include" 
     1047else 
     1048   vpr_build_includes="" 
     1049fi 
    10421050 
    10431051vpr_extra_cxxflags='' 
    …… 
    11091117AC_SUBST(vpr_extra_ldflags_linker) 
    11101118AC_SUBST(vpr_extra_libs) 
     1119AC_SUBST(vpr_build_includes) 
    11111120 
    11121121# ----------------------------------------------------------------------------- 
    …… 
    11901199   ]) 
    11911200 
     1201 
    11921202AC_OUTPUT 

  • juggler/trunk/modules/vapor/vpr.fpc.in

    r19098 r19126  
    5353vpr_extra_cxxflags = @vpr_extra_cxxflags@ 
    5454vpr_extra_include_dirs = @vpr_extra_include_dirs@ 
     55vpr_build_includes = @vpr_build_includes@ 
    5556 
    5657vpr_extra_ldflags_compiler = @vpr_extra_ldflags_compiler@ 
    …… 
    8485profiled_libs: ${libs} ${vpr_prof_libs} 
    8586profiled_static_libs: ${static_begin} ${libs} ${vpr_prof_libs} ${static_end} 
     87 
     88######################## HELPER FOR GLOBAL BUILD ############################## 
     89build_includes: ${vpr_build_includes} 

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

    r19118 r19126  
    303303#fi 
    304304 
    305 CXXFLAGS="$CXXFLAGS $CXX_VISIBILITY_FLAGS $VPR_CXXFLAGS $JCCL_CXXFLAGS $GADGET_CXXFLAGS $SNX_CXXFLAGS $GMTL_INCLUDES" 
     305CXXFLAGS="$CXXFLAGS $CXX_VISIBILITY_FLAGS $VPR_CXXFLAGS $JCCL_CXXFLAGS $GADGET_CXXFLAGS $SNX_CXXFLAGS $GMTL_INCLUDES $VPR_BUILD_INCLUDES" 
    306306BASE_APP_LINK_FLAGS="$STDFLAGS $BASE_APP_LINK_FLAGS" 
    307 DEPEND_FLAGS="$VPR_CXXFLAGS $JCCL_CXXFLAGS $GADGET_CXXFLAGS $SNX_CXXFLAGS $GMTL_INCLUDES" 
     307DEPEND_FLAGS="$VPR_CXXFLAGS $JCCL_CXXFLAGS $GADGET_CXXFLAGS $SNX_CXXFLAGS $GMTL_INCLUDES $VPR_BUILD_INCLUDES" 
    308308vrj_cxxflags="$STDFLAGS" 
    309309 

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

    r19118 r19126  
    204204#fi 
    205205 
    206 CXXFLAGS="$CXXFLAGS $CXX_VISIBILITY_FLAGS $VPR_CXXFLAGS $VRJ_CXXFLAGS $TWEEK_CXXFLAGS" 
     206CXXFLAGS="$CXXFLAGS $CXX_VISIBILITY_FLAGS $VPR_CXXFLAGS $VRJ_CXXFLAGS $TWEEK_CXXFLAGS $VPR_BUILD_INCLUDES" 
    207207BASE_APP_LINK_FLAGS="$STDFLAGS $BASE_APP_LINK_FLAGS" 
    208 DEPEND_FLAGS="$VPR_CXXFLAGS $TWEEK_CXXFLAGS $VRJ_CXXFLAGS" 
     208DEPEND_FLAGS="$VPR_CXXFLAGS $TWEEK_CXXFLAGS $VRJ_CXXFLAGS $VPR_BUILD_INCLUDES" 
    209209 
    210210if test "x$PLATFORM" = "xIRIX" -a "x$USE_GCC" = "xno" ; then