Commit db72f684 authored by Olivier Lagrasse's avatar Olivier Lagrasse

- Add TAU include and library files.

- Update the configure script. TAU and OTF are enabled by default.
- [BugFix] Fix a compiler bug on PajeFileManager. (Add C header string.h)
parent 65d25d2e
......@@ -51,15 +51,19 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
makefile="Makefile"
# Default values
with_otf=0
with_otf=1
otfdir="../externals/otf/otflib"
otfincdir="$otfdir"
otflibdir="$otfdir"
otfmakecmd="( cd ../externals/otf && ./configure && make && cd ../../trunk )"
otfcleancmd="( cd ../externals/otf && make clean && cd ../../trunk )"
with_tau=0
taudir="/usr"
with_tau=1
taudir="../externals/tau"
tauincdir="$taudir/include"
taulibdir="$taudir/lib"
taulibdir="$taudir/src/TraceInput"
taumakecmd="( cd ../externals/tau/src/TraceInput/ && make && cd ../../../../trunk )"
taucleancmd="( cd ../externals/tau/src/TraceInput/ && make clean && cd ../../../../trunk )"
qtcolordir="../externals/qtcolorpicker"
qtcolorincdir="$qtcolordir/src"
......@@ -117,11 +121,11 @@ usage()
echo " --enable_spinning_logo"
echo " makes the rabbit to turn when no trace is loaded"
echo ""
echo " --enable_otf"
echo " enables the otf support (An OTF release is provided in the externals/otf directory)"
echo " --disable_otf"
echo " disables the otf support"
echo ""
echo " --otf_dir=<path>"
echo " path to the OTF library"
echo " path to the OTF library (An OTF release is provided in the externals/otf directory)"
echo ""
echo " --otf_incdir=<path>"
echo " include path to the OTF headers"
......@@ -129,8 +133,8 @@ usage()
echo " --otf_libdir=<path>"
echo " library path to the OTF libraries"
echo ""
echo " --enable_tau"
echo " enables the tau support"
echo " --disable_tau"
echo " disables the tau support"
echo ""
echo " --tau_dir=<path>"
echo " path to the TAU library"
......@@ -163,9 +167,10 @@ while [ 0 -lt $# ]; do
config_specified=1;
config="$config debug"
;;
--enable_otf) # otf support
with_otf=1;
otfmakecmd="( cd ../externals/otf && ./configure && make && cd ../../trunk )"
--disable_otf) # otf support
with_otf=0;
otfmakecmd=
otfcleancmd=
;;
--otf_dir=*) # otf directory
otfdir=`echo $OPT | awk -F"--otf_dir=" '{print $2}'`
......@@ -178,8 +183,10 @@ while [ 0 -lt $# ]; do
--otf_libdir=*)
otflibdir=`echo $OPT | awk -F"--otf_libdir=" '{print $2}'`
;;
--enable_tau) # tau support
with_tau=1;
--disable_tau) # tau support
with_tau=0;
taumakecmd=
taucleancmd=
;;
--tau_dir=*) # tau directory
taudir=`echo $OPT | awk -F"--tau_dir=" '{print $2}'`
......@@ -243,7 +250,8 @@ then
sources="$sources parser/ParserTau.cpp"
headers="$headers parser/ParserTau.hpp parser/TauStructs.hpp"
includepath="$includepath $tauincdir"
libs="$libs -L$taulibdir -lTAU_tf"
libs="$libs -L$taulibdir -lTAU_traceinput"
# libs="$libs -L$taulibdir -lTAU_tf"
fi
# QT Color Picker
......@@ -319,6 +327,7 @@ include Makefile.in
all:
$otfmakecmd
$taumakecmd
( cd src && \$(QMAKECMD) $project $options)
( cd src && \$(MAKECMD) )
@echo " "
......@@ -339,6 +348,8 @@ plugins:
( cd plugins && VITEDIR=\$(VITEDIR) $MAKE )
clean:
$otfcleancmd
$taucleancmd
( cd plugins && VITEDIR=\$(VITEDIR) $MAKE clean )
( cd src && $MAKE clean )
\$(RM) log.txt
......
......@@ -64,7 +64,9 @@
#ifndef FILE_HPP
#define FILE_HPP
#include <string.h>
#define _PAJE_BUFSIZE 256
#define _PAJE_NBMAXTKS 16
......
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