Index: trunk/MagicSoft/Mars/Makefile
===================================================================
--- trunk/MagicSoft/Mars/Makefile	(revision 543)
+++ 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