Index: trunk/MagicSoft/Mars/Makefile
===================================================================
--- trunk/MagicSoft/Mars/Makefile	(revision 545)
+++ trunk/MagicSoft/Mars/Makefile	(revision 546)
@@ -37,11 +37,5 @@
 SUBDIRS = mgui mdatacheck mbase mraw
 
-#
-# Library rules
-#
-MARS_LIB  = -Llib $(SUBDIRS:%=-l%)
-MARS_LIBB = $(SUBDIRS:%=lib%.a)
-INCLUDES  = -I. $(SUBDIRS:%=-I%)
-
+LIBRARIES = $(SUBDIRS:=.a)
 
 #------------------------------------------------------------------------------
@@ -60,21 +54,20 @@
 
 # Use $(CXX) -v ... for a more verbose output
-$(PROGRAMS): $(MARS_LIBB) $(PROGRAMS:=.o) $(OBJS) MCint.o
+$(PROGRAMS): $(LIBRARIES) $(OBJS) MCint.o $(PROGRAMS:=.o) 
 	@echo " Linking $@ ..." 
 	$(CXX) $(CXXFLAGS) $@.o $(OBJS) $(MARS_LIB) MCint.o $(ROOTGLIBS) -o $@
 
-$(SOLIB): $(OBJS) $(MARS_LIBB) MCint.o
+$(SOLIB): $(LIBRARIES) $(OBJS) MCint.o
 	@echo " Linking $(SOLIB) ..."
-	$(CXX) -shared $(CXXFLAGS) $(SUBDIRS:%=%/*.o) $(ROOTGLIBS) -o $@
+	$(CXX) -shared $(CXXFLAGS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
 	mv mars.so lib
 
-$(MARS_LIBB):
-	@echo " Creating $@:"
-	(cd $(@:lib%.a=%); make; cd ..; mv $(@:lib%.a=%)/$@ lib) 
+$(LIBRARIES):
+	@echo " Creating lib$@:"
+	(cd $*; make; cd ..; mv $*/$@ lib/lib$@) 
 
 dox:
 	@echo " Creating html documentation:"
 	root -b -q dohtml.C
-
 
 include Makefile.rules
Index: trunk/MagicSoft/Mars/Makefile.conf.linux-gnu
===================================================================
--- trunk/MagicSoft/Mars/Makefile.conf.linux-gnu	(revision 545)
+++ trunk/MagicSoft/Mars/Makefile.conf.linux-gnu	(revision 546)
@@ -23,4 +23,7 @@
 DEBUG    = -g 
 
+MARS_LIB  = -Llib $(SUBDIRS:%=-l%)
+INCLUDES  = -I. $(SUBDIRS:%=-I%)
+
 # uncomment this for quiet compilation
 
Index: trunk/MagicSoft/Mars/Makefile.conf.osf1
===================================================================
--- trunk/MagicSoft/Mars/Makefile.conf.osf1	(revision 545)
+++ trunk/MagicSoft/Mars/Makefile.conf.osf1	(revision 546)
@@ -11,18 +11,11 @@
 
 #
-#  ----->>>  includes
-#
-
-INCLUDE_ROOT    = $(ROOTSYS)/include
-INCLUDE_CPLUS   = /usr/include/cxx
-
-#
 # compilers
 #
 
-CC            = cc
-CXX           = cxx
-F77           = f77
-AR            = ar -c -r
+CC  = cc
+CXX = cxx
+F77 = f77
+AR  = ar -c -r
 
 #
@@ -30,6 +23,9 @@
 #
 
-OPTIM    = -O2 -ieee -arch host
-DEBUG    = -g 
+OPTIM = -O2 -ieee -arch host
+DEBUG = -g 
+
+MARS_LIB  = -Llib $(SUBDIRS/*/-l&)
+INCLUDES  = -I. $(SUBDIRS/*/-I&)
 
 # uncomment this for quiet compilation
Index: trunk/MagicSoft/Mars/Makefile.rules
===================================================================
--- trunk/MagicSoft/Mars/Makefile.rules	(revision 545)
+++ trunk/MagicSoft/Mars/Makefile.rules	(revision 546)
@@ -5,5 +5,5 @@
 
 $(LIB): $(OBJS) $(CINT)Cint.o
-	@echo " - Building Library $(LIB) ... "
+	@echo " - Building Library lib$(LIB) ... "
 	$(AR) $(LIB) *.o
 
Index: trunk/MagicSoft/Mars/mbase/Makefile
===================================================================
--- trunk/MagicSoft/Mars/mbase/Makefile	(revision 545)
+++ trunk/MagicSoft/Mars/mbase/Makefile	(revision 546)
@@ -25,5 +25,5 @@
 
 CINT     = Base
-LIB      = libmbase.a
+LIB      = mbase.a
 
 #------------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/mdatacheck/Makefile
===================================================================
--- trunk/MagicSoft/Mars/mdatacheck/Makefile	(revision 545)
+++ trunk/MagicSoft/Mars/mdatacheck/Makefile	(revision 546)
@@ -22,5 +22,5 @@
 # @code 
 
-LIB   = libmdatacheck.a
+LIB   = mdatacheck.a
 
 #
Index: trunk/MagicSoft/Mars/mgui/Makefile
===================================================================
--- trunk/MagicSoft/Mars/mgui/Makefile	(revision 545)
+++ trunk/MagicSoft/Mars/mgui/Makefile	(revision 546)
@@ -22,5 +22,5 @@
 # @code 
 
-LIB   = libmgui.a
+LIB   = mgui.a
 
 #
Index: trunk/MagicSoft/Mars/mraw/Makefile
===================================================================
--- trunk/MagicSoft/Mars/mraw/Makefile	(revision 545)
+++ trunk/MagicSoft/Mars/mraw/Makefile	(revision 546)
@@ -17,5 +17,5 @@
 # Library name to creatre
 #
-LIB   = libmraw.a
+LIB   = mraw.a
 
 #