Index: trunk/MagicSoft/Mars/Makefile
===================================================================
--- trunk/MagicSoft/Mars/Makefile	(revision 454)
+++ trunk/MagicSoft/Mars/Makefile	(revision 463)
@@ -22,6 +22,5 @@
 # @code 
 
-PROGRAM1 = merpp
-PROGRAM2 = readraw
+PROGRAMS = merpp readraw mars
 SOLIB    = mars.so
 
@@ -29,5 +28,9 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -Imbase -Imraw
+#    WARNING: the result (whether the linkage works or not) depends on the
+#             order of the libraries
+#
+#
+INCLUDES = -I. -Imgui -Imbase -Imraw -Imdatacheck
 
 #
@@ -35,13 +38,11 @@
 #
 
-MARS_LIB = -Llib -lmbase  -lmraw 
-MARS_LIBB = libmbase.a libmraw.a
+MARS_LIB = -Llib -lmgui -lmdatacheck -lmraw -lmbase 
+MARS_LIBB = libmbase.a libmgui.a libmraw.a libmdatacheck.a
 
 
 #------------------------------------------------------------------------------
 
-#.SILENT:
-
-.SUFFIXES: .c .cc .cxx .h .hxx .o 
+.SUFFIXES: .c .cc .h .o 
 
 
@@ -51,19 +52,14 @@
 HEADERS = $(SRCFILES:.cc=.h)
 OBJS    = $(SRCFILES:.cc=.o) 
-OBJS1   = merpp.o 
-OBJS2   = readraw.o
 
 ############################################################
 
-all: rmlib $(PROGRAM1) $(PROGRAM2) $(SOLIB)
+all: rmlib $(PROGRAMS) $(SOLIB)
 
-$(PROGRAM1): $(MARS_LIBB) $(OBJS1) $(OBJS) MCint.o 
-	@echo " Linking $(PROGRAM1) ..." 
-	$(CXX) $(CXXFLAGS) $(OBJS1) $(OBJS) $(MARS_LIB) MCint.o $(ROOTLIBS) $(ROOTGLIBS) -o $@
- 
-$(PROGRAM2): $(MARS_LIBB) $(OBJS2) $(OBJS) MCint.o 
-	@echo " Linking $(PROGRAM2) ..." 
-	$(CXX) $(CXXFLAGS) $(OBJS2) $(OBJS) $(MARS_LIB) MCint.o $(ROOTLIBS) $(ROOTGLIBS) -o $@
-        
+# Use $(CXX) -v ... for a more verbose output
+$(PROGRAMS): $(MARS_LIBB) $(PROGRAMS:=.o) $(OBJS) MCint.o 
+	@echo " Linking $@ ..." 
+	$(CXX) $(CXXFLAGS) $@.o $(OBJS) $(MARS_LIB) MCint.o $(ROOTGLIBS) -o $@
+
 $(SOLIB): $(MARS_LIBB) $(OBJS) MCint.o
 	@echo " Linking $(SOLIB) ..."
@@ -79,7 +75,11 @@
 	(cd mraw; make; cd ..; mv mraw/libmraw.a lib) 
 
-libmocttest.a:
-	@echo " Creating libmocttest.a:"
-	(cd mocttest; make; cd .., mv mocttest/libmocttest.a lib) 
+libmgui.a:
+	@echo " Creating libmgui.a:"
+	(cd mgui; make; cd ..; mv mgui/libmgui.a lib) 
+
+libmdatacheck.a:
+	@echo " Creating libmdatacheck.a:"
+	(cd mdatacheck; make; cd ..; mv mdatacheck/libmdatacheck.a lib) 
         
 dox: