style modifications (Markus)

[u/mrichter/AliRoot.git] / ANALYSIS / Makefile

diff --git a/ANALYSIS/Makefile b/ANALYSIS/Makefile
index 4802a7976f6e807ae5d7f0ecd250032576ca4d7e..df7f64f5802b3fcabfd5daced50a50211fd7acfe 100644 (file)
--- a/ANALYSIS/Makefile
+++ b/ANALYSIS/Makefile
@@ -1,33 +1,39 @@
 
 include $(ROOTSYS)/test/Makefile.arch
 
-default-target: libANALYSIS.so
+PACKAGE = ANALYSIS
+
+default-target: lib$(PACKAGE).so
 
 ALICEINC      = -I.
 
-### define include dir for local case and par case
+# add include paths from other par files
 ifneq ($(ESD_INCLUDE),)
    ALICEINC += -I../$(ESD_INCLUDE)
-       ifneq ($(AOD_INCLUDE),)
-               ALICEINC += -I../$(AOD_INCLUDE)
-       endif
-       ifneq ($(STEERBase_INCLUDE),)
-               ALICEINC += -I../$(STEERBase_INCLUDE)
-       endif                           
-else
-  ifneq ($(ALICE_ROOT),)
-    ALICEINC += -I$(ALICE_ROOT)/include 
-  endif
 endif
 
-# for building of ANALYSIS.par
+ifneq ($(AOD_INCLUDE),)
+   ALICEINC += -I../$(AOD_INCLUDE)
+endif
+
+ifneq ($(STEERBase_INCLUDE),)
+   ALICEINC += -I../$(STEERBase_INCLUDE)
+endif
+
 ifneq ($(ANALYSIS_INCLUDE),)
-  ALICEINC += -I../$(ANALYSIS_INCLUDE)
+   ALICEINC += -I../$(ANALYSIS_INCLUDE)
+endif
+
+# only if no par file was loaded before
+ifeq ($(ALICEINC),-I.)
+  ifneq ($(ALICE_ROOT),)
+    ALICEINC += -I$(ALICE_ROOT)/include -I$(ALICE_ROOT)/ANALYSIS/Tender -I$(ALICE_ROOT)/TOF
+  endif
 endif
 
 CXXFLAGS     += $(ALICEINC) -g
 
-PACKAGE = ANALYSIS
+CHECKXML      := $(shell root-config --has-xml)
 include lib$(PACKAGE).pkg
 
 DHDR_ANALYSIS := $(DHDR)
@@ -41,7 +47,7 @@ PARFILE       = $(PACKAGE).par
 lib$(PACKAGE).so: $(OBJS_ANALYSIS)
        @echo "Linking" $@ ...
        @/bin/rm -f $@
-ifeq ($(PLATFORM),macosx)
+ifeq ($(ARCH),macosx)
        @$(LD) -bundle -undefined $(UNDEFOPT) $(LDFLAGS) $^ -o $@
 else
        @$(LD) $(SOFLAGS) $(LDFLAGS) $^ -o $@