Changeset 19114
- Timestamp:
- 08/04/06 11:11:22 (2 years ago)
- Files:
-
- juggler/trunk/modules/sonix/plugins/configure.ac (modified) (2 diffs)
- juggler/trunk/modules/sonix/sonix.fpc.in (modified) (1 diff)
- juggler/trunk/modules/tweek/configure.ac (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
juggler/trunk/modules/sonix/plugins/configure.ac
r19109 r19114 297 297 #fi 298 298 299 CXXFLAGS="$CXXFLAGS $CXX_VISIBILITY_FLAGS $VPR_CXXFLAGS $SNX_CXXFLAGS _MIN"299 CXXFLAGS="$CXXFLAGS $CXX_VISIBILITY_FLAGS $VPR_CXXFLAGS $SNX_CXXFLAGS" 300 300 BASE_APP_LINK_FLAGS="$STDFLAGS $BASE_APP_LINK_FLAGS" 301 DEPEND_FLAGS="$VPR_ INCLUDES $SNX_INCLUDES_MIN"301 DEPEND_FLAGS="$VPR_CXXFLAGS $SNX_CXXFLAGS" 302 302 303 303 if test "x$PLATFORM" = "xIRIX" -a "x$USE_GCC" = "xno" ; then … … 340 340 # plug-in. 341 341 if test "x$OS_TYPE" = "xWin32" ; then 342 DSO_PLUGIN_DEPS="$LDFLAGS $SNX_LIBS _LD_MIN $SNX_EXTRA_LIBS_LD_MIN"342 DSO_PLUGIN_DEPS="$LDFLAGS $SNX_LIBS $SNX_EXTRA_LIBS" 343 343 DSO_PLUGIN_PROF_DEPS="$DSO_PLUGIN_DEPS" 344 344 jccl_extra_libs="$LDFLAGS $LIBS" 345 345 else 346 DSO_PLUGIN_DEPS="$LDFLAGS $SNX_LIBS _CC $LIBS $SNX_EXTRA_LIBS_CC"347 DSO_PLUGIN_PROF_DEPS="$LDFLAGS $SNX_PROF_LIBS _CC $LIBS $SNX_EXTRA_LIBS_CC"346 DSO_PLUGIN_DEPS="$LDFLAGS $SNX_LIBS $LIBS $SNX_EXTRA_LIBS" 347 DSO_PLUGIN_PROF_DEPS="$LDFLAGS $SNX_PROF_LIBS $LIBS $SNX_EXTRA_LIBS" 348 348 349 349 VJ_BUILD_LIB_FILE_LIST([$DSO_PLUGIN_DEPS], [DSO_PLUGIN_DEP_FILES]) juggler/trunk/modules/sonix/sonix.fpc.in
r19109 r19114 68 68 Libs.private: 69 69 70 ######################### VaporSpecific Flagpoll Variables ###################70 ######################### Sonix Specific Flagpoll Variables ################### 71 71 libs: ${libs} ${snx_libs} 72 72 extra_libs : ${extra_libs} juggler/trunk/modules/tweek/configure.ac
r19099 r19114 1183 1183 #done 1184 1184 1185 CXXFLAGS="$CXXFLAGS $CXX_VISIBILITY_FLAGS $VPR_CXXFLAGS _MIN"1185 CXXFLAGS="$CXXFLAGS $CXX_VISIBILITY_FLAGS $VPR_CXXFLAGS" 1186 1186 tweek_cxxflags="$STDFLAGS $EXTRA_DEFS $INCLUDES $tweek_idl_gen_includes" 1187 1187 INCLUDES="$INCLUDES $CXX_ORB_INCLUDES" 1188 DEPEND_FLAGS="$VPR_ INCLUDES_MIN"1188 DEPEND_FLAGS="$VPR_CXXFLAGS" 1189 1189 1190 1190 if test "x$PLATFORM" = "xIRIX" -a "x$USE_GCC" != "xyes" ; then … … 1230 1230 # Dependencies for applications and for dynamic/shared libraries. 1231 1231 if test "x$OS_TYPE" = "xWin32" ; then 1232 APP_EXTRA_LIBS="$LDFLAGS $CXX_ORB_LDFLAGS_LINK_EXE $CXX_ORB_LIB_LINK_EXE $VPR_LIBS _LD_MIN $LIBS $VPR_EXTRA_LIBS_LD_MIN"1232 APP_EXTRA_LIBS="$LDFLAGS $CXX_ORB_LDFLAGS_LINK_EXE $CXX_ORB_LIB_LINK_EXE $VPR_LIBS $LIBS $VPR_EXTRA_LIBS" 1233 1233 DYLIB_DEPS="$APP_EXTRA_LIBS" 1234 1234 DYLIB_PROF_DEPS="$DYLIB_DEPS" 1235 1235 else 1236 APP_EXTRA_LIBS="$LDFLAGS $CXX_ORB_LDFLAGS $CXX_ORB_LIB $VPR_LIBS _CC_MIN $LIBS $VPR_EXTRA_LIBS_CC_MIN"1236 APP_EXTRA_LIBS="$LDFLAGS $CXX_ORB_LDFLAGS $CXX_ORB_LIB $VPR_LIBS $LIBS $VPR_EXTRA_LIBS" 1237 1237 DYLIB_DEPS="$APP_EXTRA_LIBS" 1238 DYLIB_PROF_DEPS="$LDFLAGS $CXX_ORB_LDFLAGS $CXX_ORB_LIB $VPR_PROF_LIBS _CC_MIN $LIBS $VPR_EXTRA_LIBS_CC_MIN"1238 DYLIB_PROF_DEPS="$LDFLAGS $CXX_ORB_LDFLAGS $CXX_ORB_LIB $VPR_PROF_LIBS $LIBS $VPR_EXTRA_LIBS" 1239 1239 1240 1240 VJ_BUILD_LIB_FILE_LIST([$DYLIB_DEPS], [DYLIB_DEP_FILES])
