fix coverity and codding conventions

[u/mrichter/AliRoot.git] / HLT / MUON / Makefile.am

diff --git a/HLT/MUON/Makefile.am b/HLT/MUON/Makefile.am
index 80cc8b3adb86ca58c7df63469283c02ea9205ee1..556b481a17ebced9214d13122c02c77308807a87 100644 (file)
--- a/HLT/MUON/Makefile.am
+++ b/HLT/MUON/Makefile.am
@@ -3,7 +3,7 @@
 
 MODULE                                 = AliHLTMUON
 
-EXTRA_DIST                     = HLTMUONLinkDef.h
+EXTRA_DIST                     = 
 
 MODDIR                         = $(top_srcdir)
 PKGDEF                         = $(MODDIR)/libAliHLTMUON.pkg
@@ -11,7 +11,7 @@ include $(top_srcdir)/libAliHLTMUON.pkg
 
 lib_LTLIBRARIES                        =  libAliHLTMUON.la
 
-LIBRARY_VERSION                        = '0:1:0'
+LIBRARY_VERSION                        = '3:0:0'
 
 # library sources
 # The source files are specified in libAliHLTMUON.pkg
@@ -22,23 +22,21 @@ libAliHLTMUON_la_SOURCES    =  $(MODULE_SRCS)
 noinst_HEADERS                 =  $(MODULE_HDRS)
 
 # compilation flags of the library
-AM_CPPFLAGS                    = @HLTBASE_CPPFLAGS@ \
-                                 @ALIROOT_CPPFLAGS@ \
+AM_CPPFLAGS                    = -DMODULE=$(MODULE) \
                                  @ROOTCFLAGS@ \
-                                 -I$(top_srcdir)/BASE \
-                                 -I$(top_srcdir)/MUON \
-                                 -I$(top_srcdir)/MUON/OnlineAnalysis \
-                                 -I$(top_srcdir)/MUON/OfflineInterface \
-                                 -I$(ALICE_ROOT)/MUON \
-                                 -I$(ALICE_ROOT)/STEER \
-                                 -I$(ALICE_ROOT)/RAW
+                                 $(foreach i, $(EINCLUDE),  \
+                                       $(shell echo $(i) | sed -e "/HLT\//!d" -e "s|HLT/|-I$(top_srcdir)/|")) \
+                                 $(foreach i, $(EINCLUDE),  \
+                                       $(shell echo $(i) | sed -e "/HLT\//d" -e "s|^|-I$(ALICE_ROOT)/|"))
 
 # linking flags of the library
+libAliHLTMUON_la_LIBADD                = $(top_builddir)/BASE/util/libAliHLTUtil.la
 libAliHLTMUON_la_LDFLAGS       = -L@ROOTLIBDIR@ \
                                  @ROOTLIBS@ \
                                  @HLTBASE_LDFLAGS@ \
                                  @ALIROOT_LDFLAGS@ \
-                                 @ALIROOT_LIBS@ \
+                                 @ALIROOT_LIBS@  \
+                                 @ALIMUON_LIBS@ \
                                  -version-info $(LIBRARY_VERSION)
 
 # automatic generation of data and time of library build
@@ -53,9 +51,9 @@ CLEANFILES                    = $(COMPILE_INFO)
 
 include $(top_srcdir)/make.dict
 
-$(COMPILE_INFO): $(libAliHLTTPC_la_SOURCES) $(pkginclude_HEADERS) $(noinst_HEADERS) Makefile.am
+$(COMPILE_INFO): $(libAliHLTMUON_la_SOURCES) $(pkginclude_HEADERS) $(noinst_HEADERS) Makefile.am
        @echo '//automatically generated compilation info' > $@
        @echo '//!!! DO NOT EDIT THIS FILE !!!' >> $@
        @echo '//add changes in Makefile.am' >> $@
-       @echo 'extern "C" void CompileInfo( char*& date, char*& time)' >> $@
+       @echo 'extern "C" void CompileInfo(const char*& date, const char*& time)' >> $@
        @echo '{date=__DATE__; time=__TIME__; return;}' >> $@