Index: trunk/MagicSoft/Cosy/Makefile.conf.general
===================================================================
--- trunk/MagicSoft/Cosy/Makefile.conf.general	(revision 7787)
+++ trunk/MagicSoft/Cosy/Makefile.conf.general	(revision 8809)
@@ -3,8 +3,10 @@
 #
 
-ROOTVER    =  `root-config --version`
-ROOTLIBS   =  `root-config --libs` -lThread -lGX11 -lHistPainter 
-ROOTGLIBS  =  `root-config --glibs` -lThread -lGX11 -lHistPainter 
+ROOTLIBS   =  `root-config --libs` -lASImage -lMinuit -lHistPainter -lThread
+ROOTGLIBS  =  `root-config --glibs` -lASImage -lMinuit -lHistPainter -lThread
 ROOTCFLAGS =  `root-config --cflags`
+
+GLIBFLAGS = `glib-config --cflags`
+GLIBLIBS  = `glib-config --libs`
 
 #
@@ -12,9 +14,19 @@
 #
 
-CANDEFS	  = -DCPU=486 -DBUS_LITTLE_ENDIAN -DDEBUG=0 -DLINUX -D__LINUX__ -DSHOW 
-DEFINES	  = -D__COSY__ -DMARSVER=\"Cosy\" -DROOTVER=\"$(ROOTVER)\" $(CANDEFS)
+#
+# You can use this flags to further costumize compilation:
+#   export MARSDEFINES="-DHAVE_DARKBACKGROUND -DHAVE_XPM"
+#   export MARSFLAGS=
+#   export MARSLIBS="-lX11 -lXpm -L/usr/X11R6/lib"
+#
+#DEFINES	 = -DMARSVER=\"\<cvs\>\" -D__MARS__ $(ARCHDEF) $(MARSDEFINES)
 
-CXXFLAGS  = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) $(DEFINES)
-CFLAGS    = $(CXXFLAGS)
-FFLAGS    = $(CXXFLAGS)
+CANDEFS = -DCPU=486 -DBUS_LITTLE_ENDIAN -DDEBUG=0 -DLINUX -D__LINUX__ -DSHOW
+DEFINES = -D__COSY__ -DMARSVER=\"Cosy\" -DROOTVER=\"$(ROOTVER)\" $(CANDEFS) $(ARCHDEF)
 
+CXXFLAGS = $(DEBUG) $(OPTIMCXX) $(ROOTCFLAGS) $(INCLUDES) $(DEFINES) $(GLIBFLAGS)
+CFLAGS   = $(DEBUG) $(OPTIMC) 
+FFLAGS   = $(CXXFLAGS)
+
+HEADERS  = $(subst .cxx,.hxx,$(subst .cc,.h,$(SRCFILES)))
+OBJS     = $(subst .c,.o, $(subst .cxx,.o,  $(subst .cc,.o,$(SRCFILES)))) $(CINT)Cint.o