X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FMakefile;h=2baec91a88499c0676aa2c9e9489d180b7f9f741;hb=1aaf41189a0b84deaff03361ba4ec3e83aaa8c51;hp=698abb5740d9cbc6fd1e8589979550d097f8e2b6;hpb=ce917c76c8d66ae110353336f75b6a4742d57c5e;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/Makefile b/STEER/Makefile
index 698abb5740d..2baec91a884 100644
--- a/STEER/Makefile
+++ b/STEER/Makefile
@@ -3,28 +3,57 @@ PACKAGE = invalid-only-for-proof
 include $(ROOTSYS)/test/Makefile.arch
 include lib$(PACKAGE).pkg
 
-SRCS         += dict.cxx
+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
+
+# only if no par file was loaded before
+ifeq ($(ALICEINC),-I.)
+  ifneq ($(ALICE_ROOT),)
+    ALICEINC += -I$(ALICE_ROOT)/include
+  endif
+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) $(OBJS) -o $@
+	@$(LD) $(SOFLAGS) $(LDFLAGS) $^ -o $@
 endif
 	@chmod a+x $@
 	@echo "done"
 
 %.o:    %.cxx %.h
-	$(CXX) $(CXXFLAGS) -c $< -o $@
+	$(CXX) $(PACKCXXFLAGS) -c $< -o $@
 
 clean:
-	@rm -f $(OBJS) core *~ *.so dict.*
+	@rm -f $(OBJS) *.so G__$(PACKAGE).*
 
-dict.cxx dict.h: $(HDRS) $(DHDR)
-	@echo "Generating dictionary ..."
-	@[ -f dict ] || rm -f $@
-	rootcint -f $@ -c $(ALICEINC) $^
+G__$(PACKAGE).cxx G__$(PACKAGE).h: $(HDRS) $(DHDR)
+	@echo "Generating dictionaries ..." $(ALICEINC)
+	rootcint -f $@ -c $(CINTFLAGS) $(ALICEINC) $^