Conding violations fixed. The code is now included in libSTEER (Mikolaj)

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

diff --git a/STEER/Makefile b/STEER/Makefile
index 8945fb97a73b3a2df3ddd4bd018c1367c2a425c1..9f9057e6fec5f609ad791edd4d91c030dab1238b 100644 (file)
--- a/STEER/Makefile
+++ b/STEER/Makefile
@@ -3,13 +3,33 @@ PACKAGE = invalid-only-for-proof
 include $(ROOTSYS)/test/Makefile.arch
 include lib$(PACKAGE).pkg
 
+ifndef PACKCXXFLAGS
+   PACKCXXFLAGS = $(CXXFLAGS)
+endif
+
+ALICEINC = -I.
+
+ifneq ($(ESD_INCLUDE),)
+   ALICEINC += -I../$(ESD_INCLUDE) 
+endif
+
+ifneq ($(AOD_INCLUDE),)
+   ALICEINC += -I../$(AOD_INCLUDE) 
+endif
+
+ifneq ($(STEERBase_INCLUDE),)
+   ALICEINC += -I../$(STEERBase_INCLUDE)
+endif
+
+CXXFLAGS += $(ALICEINC) -g
+
 SRCS         += G__$(PACKAGE).cxx
 OBJS          = $(SRCS:.cxx=.o)
 
 lib$(PACKAGE).so: $(OBJS)
        @echo "Linking" $@ ...
        @/bin/rm -f $@
-ifeq ($(PLATFORM),macosx)
+ifeq ($(ARCH),macosx)
        @$(LD) -bundle -undefined $(UNDEFOPT) $(LDFLAGS) $^ -o $@
 else
        @$(LD) $(SOFLAGS) $(LDFLAGS) $^ -o $@
@@ -18,12 +38,12 @@ endif
        @echo "done"
 
 %.o:    %.cxx %.h
-       $(CXX) $(CXXFLAGS) -c $< -o $@
+       $(CXX) $(PACKCXXFLAGS) -c $< -o $@
 
 clean:
        @rm -f $(OBJS) *.so G__$(PACKAGE).*
 
 G__$(PACKAGE).cxx G__$(PACKAGE).h: $(HDRS) $(DHDR)
-       @echo "Generating dictionary ..."
-       rootcint -f $@ -c $(ALICEINC) $^
+       @echo "Generating dictionaries ..." $(ALICEINC)
+       rootcint -f $@ -c $(CINTFLAGS) $(ALICEINC) $^