Skip to content
Browse files

Merge branch 'master' of /export/hostel/pub/scm/complement

  • Loading branch information...
2 parents 5776c38 + 388ce11 commit bbf30844d15d5a400d469127e0a02e70f00cfa2e @ptr committed Apr 12, 2011
View
6 explore/app/intercessor/Makefile
@@ -9,9 +9,9 @@ include ${SRCROOT}/Makefiles/gmake/top.mak
INCLUDES += -I${CoMT_INCLUDE_DIR} -I${BOOST_INCLUDE_DIR}
LDFLAGS += -L${INSTALL_LIB_DIR} -Wl,-rpath=${INSTALL_LIB_DIR}
-release-shared: LDLIBS = -lxmt -lsockios -lNet -lstem -lboost_regex -lboost_filesystem -lboost_program_options
-dbg-shared: LDLIBS = -lxmtg -lsockiosg -lNetg -lstemg -lboost_regexg -lboost_filesystemg -lboost_program_optionsg
-stldbg-shared: LDLIBS = -lxmtstlg -lsockiosstlg -lNetstlg -lstemstlg -lboost_regexstlg -lboost_filesystemstlg -lboost_program_optionsstlg
+release-shared: LDLIBS = -lxmt -lsockios -lNet -lstem -lboost_regex -lboost_fs -lboost_program_options
+dbg-shared: LDLIBS = -lxmtg -lsockiosg -lNetg -lstemg -lboost_regexg -lboost_fsg -lboost_program_optionsg
+stldbg-shared: LDLIBS = -lxmtstlg -lsockiosstlg -lNetstlg -lstemstlg -lboost_regexstlg -lboost_fsstlg -lboost_program_optionsstlg
check-shared: all-shared
$(MAKE) -C unit check || exit 1
View
6 explore/app/intercessor/unit/Makefile
@@ -33,10 +33,10 @@ endif
INCLUDES += -I${CoMT_INCLUDE_DIR} -I${BOOST_INCLUDE_DIR} -I..
-release-shared: PROJECT_LIBS = -lxmt -lsockios -lNet -lstem -lboost_regex -lboost_filesystem -lexam
-dbg-shared: PROJECT_LIBS = -lxmtg -lsockiosg -lNetg -lstemg -lboost_regexg -lboost_filesystemg -lexamg
+release-shared: PROJECT_LIBS = -lxmt -lsockios -lNet -lstem -lboost_regex -lboost_fs -lexam
+dbg-shared: PROJECT_LIBS = -lxmtg -lsockiosg -lNetg -lstemg -lboost_regexg -lboost_fsg -lexamg
ifndef WITHOUT_STLPORT
-stldbg-shared: PROJECT_LIBS = -lxmtstlg -lsockiosstlg -lNetstlg -lstemstlg -lboost_regexstlg -lboost_filesystemstlg -lexamstlg
+stldbg-shared: PROJECT_LIBS = -lxmtstlg -lsockiosstlg -lNetstlg -lstemstlg -lboost_regexstlg -lboost_fsstlg -lexamstlg
endif
LDLIBS = ${PROJECT_LIBS}
View
6 explore/app/utils/edit/Makefile
@@ -14,6 +14,6 @@ release-shared: LDSEARCH = -L${STLPORT_LIB_DIR} -L${CoMT_LIB_DIR}
stldbg-shared: LDSEARCH = -L${STLPORT_LIB_DIR} -L${CoMT_LIB_DIR_STLDBG}
dbg-shared: LDSEARCH = -L${STLPORT_LIB_DIR} -L${CoMT_LIB_DIR_DBG}
-release-shared : LDLIBS = -Wl,-rpath=${STLPORT_LIB_DIR}:${CoMT_LIB_DIR} -lstlport_gcc -lboost_filesystem_gcc -lboost_regex_gcc
-stldbg-shared : LDLIBS = -lstlport_gcc_stldebug -lboost_filesystem_gcc_stl-g
-dbg-shared : LDLIBS = -lstlport_gcc -lboost_filesystem_gcc-g
+release-shared : LDLIBS = -Wl,-rpath=${STLPORT_LIB_DIR}:${CoMT_LIB_DIR} -lstlport_gcc -lboost_fs_gcc -lboost_regex_gcc
+stldbg-shared : LDLIBS = -lstlport_gcc_stldebug -lboost_fs_gcc_stl-g
+dbg-shared : LDLIBS = -lstlport_gcc -lboost_fs_gcc-g
View
6 explore/lib/net/ut/Makefile
@@ -34,10 +34,10 @@ endif
INCLUDES += -I${CoMT_INCLUDE_DIR} -I${BOOST_INCLUDE_DIR}
-release-shared: PROJECT_LIBS = -lNet -lboost_filesystem -lexam
-dbg-shared: PROJECT_LIBS = -lNetg -lboost_filesystemg -lexamg
+release-shared: PROJECT_LIBS = -lNet -lboost_fs -lexam
+dbg-shared: PROJECT_LIBS = -lNetg -lboost_fsg -lexamg
ifndef WITHOUT_STLPORT
-stldbg-shared: PROJECT_LIBS = -lNetstlg -lboost_filesystemstlg -lexamstlg
+stldbg-shared: PROJECT_LIBS = -lNetstlg -lboost_fsstlg -lexamstlg
endif
LDLIBS = ${PROJECT_LIBS}
View
2 extern/custom/boost/libs/filesystem/Makefile.inc
@@ -2,7 +2,7 @@
BOOST_FS_SRC = ${BOOST_INCLUDE_DIR}/libs/filesystem
#BOOST_FS_SRC = src
-LIBNAME = boost_filesystem
+LIBNAME = boost_fs
MAJOR = 1
MINOR = 44
PATCH = 0
View
6 extern/custom/boost/libs/filesystem/test-v2/Makefile
@@ -14,10 +14,10 @@ ifndef WITHOUT_STLPORT
stldbg-shared: LDFLAGS += -L../${OUTPUT_DIR_STLDBG} -Wl,-rpath=../${OUTPUT_DIR_STLDBG}
endif
-release-shared: LDLIBS = -lboost_filesystem
-dbg-shared: LDLIBS = -lboost_filesystemg
+release-shared: LDLIBS = -lboost_fs
+dbg-shared: LDLIBS = -lboost_fsg
ifndef WITHOUT_STLPORT
-stldbg-shared: LDLIBS = -lboost_filesystemstlg
+stldbg-shared: LDLIBS = -lboost_fsstlg
endif
check: all
View
6 extern/custom/boost/libs/filesystem/test-v3/Makefile
@@ -14,10 +14,10 @@ ifndef WITHOUT_STLPORT
stldbg-shared: LDFLAGS += -L../${OUTPUT_DIR_STLDBG} -Wl,-rpath=../${OUTPUT_DIR_STLDBG}
endif
-release-shared: LDLIBS = -lboost_filesystem
-dbg-shared: LDLIBS = -lboost_filesystemg
+release-shared: LDLIBS = -lboost_fs
+dbg-shared: LDLIBS = -lboost_fsg
ifndef WITHOUT_STLPORT
-stldbg-shared: LDLIBS = -lboost_filesystemstlg
+stldbg-shared: LDLIBS = -lboost_fsstlg
endif
check: all
View
7 extern/custom/boost/libs/graph/Makefile
@@ -1,17 +1,10 @@
# -*- makefile -*- Time-stamp: <06/06/27 02:25:13 ptr>
SRCROOT := ../../../../../explore
-#POST_INSTALL = ln -sf ${SO_NAME} $(INSTALL_LIB_DIR)/libboost_filesystem.so
-#POST_INSTALL_DBG = ln -sf ${SO_NAME_DBG} $(INSTALL_LIB_DIR_DBG)/libboost_filesystem.so
include Makefile.inc
include ${SRCROOT}/Makefiles/gmake/top.mak
-ifdef USE_SYSTEM_BOOST
-#POST_INSTALL += ; rm -f $(INSTALL_LIB_DIR)/libboost_filesystem.so $(INSTALL_LIB_DIR)/${SO_NAME}
-#POST_INSTALL_DBG += ; rm -f $(INSTALL_LIB_DIR_DBG)/libboost_filesystem.so $(INSTALL_LIB_DIR_DBG)/${SO_NAME_DBG}
-endif
-
INCLUDES += -I${BOOST_INCLUDE_DIR}
check: all
View
10 extern/custom/boost/libs/log/Makefile
@@ -13,13 +13,13 @@ INCLUDES += -I${BOOST_INCLUDE_DIR} -I${BOOST_LOG_INCLUDE_DIR}
DEFS += -DBOOST_LOG_DLL -DBOOST_LOG_BUILDING_THE_LIB=1 -DBOOST_LOG_USE_NATIVE_SYSLOG=1
ifdef USE_SYSTEM_BOOST
-release-shared: LDLIBS = -lboost_date_time -lboost_filesystem -lboost_system -lboost_thread
-dbg-shared: LDLIBS = -lboost_date_time -lboost_filesystem -lboost_system -lboost_thread
+release-shared: LDLIBS = -lboost_date_time -lboost_fs -lboost_system -lboost_thread
+dbg-shared: LDLIBS = -lboost_date_time -lboost_fs -lboost_system -lboost_thread
else
-release-shared: LDLIBS = -L../date_time/${OUTPUT_DIR} -L../filesystem/${OUTPUT_DIR} -L../system/${OUTPUT_DIR} -L../thread/${OUTPUT_DIR} -lboost_dt -lboost_filesystem -lboost_system -lboost_thread
-dbg-shared: LDLIBS = -L../date_time/${OUTPUT_DIR_DBG} -L../filesystem/${OUTPUT_DIR_DBG} -L../system/${OUTPUT_DIR_DBG} -L../thread/${OUTPUT_DIR_DBG} -lboost_dtg -lboost_filesystemg -lboost_systemg -lboost_threadg
+release-shared: LDLIBS = -L../date_time/${OUTPUT_DIR} -L../filesystem/${OUTPUT_DIR} -L../system/${OUTPUT_DIR} -L../thread/${OUTPUT_DIR} -lboost_dt -lboost_fs -lboost_system -lboost_thread
+dbg-shared: LDLIBS = -L../date_time/${OUTPUT_DIR_DBG} -L../filesystem/${OUTPUT_DIR_DBG} -L../system/${OUTPUT_DIR_DBG} -L../thread/${OUTPUT_DIR_DBG} -lboost_dtg -lboost_fsg -lboost_systemg -lboost_threadg
ifndef WITHOUT_STLPORT
-stldbg-shared: LDLIBS = -L../date_time/${OUTPUT_DIR_STLDBG} -L../filesystem/${OUTPUT_DIR_STLDBG} -L../system/${OUTPUT_DIR_STLDBG} -L../thread/${OUTPUT_DIR_STLDBG} -lboost_dtstlg -lboost_filesystemstlg -lboost_systemstlg -lboost_threadstlg
+stldbg-shared: LDLIBS = -L../date_time/${OUTPUT_DIR_STLDBG} -L../filesystem/${OUTPUT_DIR_STLDBG} -L../system/${OUTPUT_DIR_STLDBG} -L../thread/${OUTPUT_DIR_STLDBG} -lboost_dtstlg -lboost_fsstlg -lboost_systemstlg -lboost_threadstlg
endif
endif
View
10 extern/custom/boost/libs/log_setup/Makefile
@@ -13,13 +13,13 @@ INCLUDES += -I${BOOST_INCLUDE_DIR} -I${BOOST_LOG_INCLUDE_DIR}
DEFS += -DBOOST_LOG_SETUP_DLL -DBOOST_LOG_SETUP_BUILDING_THE_LIB=1
ifdef USE_SYSTEM_BOOST
-release-shared: LDLIBS = -lboost_date_time -lboost_filesystem -lboost_system -lboost_thread -lboost_regex -lboost_log
-dbg-shared: LDLIBS = -lboost_date_time -lboost_filesystem -lboost_system -lboost_thread -lboost_regex -lboost_log
+release-shared: LDLIBS = -lboost_date_time -lboost_fs -lboost_system -lboost_thread -lboost_regex -lboost_log
+dbg-shared: LDLIBS = -lboost_date_time -lboost_fs -lboost_system -lboost_thread -lboost_regex -lboost_log
else
-release-shared: LDLIBS = -L../date_time/${OUTPUT_DIR} -L../filesystem/${OUTPUT_DIR} -L../system/${OUTPUT_DIR} -L../thread/${OUTPUT_DIR} -L../log/${OUTPUT_DIR} -L../regex/${OUTPUT_DIR} -lboost_dt -lboost_filesystem -lboost_system -lboost_thread -lboost_regex -lboost_log
-dbg-shared: LDLIBS = -L../date_time/${OUTPUT_DIR_DBG} -L../filesystem/${OUTPUT_DIR_DBG} -L../system/${OUTPUT_DIR_DBG} -L../thread/${OUTPUT_DIR_DBG} -L../log/${OUTPUT_DIR_DBG} -L../regex/${OUTPUT_DIR_DBG} -lboost_dtg -lboost_filesystemg -lboost_systemg -lboost_threadg -lboost_regexg -lboost_logg
+release-shared: LDLIBS = -L../date_time/${OUTPUT_DIR} -L../filesystem/${OUTPUT_DIR} -L../system/${OUTPUT_DIR} -L../thread/${OUTPUT_DIR} -L../log/${OUTPUT_DIR} -L../regex/${OUTPUT_DIR} -lboost_dt -lboost_fs -lboost_system -lboost_thread -lboost_regex -lboost_log
+dbg-shared: LDLIBS = -L../date_time/${OUTPUT_DIR_DBG} -L../filesystem/${OUTPUT_DIR_DBG} -L../system/${OUTPUT_DIR_DBG} -L../thread/${OUTPUT_DIR_DBG} -L../log/${OUTPUT_DIR_DBG} -L../regex/${OUTPUT_DIR_DBG} -lboost_dtg -lboost_fsg -lboost_systemg -lboost_threadg -lboost_regexg -lboost_logg
ifndef WITHOUT_STLPORT
-stldbg-shared: LDLIBS = -L../date_time/${OUTPUT_DIR_STLDBG} -L../filesystem/${OUTPUT_DIR_STLDBG} -L../system/${OUTPUT_DIR_STLDBG} -L../thread/${OUTPUT_DIR_STLDBG} -L../log/${OUTPUT_DIR_STLDBG} -L../regex/${OUTPUT_DIR_STLDBG} -lboost_dtstlg -lboost_filesystemstlg -lboost_systemstlg -lboost_threadstlg -lboost_regexstlg -lboost_logstlg
+stldbg-shared: LDLIBS = -L../date_time/${OUTPUT_DIR_STLDBG} -L../filesystem/${OUTPUT_DIR_STLDBG} -L../system/${OUTPUT_DIR_STLDBG} -L../thread/${OUTPUT_DIR_STLDBG} -L../log/${OUTPUT_DIR_STLDBG} -L../regex/${OUTPUT_DIR_STLDBG} -lboost_dtstlg -lboost_fsstlg -lboost_systemstlg -lboost_threadstlg -lboost_regexstlg -lboost_logstlg
endif
endif
View
2 extern/custom/boost/libs/python/Makefile.inc
@@ -1,5 +1,5 @@
BOOST_PY_SRC = ${BOOST_INCLUDE_DIR}/libs/python/src
-LIBNAME = boost_python
+LIBNAME = boost_py
MAJOR = 1
MINOR = 44
PATCH = 0

0 comments on commit bbf3084

Please sign in to comment.
Something went wrong with that request. Please try again.