Clean includes

README.md

@@ -14,15 +14,15 @@ In order to install with aliBuild you can follow the tutorial at:
 
     http://alisw.github.io/alibuild/o2-tutorial.html
 
-### Installation of ALFA (FairSoft)
+### Installation with ALFA (FairSoft)
 
 Please be sure that your system has all
 the required libraries (as listed on
-[FairSoft/DEPENDENCIES](https://github.com/FairRootGroup/FairSoft/blob/m
-aster/DEPENDENCIES)).
+[FairSoft/DEPENDENCIES](https://github.com/FairRootGroup/FairSoft/blob/master/DEPENDENCIES)).
 
 #### Full installation:
-The full installation will install [FairSoft](https://github.com/FairRootGroup/FairSoft/tree/dev), [DDS](https://github.com/FairRootGroup/DDS), [FairRoot](https://github.com/FairRootGroup/FairRoot/tree/dev) and [AliROOT]()
+
+The full installation will install [FairSoft](https://github.com/FairRootGroup/FairSoft/tree/dev), [DDS](https://github.com/FairRootGroup/DDS), [FairRoot](https://github.com/FairRootGroup/FairRoot/tree/dev)
 
 The installation:
 * Needs a fast network connection
@@ -31,20 +31,47 @@ The installation:
 * Needs about __10 GBytes__ of disk space (8.1 for the source and objects files, etc and 2.2 GBytes for the installation)
 
 ##### Step by step instructions for the full installation
-1. Install [ALFA(FairSoft)](https://github.com/FairRootGroup/FairSoft/tree/dev)
-
+1. Install [FairSoft](https://github.com/FairRootGroup/FairSoft/tree/dev)
 "alfa_src" is referred as the directory where the ALFA sources exist, you can specify an alternative name if you wish
-
 ```bash
 git clone  https://github.com/FairRootGroup/FairSoft.git  alfa_src
 cd  alfa_src
-./alfaconfig.sh
+./configure.sh
 # 1) gcc (on Linux) 5) Clang (on OSX)
 # 1) No Debug Info
 # 2) Internet (install G4 files from internet)
 # path: ~/AlFa
 ```
+2. Install [DDS](https://github.com/FairRootGroup/DDS)
+```bash
+git clone https://github.com/FairRootGroup/DDS
+cd DDS
+mkdir build
+cd build
+BOOST_ROOT=$ALFA_installation_dir cmake -DCMAKE_INSTALL_PREFIX="DDS_install_prefix"  -C ../BuildSetup.cmake ../
+```
+3. Install [FairRoot](http://fairroot.gsi.de/?q=node/82)  
 
+```bash
+#Set the shell variable SIMPATH to the installation directory
+export SIMPATH= ALFA_installation_dir
+[setenv SIMPATH ALFA_installation_dir]
+
+git clone -b dev https://github.com/FairRootGroup/FairRoot.git
+cd FairRoot
+mkdir build
+cd build
+cmake -DCMAKE_INSTALL_PREFIX="FairRoot_installation_dir" -DDDS_PATH="DDS_install_prefix"  ..
+make
+make install
+```
+To run the tests do:
+
+```bash
+# To run test: make new shell, do not define SIMPATH
+cd FairRoot/build
+make test
+```
 To run the tests do:
 ```bash
 cd alfa_src/FairRoot/build_for_alfa/
@@ -102,7 +129,7 @@ make test
 
 ### Install the [AliceO2](https://github.com/AliceO2Group/AliceO2) software
 
-If ALFA was built using the minimum installation instructions above, AliceO2 will not include the simulation and reconstruction packages.
+If ALFA was built using the minimum installation AliceO2 will not include the simulation and reconstruction packages.
 
 Set the variable SIMPATH to your ALFA/FairSoft installation directory
 
@@ -137,10 +164,8 @@ cmake -DDDS_PATH="/home/username/DDS/0.11.27.g79f48d4/" ..
 
 ### Documentation
 
-The documentation single entry point is [here](https://alice-o2.web.cern.ch/). 
+The documentation single entry point is [here](https://alice-o2.web.cern.ch/).
 
 ### Issue tracking system
 
-We use JIRA to track issues. Head [here](https://alice.its.cern.ch/jira) to create tickets. 
-
-
+We use JIRA to track issues. Head [here](https://alice.its.cern.ch/jira) to create tickets.

itsmft/its/CMakeLists.txt

@@ -11,7 +11,6 @@ ${CMAKE_SOURCE_DIR}/header
 ${BASE_INCLUDE_DIRECTORIES}
 ${Boost_INCLUDE_DIRS}
 ${FAIRROOT_INCLUDE_DIR}
-${AlFa_DIR}/include
 ${ROOT_INCLUDE_DIR}
 )
 

o2cdb/CMakeLists.txt

@@ -14,7 +14,6 @@ set(SYSTEM_INCLUDE_DIRECTORIES
   ${ROOT_INCLUDE_DIR}
   ${FAIRROOT_INCLUDE_DIR}
   ${ZMQ_INCLUDE_DIR}
-  ${AlFa_DIR}/include
 )
 
 include_directories(${INCLUDE_DIRECTORIES})
@@ -24,7 +23,6 @@ set(LINK_DIRECTORIES
   ${ROOT_LIBRARY_DIR}
   ${Boost_LIBRARY_DIRS}
   ${FAIRROOT_LIBRARY_DIR}
-  ${AlFa_DIR}/lib
 )
 link_directories(${LINK_DIRECTORIES})