Commit 713655ba authored by Mathieu Faverge's avatar Mathieu Faverge

Update configure and add links

parent 2ab40374
...@@ -48,10 +48,21 @@ WHICH=`which which 2>/dev/null` ...@@ -48,10 +48,21 @@ WHICH=`which which 2>/dev/null`
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
makefile="Makefile" makefile="Makefile"
# Default values
with_otf=0 with_otf=0
otfdir="/usr"
otfincdir="$otfdir/include"
otflibdir="$otfdir/lib"
with_tau=0 with_tau=0
with_otf_include_default=1 taudir="/usr"
with_otf_lib_default=1 tauincdir="$taudir/include"
taulibdir="$taudir/lib"
qtcolordir="./externals/qtcolorpicker/"
qtcolorincdir="$qtcolordir/src"
qtcolorsrcdir="$qtcolordir/src"
config_specified=0 config_specified=0
# where will we concatenate options like macros, libs... # where will we concatenate options like macros, libs...
...@@ -105,7 +116,7 @@ usage() ...@@ -105,7 +116,7 @@ usage()
echo " makes the rabbit to turn when no trace is loaded" echo " makes the rabbit to turn when no trace is loaded"
echo "" echo ""
echo " --enable_otf" echo " --enable_otf"
echo " enables the otf support (You can find an OTF release in the src/general directory)" echo " enables the otf support (An OTF release is provided in the externals/otf directory)"
echo "" echo ""
echo " --otf_dir=<path>" echo " --otf_dir=<path>"
echo " path to the OTF library" echo " path to the OTF library"
...@@ -178,6 +189,18 @@ while [ 0 -lt $# ]; do ...@@ -178,6 +189,18 @@ while [ 0 -lt $# ]; do
--tau_libdir=*) --tau_libdir=*)
taulibdir=`echo $OPT | awk -F"--tau_libdir=" '{print $2}'` taulibdir=`echo $OPT | awk -F"--tau_libdir=" '{print $2}'`
;; ;;
# Internal options (Don't appear in --help)
--qtcolor_dir=*) # qtcol directory
qtcolordir=`echo $OPT | awk -F"--qtcolor_dir=" '{print $2}'`
qtcolorincdir="$qtcolordir/include"
qtcolorlibdir="$qtcolordir/lib"
;;
--qtcolor_incdir=*) # qtcolor include directory
qtcolorincdir=`echo $OPT | awk -F"--qtcolor_incdir=" '{print $2}'`
;;
--qtcolor_libdir=*)
qtcolorlibdir=`echo $OPT | awk -F"--qtcolor_libdir=" '{print $2}'`
;;
*) *)
echo "invalid option : $OPT"; echo "invalid option : $OPT";
exit 0; exit 0;
...@@ -192,16 +215,20 @@ else ...@@ -192,16 +215,20 @@ else
config="$config release\""; config="$config release\"";
fi fi
#
# External libraries
#
# OTF
if [ $with_otf = 1 ]; then if [ $with_otf = 1 ]; then
defines="$defines WITH_OTF" defines="$defines WITH_OTF"
sources="$sources parser/ParserOTF.cpp parser/ParserEventOTF.cpp parser/ParserDefinitionOTF.cpp" sources="$sources parser/ParserOTF.cpp parser/ParserEventOTF.cpp parser/ParserDefinitionOTF.cpp"
headers="$headers parser/ParserOTF.hpp parser/ParserEventOTF.hpp parser/ParserDefinitionOTF.hpp" headers="$headers parser/ParserOTF.hpp parser/ParserEventOTF.hpp parser/ParserDefinitionOTF.hpp"
includepath="$includepath $otfincdir" includepath="$includepath $otfincdir"
#dependpath="$dependpath $otfincdir"
libs="$libs -L$otflibdir -lotf" libs="$libs -L$otflibdir -lotf"
#compilation_src_pro="\"DEFINES+=WITH_OTF\" \"LIBS+=general/otf/otflib/.libs/libotf.a -Lgeneral/otf/otflib/.libs\" \"SOURCES+=parser/ParserOTF.cpp parser/ParserEventOTF.cpp parser/ParserDefinitionOTF.cpp\" \"HEADERS+=parser/ParserOTF.hpp parser/ParserEventOTF.hpp parser/ParserDefinitionOTF.hpp\" src.pro "
fi fi
# TAU
if [ $with_tau = 1 ] if [ $with_tau = 1 ]
then then
defines="$defines WITH_TAU" defines="$defines WITH_TAU"
...@@ -211,6 +238,14 @@ then ...@@ -211,6 +238,14 @@ then
libs="$libs -L$taulibdir -lTAU_tf" libs="$libs -L$taulibdir -lTAU_tf"
fi fi
# QT Color Picker
dependpath="$dependpath $qtcolorsrcdir"
includepath="$includepath $qtcolorincdir"
#
# End External libraries
#
defines="$defines\""; defines="$defines\"";
libs="$libs\""; libs="$libs\"";
includepath="$includepath\""; includepath="$includepath\"";
...@@ -276,7 +311,7 @@ fi ...@@ -276,7 +311,7 @@ fi
@echo "Compilation completed! File created in 'bin' folder." @echo "Compilation completed! File created in 'bin' folder."
@echo " " @echo " "
DOCUMENTATION = ../documentation/ DOCUMENTATION = ./docs/
doc: doc:
doxygen Doxyfile doxygen Doxyfile
make -C \$(DOCUMENTATION)/latex make -C \$(DOCUMENTATION)/latex
...@@ -294,15 +329,9 @@ clean: ...@@ -294,15 +329,9 @@ clean:
@echo "Cleaned!" @echo "Cleaned!"
@echo " " @echo " "
cleanall: clean cleanall: clean
EOF EOF
if [ $with_otf = 1 -a $with_otf_lib_default = 1 ]; then
cat >>"$makefile" <<EOF
make -C \$(OTFLIB_DIR) clean
EOF
fi
cat >>"$makefile" <<EOF cat >>"$makefile" <<EOF
make -C \$(DOCUMENTATION)/user_manual cleanall make -C \$(DOCUMENTATION)/user_manual cleanall
make -C \$(DOCUMENTATION)/technical_manual cleanall make -C \$(DOCUMENTATION)/technical_manual cleanall
...@@ -311,10 +340,6 @@ fi ...@@ -311,10 +340,6 @@ fi
distclean: cleanall distclean: cleanall
EOF EOF
if [ $with_otf = 1 ]; then
cat >>"$makefile" <<EOF
make -C \$(OTFLIB_DIR) distclean
EOF
fi fi
cat >>"$makefile" <<EOF cat >>"$makefile" <<EOF
\$(RM) Makefile \$(RM) Makefile
......
../docs
\ No newline at end of file
../externals
\ No newline at end of file
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
#include <QInputDialog> #include <QInputDialog>
#include <QMessageBox> #include <QMessageBox>
/* -- */ /* -- */
#include "qtcolorpicker/src/qtcolorpicker.h" #include <qtcolorpicker.h>
/* -- */ /* -- */
#include "trace/values/Values.hpp" #include "trace/values/Values.hpp"
#include "trace/EntityValue.hpp" #include "trace/EntityValue.hpp"
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment