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 58d72b2..1c4d68a 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 0315565..7b0958b 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 72708b4..8000170 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 a65ff7d..8d77cf6 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