Index: trunk/MagicSoft/Mars/mbase/Makefile
===================================================================
--- trunk/MagicSoft/Mars/mbase/Makefile	(revision 463)
+++ trunk/MagicSoft/Mars/mbase/Makefile	(revision 466)
@@ -15,40 +15,19 @@
 #
 #
-INCLUDEMK = ../Makefile.conf.$(OSTYPE)
-include $(INCLUDEMK)
+include ../Makefile.conf.$(OSTYPE)
+include ../Makefile.conf.general
 
 # @endcode 
 
+INCLUDES = -I.
+
 # @code 
 
-LIB   = libmbase.a
-
-#
-#  connect the include files defined in the config.mk file
-#
-INCLUDES = -I./
-
-#
-#  ----->>>   root libraries
-#
-
-ROOTLIBS   =  `root-config --libs`
-ROOTGLIBS  =  `root-config --glibs`
-ROOTCFLAGS =  `root-config --cflags`
-
-#
-#  compiler flags
-#
-
-CXXFLAGS  = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG)
-CFLAGS    = $(CXXFLAGS)
-FFLAGS    = $(CXXFLAGS)
+CINT     = Base
+LIB      = libmbase.a
 
 #------------------------------------------------------------------------------
 
-#.SILENT:
-
 .SUFFIXES: .c .cc .cxx .h .hxx .o 
-
 
 SRCFILES = MTask.cc \
@@ -72,60 +51,9 @@
 all: $(LIB)
 
-depend:
-	@makedepend $(SRCS) $(INCLUDES) $(ROOTCFLAGS) \
-        -fMakefile.depend 2> kk.kk ; cat kk.kk
+include ../Makefile.rules
 
-$(LIB): $(OBJS) BaseCint.o
-	@echo " - Building Library $(LIB) ... "
-	$(AR) $(LIB) *.o
+clean:	rmlib rmcint rmobjs rmcore
 
-BaseCint.cc: $(HEADERS) 
-	@echo 
-	@echo " - Generating dictionary BaseCint.cc ..."
-
-	$(ROOTSYS)/bin/rootcint -f BaseCint.cc \
-	-c $(INCLUDES) $(HEADERS) BaseIncl.h BaseLinkDef.h
-
-.cxx.o:	
-	@echo " - Compiling " $<
-	$(CXX) $(CXXFLAGS) -c $< -o $@
-
-.cc.o:	
-	@echo " - Compiling " $<
-	$(CXX) $(CXXFLAGS) -c $< -o $@
-
-.c.o:	
-	@echo " - Compiling " $<
-	$(CC) $(CFLAGS) -c $< -o $@
-
-#
-# The cleaning facility
-#
-
-rmlib:	
-	@echo "Removing libraries..."
-	@rm -f lib*.a
-
-rmcint:	
-	@echo "Removing cint-stuff..."
-	@rm -f BaseCint.*
-
-rmobjs:	
-	@echo "Removing object files..."
-	@rm -f *.o
-
-rmbin:	
-	@echo "Removing binary files..."
-	@rm -f core
-
-
-clean:	rmlib rmcint rmobjs rmbin
-
-mrproper:	clean
-	@echo "Removing *~ kk.kk html/..."
-	@rm -f *~ kk.kk
-
-cflags: 
-	@echo $(INCLUDES) $(CXXFLAGS)
+mrproper:	clean rmbak
 
 # @endcode