X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ALIROOT%2FMakefile;h=2c8951ba797d96a6d1e4671acf8f7f0f48430e4f;hb=26107342e2e18ace9f068c8bdf1aa6d27a79d88e;hp=7efaba7dbdd77ae0286ca4fbad02842218eb3775;hpb=fe4da5cc22f890b04843f1aebec0f1bf4f9c3fc9;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ALIROOT/Makefile b/ALIROOT/Makefile
index 7efaba7dbdd..2c8951ba797 100644
--- a/ALIROOT/Makefile
+++ b/ALIROOT/Makefile
@@ -27,7 +27,7 @@ FSRCS		= loadmod.F pydata.F ludata.F
 
 # FORTRAN Objectrs
 
-FOBJS		= $(FSRCS:.F=.o)
+FOBJS		= $(patsubst %.F,tgt_$(ALICE_TARGET)/%.o,$(FSRCS))
 
 # C Sources
 
@@ -35,7 +35,7 @@ CSRCS		= dummies.c
 
 # C Objects
 
-COBJS		= $(CSRCS:.c=.o) 
+COBJS		= $(patsubst %.c,tgt_$(ALICE_TARGET)/%.o,$(CSRCS)) 
 
 # C++ Sources
 
@@ -43,7 +43,7 @@ SRCS		= aliroot.cxx
 
 # C++ Objects
 
-OBJS		= $(SRCS:.cxx=.o) $(DICTO)
+OBJS		= $(patsubst %.cxx,tgt_$(ALICE_TARGET)/%.o,$(SRCS)) $(DICTO)
 
 # Global Macros
 
@@ -62,22 +62,30 @@ FFLAGS		= $(FOPT)
  
 # Target
 
-PROGRAM		= $(ALICE_ROOT)/bin/aliroot
+PROGRAM		= $(BINDIR)/aliroot
 
 default:	$(PROGRAM)
 
 depend:		$(ALLSRCS)
 
-$(ALICE_ROOT)/bin/aliroot:	$(OBJS) $(COBJS) $(FOBJS)
+$(BINDIR)/aliroot:	$(OBJS) $(COBJS) $(FOBJS)
 
-LIBS = $(ALILIBS) $(G3LIBS) $(CLIBS) $(GLIBS) -lEG -lEGPythia -lpythia -lpdf
+LIBS = $(ALILIBS) $(G3LIBS) $(CLIBS) $(GLIBS) -lEG -lEGPythia -lpythia -lpdf \
+					-lTHijing -lhijing
 
 TOCLEAN		= $(PROGRAM) $(OBJS) $(COBJS) $(FOBJS)
 
+CHECKS        = $(patsubst %.cxx,check/%.viol,$(SRCS))
+
 ############################### General Macros ################################
 
 include $(ALICE_ROOT)/conf/GeneralMacros
 
 ############################ Dependencies #####################################
 
-include Make-depend 
+-include tgt_$(ALICE_TARGET)/Make-depend 
+
+
+
+
+