Index: trunk/MagicSoft/Cosy/Changelog
===================================================================
--- trunk/MagicSoft/Cosy/Changelog	(revision 9416)
+++ trunk/MagicSoft/Cosy/Changelog	(revision 9417)
@@ -1,4 +1,19 @@
                                                                   -*-*- END -*-*-
 
+ 2009/04/01 Thomas Bretz
+
+   * Makefile:
+     - changed the linking 
+
+   * base/Makefile:
+     - changed name of Base to CosyBase (trouble with the same naming
+       in Mars)
+
+   * gui/Makefile
+     - changed name of Gui to CosyGui (trouble with the same naming
+       in Mars)
+
+
+ 
  2009/01/14 Thomas Bretz
 
Index: trunk/MagicSoft/Cosy/Makefile
===================================================================
--- trunk/MagicSoft/Cosy/Makefile	(revision 9416)
+++ trunk/MagicSoft/Cosy/Makefile	(revision 9417)
@@ -78,11 +78,12 @@
 # Use $(CXX) -v ... for a more verbose output
 #
-$(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS) $(MARS_LIB)
+$(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS)
 	@echo " Linking shared object $(SOLIB) ..."
-	$(CXX) $(CXXFLAGS) $(SOFLAG) $(OBJS) $(MARS_LIB) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
+	$(CXX) $(CXXFLAGS) $(SOFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
 
-$(PROGRAMS): $(PROGRAMS:=.o) $(SOLIB)
+$(PROGRAMS): $(PROGRAMS:=.o) $(SOLIB) $(MARS_LIB)
 	@echo " Linking $@ ..." 
-	$(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(SOLIB) $@.o -o $@
+	$(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(SOLIB) $(MARS_LIB) $@.o -o $@
+#	$(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(SUBDIRS:=/*.o) ../Mars/*/*.o $@.o -o $@
 
 rmcondor:
Index: trunk/MagicSoft/Cosy/base/BaseIncl.h
===================================================================
--- trunk/MagicSoft/Cosy/base/BaseIncl.h	(revision 9416)
+++ 	(revision )
@@ -1,3 +1,0 @@
-#ifndef __CINT__
-
-#endif // __CINT__
Index: trunk/MagicSoft/Cosy/base/BaseLinkDef.h
===================================================================
--- trunk/MagicSoft/Cosy/base/BaseLinkDef.h	(revision 9416)
+++ 	(revision )
@@ -1,39 +1,0 @@
-#ifdef __CINT__
-
-#pragma link off all globals;
-#pragma link off all classes;
-#pragma link off all functions;
-
-//#pragma link C++ global gLog;
-//#pragma link C++ class MLog;
-//#pragma link C++ class MLogHtml;
-//#pragma link C++ class MArgs;
-#pragma link C++ class MStar+;
-//#pragma link C++ class MGMap+;
-//#pragma link C++ class MGList+;
-//#pragma link C++ class MParContainer+;
-
-//#pragma link C++ class MObservatory+;
-//#pragma link C++ class MVector3+;
-
-//#pragma link C++ class MString+;
-//#pragma link C++ class MAstro+;
-//#pragma link C++ class MAstroSky2Local+;
-//#pragma link C++ class MAstroCatalog+;
-//#pragma link C++ class MAstroCamera+;
-
-//#pragma link C++ class MGeomPix+;
-//#pragma link C++ class MGeomCam+;
-//#pragma link C++ class MGeomCamMagic+;
-//#pragma link C++ class MGeomMirror+;
-
-//#pragma link C++ class MHCamera+;
-//#pragma link C++ class MH+;
-//#pragma link C++ class MBinning+;
-//#pragma link C++ class MCamEvent+;
-//#pragma link C++ class MHexagon+;
-
-//#pragma link C++ class MTime+;
-//#pragma link C++ function operator<<(ostream&, MTime&);
-
-#endif
Index: trunk/MagicSoft/Cosy/base/CosyBaseDep.d
===================================================================
--- trunk/MagicSoft/Cosy/base/CosyBaseDep.d	(revision 9417)
+++ trunk/MagicSoft/Cosy/base/CosyBaseDep.d	(revision 9417)
@@ -0,0 +1,8 @@
+# DO NOT DELETE
+
+BaseDep.d MStopwatch.o: MStopwatch.h
+BaseDep.d MTimeout.o: MTimeout.h
+BaseDep.d MStar.o: MStar.h
+BaseDep.d MStarList.o: MStarList.h MStar.h
+BaseDep.d msgqueue.o: msgqueue.h ../mars/MThread.h
+BaseDep.d: Makefile
Index: trunk/MagicSoft/Cosy/base/Makefile
===================================================================
--- trunk/MagicSoft/Cosy/base/Makefile	(revision 9416)
+++ trunk/MagicSoft/Cosy/base/Makefile	(revision 9417)
@@ -12,5 +12,5 @@
 INCLUDES = -I. -I.. -I../mars
 
-CINT     = Base
+CINT     = CosyBase
 
 #------------------------------------------------------------------------------
Index: trunk/MagicSoft/Cosy/gui/Makefile
===================================================================
--- trunk/MagicSoft/Cosy/gui/Makefile	(revision 9416)
+++ trunk/MagicSoft/Cosy/gui/Makefile	(revision 9417)
@@ -14,5 +14,5 @@
            -I../mars
 
-CINT     = Gui
+CINT     = CosyGui
 
 #------------------------------------------------------------------------------