Central config and clean up of pkg files.

diff --git a/HLT/hlt.conf b/HLT/hlt.conf
new file mode 100644 (file)
index 0000000..a252431
--- /dev/null
+++ b/HLT/hlt.conf
@@ -0,0 +1,10 @@
+#-*- Mode: Makefile -*-
+# $Id$
+
+HLTDEFS     := -Duse_aliroot -Duse_root -Ddo_mc -DROWHOUGH\
+               -Duse_newio -D${ALICE_TARGET} -DROOTVERSION=\"unchecked\" \
+               -DALIROOTVERSION=\"unchecked\"
+
+HLTCXXFLAGS := $(filter-out -ansi,$(filter-out -pedantic-errors, $(filter-out -Werror,$(CXXFLAGS))))
+HLTCFLAGS   := $(filter-out -ansi, $(filter-out -pedantic-errors, $(filter-out -Werror,$(CFLAGS))))
+HLTDCXXFLAGS:= $(filter-out -pedantic-errors, $(filter-out -Werror,$(CXXFLAGS)))

diff --git a/HLT/libAliL3Comp.pkg b/HLT/libAliL3Comp.pkg
index 58d72b2ca10ed39c2fc28cca7f82764000239c6c..1c4d68a2b968dc9b930e3a35c26032668a363ef1 100644 (file)
--- a/HLT/libAliL3Comp.pkg
+++ b/HLT/libAliL3Comp.pkg
@@ -1,9 +1,7 @@
 #-*- Mode: Makefile -*-
-# $Id:#
+# $Id$
 
-HLTDEFS     := -Duse_aliroot -Duse_root -Ddo_mc -DROWHOUGH\
-               -Duse_newio -D${ALICE_TARGET} -DROOTVERSION=\"unchecked\" \
-               -DALIROOTVERSION=\"unchecked\"
+include HLT/hlt.conf
 
 SRCS:= comp/AliL3ClusterFitter.cxx \
 comp/AliL3Compress.cxx \
@@ -22,8 +20,8 @@ CHDRS:= $(CSRCS:.c=.h)
 DHDR:= comp/AliL3CompLinkDef.h
 
 EDEFINE      := ${HLTDEFS}
-PACKCXXFLAGS := $(filter-out -pedantic-errors, $(filter-out -Werror,$(CXXFLAGS))) ${HLTDEFS}
-PACKCFLAGS   := $(filter-out -ansi,$(filter-out -pedantic-errors, $(filter-out -Werror,$(CFLAGS))))   ${HLTDEFS}
-PACKDCXXFLAGS:= $(filter-out -pedantic-errors, $(filter-out -Werror,$(CXXFLAGS))) ${HLTDEFS}
+PACKCXXFLAGS := ${HLTCXXFLAGS}
+PACKCFLAGS   := ${HLTCLFAGS}
+PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
 
 EINCLUDE:= HLT/src HLT/hough HLT/comp HLT/misc TPC STEER CONTAINERS 

diff --git a/HLT/libAliL3Hough.pkg b/HLT/libAliL3Hough.pkg
index 0315565461ab1b64883f84677424c11a7891f004..7b0958b54fd98470a7f157594452bcf55b6987ca 100644 (file)
--- a/HLT/libAliL3Hough.pkg
+++ b/HLT/libAliL3Hough.pkg
@@ -1,10 +1,7 @@
 #-*- Mode: Makefile -*-
-# $Id:#
-
-HLTDEFS     := -Duse_aliroot -Duse_root -Ddo_mc -DROWHOUGH\
-               -Duse_newio -D${ALICE_TARGET} -DROOTVERSION=\"unchecked\" \
-               -DALIROOTVERSION=\"unchecked\"
+# $Id$
 
+include HLT/hlt.conf
 
 SRCS:= hough/AliL3Histogram.cxx \
 hough/AliL3Histogram1D.cxx \
@@ -33,8 +30,8 @@ HDRS:= $(SRCS:.cxx=.h) $(HLTEHDRS)
 DHDR:= hough/AliL3HoughLinkDef.h
 
 EDEFINE      := ${HLTDEFS} -DROWHOUGH
