Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

- First fixes for out-of-source-tree configure and compile - samples/example_app will no longer build by default. To build person compile must run make in the example_app directory in-source-tree. Thats because the Makefile is not and should not be generated by automake.

This commit is contained in:
Eric J Korpela 2012-11-01 17:58:57 -07:00 committed by Oliver Bock
parent 4dcd5a3a11
commit 630dcb0835
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -13,7 +13,8 @@ if ENABLE_LIBRARIES
endif endif
if ENABLE_SERVER if ENABLE_SERVER
SERVER_SUBDIRS = db test py sched apps tools samples/example_app vda SERVER_SUBDIRS = db test py sched apps tools vda
## once contained samples/example_app which breaks out-of-source-tree builds
endif endif
if ENABLE_CLIENT if ENABLE_CLIENT

1
Makefile.incl
View File

@ -18,6 +18,7 @@ RSA_LIBS = -lcrypto
AM_LIBTOOLFLAGS = AM_LIBTOOLFLAGS =
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/api \ -I$(top_srcdir)/api \
-I$(top_srcdir)/db \ -I$(top_srcdir)/db \
-I$(top_srcdir)/lib \ -I$(top_srcdir)/lib \

2
m4/sah_header_stdcxx.m4
View File

@ -24,7 +24,7 @@ AC_DEFUN([SAH_HEADER_STDCXX],[
save_inc="$ac_includes_default" save_inc="$ac_includes_default"
ac_includes_default=" ac_includes_default="
#define CONFIG_TEST #define CONFIG_TEST
#include \"lib/std_fixes.h\" #include \"${ac_aux_dir}/lib/std_fixes.h\"
$ac_includes_default $ac_includes_default
" "

2
m4/sah_largefile_breaks_cxx.m4
View File

@ -18,7 +18,7 @@ AC_DEFUN([SAH_LARGEFILE_BREAKS_CXX],[
[AC_DEFINE([LARGEFILE_BREAKS_CXX],[1], [AC_DEFINE([LARGEFILE_BREAKS_CXX],[1],
["Define to 1 if largefile support causes missing symbols in C++"] ) ["Define to 1 if largefile support causes missing symbols in C++"] )
tmp_res="yes" tmp_res="yes"
sah_cxx_includes=`echo "#include \"$TOP_BUILD_DIR/lib/std_fixes.h\"" ; echo $sah_cxx_includes` sah_cxx_includes=`echo "#include \"${ac_aux_dir}/lib/std_fixes.h\"" ; echo $sah_cxx_includes`
] ]
) )
AC_MSG_RESULT($tmp_res) AC_MSG_RESULT($tmp_res)

8
m4/sah_links.m4
View File

@ -2,9 +2,9 @@ AC_DEFUN([SAH_LINKS],[
AC_PATH_PROGS(LN,[ln cp copy]) AC_PATH_PROGS(LN,[ln cp copy])
if test -n "$LN" ; then if test -n "$LN" ; then
AC_MSG_CHECKING(whether '$LN' works) AC_MSG_CHECKING(whether '$LN' works)
if $LN config.sub erase.me$$ && \ if $LN ${ac_aux_dir}/config.sub erase.me$$ && \
test -e erase.me$$ && \ test -e erase.me$$ && \
diff config.sub erase.me$$ >/dev/null 2>&5 diff ${ac_aux_dir}/config.sub erase.me$$ >/dev/null 2>&5
then then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
else else
@ -18,9 +18,9 @@ AC_DEFUN([SAH_LINKS],[
AC_PROG_LN_S AC_PROG_LN_S
if test -n "$LN_S" ; then if test -n "$LN_S" ; then
AC_MSG_CHECKING(whether '$LN_S' really works or whether I'm deluding myself) AC_MSG_CHECKING(whether '$LN_S' really works or whether I'm deluding myself)
if $LN_S config.sub erase.me$$ && \ if $LN_S ${ac_aux_dir}/config.sub erase.me$$ && \
test -e erase.me$$ && \ test -e erase.me$$ && \
diff config.sub erase.me$$ >/dev/null 2>&5 diff ${ac_aux_dir}/config.sub erase.me$$ >/dev/null 2>&5
then then
AC_MSG_RESULT(it works) AC_MSG_RESULT(it works)
else else