From: Matthias Richter <Matthias.Richter@scieq.net>
Date: Wed, 4 Mar 2015 11:59:01 +0000 (+0100)
Subject: Update master to aliroot
X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=99d6db94795bfa9d990a0f3c04b3bb379784ef4a;hp=a0e8f092139214b37beba4f059ab8443c0d25bfb;p=u%2Fmrichter%2FAliRoot.git

Update master to aliroot
  commit a0e8f092139214b37beba4f059ab8443c0d25bfb
  Author: morsch <andreas.morsch@cern.ch>
  Date:   Wed Mar 4 12:31:02 2015 +0100
---

diff --git a/HLT/Makefile.am b/HLT/Makefile.am
index d695f0e6cf0..532613a57ed 100644
--- a/HLT/Makefile.am
+++ b/HLT/Makefile.am
@@ -5,6 +5,7 @@
 if HAVE_ALIROOT
 ALIROOT_DEP=sim \
 	    rec \
+	    QA \
 	    shuttle \
 	    pendolino
 endif
@@ -73,8 +74,6 @@ if EN_HLT_VZERO
 VZERO_DIR=VZERO
 endif
 
-QA_DIR=QA
-
 SUBDIRS 		= BASE \
 			  $(ALIROOT_DEP) \
 			  $(RCU_DIR) \