-PACKCXXFLAGS := $(filter-out -pedantic-errors, $(filter-out -Werror,$(CXXFLAGS))) ${HLTDEFS}
-PACKCFLAGS   := $(filter-out -ansi,$(filter-out -pedantic-errors, $(filter-out -Werror,$(CFLAGS))))   ${HLTDEFS}
-PACKDCXXFLAGS:= $(filter-out -pedantic-errors, $(filter-out -Werror,$(CXXFLAGS))) ${HLTDEFS}
+PACKCXXFLAGS := ${HLTCXXFLAGS}
+PACKCFLAGS   := ${HLTCLFAGS}
+PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
 
 EINCLUDE:= HLT/src HLT/hough HLT/comp HLT/misc TPC STEER CONTAINERS 

diff --git a/HLT/libAliL3Misc.pkg b/HLT/libAliL3Misc.pkg
index 72708b45131db8af7472559528e01c0e88b6b595..800017036a18d147ed745cc5e64803f944177b06 100644 (file)
--- a/HLT/libAliL3Misc.pkg
+++ b/HLT/libAliL3Misc.pkg
@@ -1,10 +1,7 @@
 #-*- Mode: Makefile -*-
-# $Id:#
-
-HLTDEFS     := -Duse_aliroot -Duse_root -Ddo_mc -DROWHOUGH\
-               -Duse_newio -D${ALICE_TARGET} -DROOTVERSION=\"unchecked\" \
-               -DALIROOTVERSION=\"unchecked\"
+# $Id$
 
+include HLT/hlt.conf
 
 SRCS:= misc/AliL3AltroMemHandler.cxx \
 misc/AliL3DDLDataFileHandler.cxx \
@@ -23,8 +20,8 @@ HDRS:= $(SRCS:.cxx=.h) $(HLTEHDRS)
 DHDR:= misc/AliL3MiscLinkDef.h
 
 EDEFINE      := ${HLTDEFS}
-PACKCXXFLAGS := $(filter-out -pedantic-errors, $(filter-out -Werror,$(CXXFLAGS))) ${HLTDEFS}
-PACKCFLAGS   := $(filter-out -ansi,$(filter-out -pedantic-errors, $(filter-out -Werror,$(CFLAGS))))   ${HLTDEFS}
-PACKDCXXFLAGS:= $(filter-out -pedantic-errors, $(filter-out -Werror,$(CXXFLAGS))) ${HLTDEFS}
+PACKCXXFLAGS := ${HLTCXXFLAGS}
+PACKCFLAGS   := ${HLTCLFAGS}
+PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
 
 EINCLUDE:= HLT/src HLT/hough HLT/comp HLT/misc TPC STEER CONTAINERS 

diff --git a/HLT/libAliL3Src.pkg b/HLT/libAliL3Src.pkg
index a65ff7db2f9bd7f0fb33a791fb2739e909662186..8d77cf64fc85d0de811e60dba3e9554a40431d17 100644 (file)
--- a/HLT/libAliL3Src.pkg
+++ b/HLT/libAliL3Src.pkg
@@ -1,10 +1,7 @@
 #-*- Mode: Makefile -*-
-# $Id:#
-
-HLTDEFS     := -Duse_aliroot -Duse_root -Ddo_mc -DROWHOUGH\
-               -Duse_newio -D${ALICE_TARGET} -DROOTVERSION=\"unchecked\" \
-               -DALIROOTVERSION=\"unchecked\"
+# $Id$
 
+include HLT/hlt.conf
 
 SRCS:= src/AliL3Benchmark.cxx \
 src/AliL3ClustFinderNew.cxx \
@@ -36,8 +33,8 @@ HDRS:= $(SRCS:.cxx=.h) $(HLTEHDRS)
 DHDR:= src/AliL3SrcLinkDef.h
 
 EDEFINE      := ${HLTDEFS}
-PACKCXXFLAGS := $(filter-out -pedantic-errors, $(filter-out -Werror,$(CXXFLAGS))) ${HLTDEFS}
-PACKCFLAGS   := $(filter-out -ansi,$(filter-out -pedantic-errors, $(filter-out -Werror,$(CFLAGS))))   ${HLTDEFS}
-PACKDCXXFLAGS:= $(filter-out -pedantic-errors, $(filter-out -Werror,$(CXXFLAGS))) ${HLTDEFS}
+PACKCXXFLAGS := ${HLTCXXFLAGS}
+PACKCFLAGS   := ${HLTCLFAGS}
+PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
 
 EINCLUDE:= HLT/src HLT/hough HLT/comp HLT/misc TPC STEER CONTAINERS