X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=RAW%2FMake-macros;h=3d020ee8b5a9c1789283863b97e336327fb5a194;hb=018253d2c44fb8bce4a978bb33cc6a581ab2357e;hp=5e3c74605512af826fd421336b13f5d7ec6d0779;hpb=9174317d7857acc68eb682396a0669dad059ad0c;p=u%2Fmrichter%2FAliRoot.git

diff --git a/RAW/Make-macros b/RAW/Make-macros
index 5e3c7460551..3d020ee8b5a 100644
--- a/RAW/Make-macros
+++ b/RAW/Make-macros
@@ -2,12 +2,12 @@
 
 ROOTH         = TH1.h
 
-SRCS          = AliRawEvent.cxx \
-		AliRawReader.cxx AliRawReaderFile.cxx AliRawReaderRoot.cxx \
-		AliRawReaderDate.cxx AliTPCBuffer160.cxx AliTPCHuffman.cxx \
-		AliTPCCompression.cxx AliTPCRawStream.cxx \
-		AliITSRawStream.cxx AliITSRawStreamSPD.cxx \
-		AliITSRawStreamSDD.cxx AliITSRawStreamSSD.cxx
+SRCS          = AliRawEventHeader.cxx AliRawEquipmentHeader.cxx \
+		AliRawData.cxx AliRawEquipment.cxx AliRawEvent.cxx \
+		AliStats.cxx AliRawDB.cxx \
+		AliRawRFIODB.cxx AliRawCastorDB.cxx AliRawRootdDB.cxx \
+		AliRawNullDB.cxx AliTagDB.cxx AliTagNullDB.cxx \
+		AliMDC.cxx
 
 HDRS          = $(SRCS:.cxx=.h) LinkDef.h
 
@@ -15,16 +15,15 @@ DICT          = AliRawDict.cxx
 DICTH         = $(DICT:.cxx=.h)
 DICTO         = $(DICT:.cxx=.o)
 
-MAIN          = alimdc.cxx
+MAIN          = alimdc_main.cxx
 MAINO         = $(MAIN:.cxx=.o)
 
 OBJS          = $(SRCS:.cxx=.o) $(DICTO)
 
 ALLDICT       = $(DICT) $(DICTH)
-ALLSRCS       = $(SRCS) $(HDRS) $(MAIN) DateEvent.h
+ALLSRCS       = $(SRCS) $(HDRS) $(MAIN)
 ALLOBJS       = $(OBJS) $(MAINO)
 
-ALIRAW        = libRAW.so
 ALIMDC        = alimdc
 
 
@@ -40,47 +39,27 @@ ALIMDC        = alimdc
 
 ##### TARGETS #####
 
-all:            $(ALIRAW) $(ALIMDC)
+all:            $(ALIMDC)
 
-rdm:            $(ALIRAW) $(ALIMDC)
+rdm:            $(ALIMDC)
 
-smi:            $(ALIRAW) $(ALIMDC)
+smi:            $(ALIMDC)
 
-evb:            $(ALIRAW) $(ALIMDC)
+evb:            $(ALIMDC)
 
-hlt:            $(ALIRAW) $(ALIMDC)
+hlt:            $(ALIMDC)
 
-$(ALIRAW):      $(DICT) $(OBJS)
-		rm -f $(ALIRAW)
-                ifeq ($(PLATFORM),aix)
-		   $(SHLD) -o $(ALIRAW) $(LIBS) -p 0 $(OBJS)
-                else
-                   ifeq ($(PLATFORM),alpha)
-		      $(SHLD) -o $(ALIRAW) $(OBJS) -lcxxstd -lcxx -lexc -lots -lc
-                   else
-		      $(LD) $(SOFLAGS) $(LDFLAGS) $(OBJS) -o $(ALIRAW)
-                   endif
-                endif
-		chmod 555 $(ALIRAW)
-		@echo "$(ALIRAW) done"
 
-
-$(ALIMDC):      $(MAINO) $(ALIRAW)
-                ifeq ($(PLATFORM),aix)
-		   ln -fs $(ALILRAW) libAliRaw.a
-		   $(LD) $(LDFLAGS) $(MAINO) libAliRaw.a \
-		   $(LIBS) -o $(ALIMDC)
-                else
-		   $(LD) $(LDFLAGS) $(MAINO) $(ALIRAW) \
-		   $(LIBS) -o $(ALIMDC)
-                endif
+$(ALIMDC):      $(MAINO) $(DICT) $(OBJS)
+		$(LD) $(LDFLAGS) $(MAINO) $(OBJS) \
+		$(LIBS) -o $(ALIMDC)
 		@if [ `id -u -n` = "alicemdc" ]; then \
 		   chmod 6755 alimdc; \
 		fi
 
 $(DICT):        $(HDRS)
 		@echo "Generating dictionary ..."
-		rootcint -f $(DICT) -c $(ROOTH) $(HDRS)
+		rootcint -f $(DICT) -c $(CXXFLAGS) $(ROOTH) $(HDRS)
 
 $(DICTO):       $(DICT)
 		$(CXX) $(NOOPT) $(CXXFLAGS) -c $(DICT)
@@ -98,4 +77,4 @@ clean:
 		@rm -f $(ALLOBJS) $(ALLDICT)
 
 distclean:      clean
-		@rm -f $(ALIMDC) $(ALIRAW)
+		@rm -f $(ALIMDC)