Index: trunk/MagicSoft/Mars/Makefile
===================================================================
--- trunk/MagicSoft/Mars/Makefile	(revision 2487)
+++ trunk/MagicSoft/Mars/Makefile	(revision 2491)
@@ -20,6 +20,7 @@
 #
 
-PROGRAMS = readraw merpp star mars
-SOLIB    = mars.so
+#PROGRAMS = readraw merpp mars test mona status
+PROGRAMS = readraw merpp mars
+SOLIB    = libmars.so
 CINT     = M
 
@@ -37,11 +38,13 @@
 SUBDIRS = mbase \
 	  mmain \
+          mfilter \
+          mdata \
+          mhist \
+          manalysis \
           mfileio \
           mreflector \
-          mhist \
           mdatacheck \
           mgeom \
           mimage \
-          manalysis \
           mmontecarlo \
           mmc \
@@ -49,9 +52,10 @@
           mgui \
           mranforest \
-          mdata \
           mhistmc \
-          mfilter \
           mtools
 
+#          monline \
+
+#LIBRARIES = $(SUBDIRS:%=lib/lib%.a)
 LIBRARIES = $(SUBDIRS:=.a)
 MRPROPERS = $(SUBDIRS:=.mrproper)
@@ -62,5 +66,5 @@
 .SUFFIXES: .c .cc .h .o 
 
-SRCFILES = 
+SRCFILES =
 
 SRCS    = $(SRCFILES)
@@ -84,9 +88,8 @@
 	@echo " Linking $(SOLIB) ..."
 	$(CXX) $(DYNLIB) $(CXXFLAGS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
-	mv mars.so lib
 
-$(PROGRAMS): $(LIBRARIES) $(OBJS) $(HEADERS) MCint.o $(PROGRAMS:=.o) 
+$(PROGRAMS): $(SOLIB) $(PROGRAMS:=.o)
 	@echo " Linking $@ ..." 
-	$(CXX) $(CXXFLAGS) $@.o $(OBJS) $(MARS_LIB) MCint.o $(ROOTGLIBS) -o $@
+	$(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(SOLIB) $@.o $(MARS_LIB) -o $@
 
 #
@@ -114,5 +117,6 @@
 $(LIBRARIES):
 	@echo " Creating lib$@:"
-	(cd $*; make; cd ..; mv $*/$@ lib/lib$@) 
+	(cd $*; make; cd ..; mv $*/$@ lib/lib$@)
+#	(cd $(@:lib/lib%.a=%); make; cd ..; mv $(@:lib/lib%.a=%)/$(@:lib/lib%=%) $@)
 
 $(MRPROPERS):
@@ -137,14 +141,14 @@
 	@echo "Making tar-file"
 	@root -b -q -l -n tar.C
-#	@tar cvf ../mars.tar --exclude=Root .roo trc *
+#	@tar cvf ../mars.tar --exclude=Root .rootrc *
 #	@gzip -9 ../mars.tar
 
-depend:
+Makefile.depend:
 	(! find ./ Makefile.depend -maxdepth 1 -empty 2> /dev/null && \
 	echo " Generating dependancies into Makefile.depend" && \
-	makedepend -- $(INCLUDES) -- $(PROGRAMS:=.cc) $(SRCS) $(SUBDIRS:=/*.cc) -f- 2> /dev/null | grep -v Cint | grep -v "/usr/" > Makefile.depend && \
+	makedepend -- $(INCLUDES) -- $(PROGRAMS:=.cc) $(SRCS) $(SUBDIRS:=/*.cc) -w1024 -f- 2> /dev/null | grep -v Cint | grep -v "/usr/" > Makefile.depend && \
 	echo " ") || find -maxdepth 0 -true > /dev/null
 
-Makefile.depend: depend
+depend:	Makefile.depend	
 
 # @endcode