Index: trunk/MagicSoft/Cosy/Changelog
===================================================================
--- trunk/MagicSoft/Cosy/Changelog	(revision 8808)
+++ trunk/MagicSoft/Cosy/Changelog	(revision 8809)
@@ -1,3 +1,18 @@
                                                                   -*-*- END -*-*-
+
+ 2007/06/16 Thomas Bretz
+
+   * gui/MGMenu.[h,cc]:
+     - removed
+
+   * Makefile, Makefile.conf.general, Makefile.conf.linux,
+     Makefile.rules, caos/Makefile, catalog/Makefile,
+     devdrv/Makefile, gui/Makefile, main/Makefile,
+     slalib/Makefile, tcpip/Makefile, videodev/Makefile:
+     - changed all Makefiles to the Mars Makefile style for better
+       performance, maintanance and reliability
+     - some updates for future code
+
+
 
  2008/01/14 Thomas Bretz
Index: trunk/MagicSoft/Cosy/Makefile
===================================================================
--- trunk/MagicSoft/Cosy/Makefile	(revision 8808)
+++ trunk/MagicSoft/Cosy/Makefile	(revision 8809)
@@ -3,5 +3,5 @@
 #   makefile
 # 
-#   for the MARS software
+#   for the COSY software
 #
 ##################################################################
@@ -19,10 +19,10 @@
 
 #
-
-PROGRAMS = testse starg cosy bend
+PROGRAMS = cosy readcam
 SOLIB    = cosy.so
 CINT     = M
-INCLUDES = -I. -Imain  -Ibase -Icandrv -Iincl -Igui -Ivideodev -Icatalog -Idevdrv -Imars
-LIBS     = -lpng -lz -L/usr/X11R6/lib -lpthread libmars.so
+MARS_LIB = libmars.so
+
+INCLUDES = -I. -Imain -Imars -Ibase -Icandrv -Iincl -Ivideodev -Igui -Imvideo -Itcpip
 
 #
@@ -37,142 +37,96 @@
 #  ----->>>   mars libraries
 #
-SUBDIRS = \
-        main     \
-        tcpip    \
-        gui      \
-        catalog  \
-        videodev \
-	devdrv   \
-        candrv   \
-        caos     \
-	base     \
-        slalib
+SUBDIRS = base \
+	  candrv \
+	  caos \
+          catalog \
+          devdrv \
+          gui \
+          main \
+          slalib \
+          tcpip \
+          videodev \
+          mvideo
 
+#LIBRARIES = $(SUBDIRS:%=lib/lib%.a)
 LIBRARIES = $(SUBDIRS:=.a)
+CONDOR    = $(SUBDIRS:=.condor)
+MRPROPERS = $(SUBDIRS:=.mrproper)
+CLEANERS  = $(SUBDIRS:=.clean)
+LIBS      = $(SOLIB)
 
 #------------------------------------------------------------------------------
+.SUFFIXES: .c .cc .h .o .cxx .hxx .gch
 
-.SUFFIXES: .c .cc .h .o 
-
-SRCFILES =
-
-SRCS    = $(SRCFILES)
-HEADERS = $(SRCFILES:.cc=.h)
-OBJS    = $(SRCFILES:.cc=.o) 
+SRCFILES = 
 
 ############################################################
+all: $(SOLIB) $(PROGRAMS)
+	@echo " Done. "
+	@echo " "
 
-all: rmlib $(PROGRAMS) $(SOLIB)
-
-# Use $(CXX) -v ... for a more verbose output
-#
-# We could link mars.so instead of all libraries. This would need
-# some MBs less space on the HD. But this means, that the Shared
-# Library Path in your system must be set properly to be able to start
-# 'mars'
-#
-$(PROGRAMS): $(LIBRARIES) $(OBJS) $(HEADERS) $(PROGRAMS:=.o) 
-	@echo " Linking $@ ..." 
-	$(CXX) $(CXXFLAGS) $(LIBS) $(OBJS) $@.o  $(MARS_LIB) $(ROOTGLIBS) -o $@
-
-$(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS) 
-	@echo " Linking $(SOLIB) ..."
-	$(CXX) -shared $(CXXFLAGS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
-	mv cosy.so lib
-
-$(LIBRARIES):
-	@echo " "  
-	@echo " Creating lib$@:"
-	(cd $*; make -f Makefile; cd ..; mv $*/$@ lib/lib$@) 
-
-dox:
-	@echo " Creating html documentation:"
-	root -b -q dohtml.C
+static: LIBS=$(SUBDIRS:=/*.o) $(OBJS)
+#static: rmlib $(LIBRARIES) $(PROGRAMS)
+static: $(LIBRARIES) $(PROGRAMS)
+	@echo " Done. "
+	@echo " "
 
 include Makefile.rules
 
-clean:	rmlib rmcint rmobjs rmcore rmbin
+#
+# Use $(CXX) -v ... for a more verbose output
+#
+$(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS) $(MARS_LIB)
+	@echo " Linking shared object $(SOLIB) ..."
+	$(CXX) $(CXXFLAGS) $(SOFLAG) $(OBJS) $(MARS_LIB) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
 
-mrproper:	clean rmbak
-	@rm -f macros/*~
-	@rm -rf htmldoc
-	@echo "cd base"
-	@cd base; make mrproper; cd ..
-	@echo "cd .."
-	@echo "cd caos"
-	@cd caos; make mrproper; cd ..
-	@echo "cd .."
-	@echo "cd candrv"
-	@cd candrv; make mrproper; cd ..
-	@echo "cd .."
-	@echo "cd devdrv"
-	@cd devdrv; make mrproper; cd ..
-	@echo "cd .."
-	@echo "cd gui"
-	@cd gui; make mrproper; cd ..
-	@echo "cd .."
-	@echo "cd videodev"
-	@cd videodev; make mrproper; cd ..
-	@echo "cd .."
-	@echo "cd tcpip"
-	@cd tcpip; make mrproper; cd ..
-	@echo "cd .."
-	@echo "cd catalog"
-	@cd catalog; make mrproper; cd ..
-	@echo "cd .."
-	@echo "cd main"
-	@cd main; make mrproper; cd ..
-	@echo "cd .."
+$(PROGRAMS): $(PROGRAMS:=.o) $(SOLIB)
+	@echo " Linking $@ ..." 
+	$(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(SOLIB) $@.o -o $@
+
+rmcondor:
+	rm -f .makecondor.log
+
+condor:	rmcondor $(CONDOR)
+	echo Waiting for jobs to finish...
+	condor_wait .makecondor.log
+	rm .makecondor.log
+	make -j2 $(PROGRAMS)
+#	find -name "*/.makecondor.*"
+#	find -maxdepth 2 -name ".makecondor.*" -exec echo {}\\\; cat {}\\\; echo {}\\\; \;
+
+dox: $(SOLIB)
+	@echo
+	@echo " Creating html documentation and logfile dohtml.log..."
+	rm -f dohtml.log
+	root -b -q dohtml.C 2>&1 >> dohtml.log | tee -a dohtml.log
+	@echo " done."
+	@echo
 
 links:
-	@ln -sf /home/caos/March06/Mars/*/*.h mars
-	@ln -sf /home/caos/March06/Mars/libmars.so
+	mkdir -p mars
+	cd mars; ln -sf ../../Mars/*/*.h .
+	ln -sf ../Mars/libmars.so .
 
-magic:
-	@ln -sf bending_magic.txt bending.txt
-	@ln -sf prepos_magic.txt prepos.txt
-	@ln -sf .cosyrc_magic .cosyrc
 
-model:
-	@ln -sf bending_model.txt bending.txt
-	@ln -sf prepos_model.txt prepos.txt
-	@ln -sf .cosyrc_model .cosyrc
+#clean:	rmcint rmobjs rmdep rmcore rmlib
+
+mrproper:	$(MRPROPERS) rmbin rmbak rmbakmac clean
+	@echo " Done."
+	@echo " "
 
 tar:	mrproper
 	@echo "Making tar-file"
-	@tar -cvf ../cosy.tar *
-	@gzip -9 ../cosy.tar
+	root -b -q -l -n tar.C
+#	@tar cvf ../mars.tar --exclude=Root .rootrc *
+#	@gzip -9 ../mars.tar
 
-install:
-	@echo Installing cosy to ~stesy/Cosy
-	@echo Copy 'cosy'
-	@chmod u+w /home/stesy/Cosy/cosy
-	@cp cosy /home/stesy/Cosy/
-	@chmod a-w /home/stesy/Cosy/cosy
-	@echo Copy cosy resources '.cosyrc'
-	@chmod u+w /home/stesy/Cosy/.cosyrc
-	@cp .cosyrc /home/stesy/Cosy/
-	@chmod a-w /home/stesy/Cosy/.cosyrc
-	@echo Copy bending model 'bending.txt'
-	@chmod u+w /home/stesy/Cosy/bending.txt
-	@cp bending.txt /home/stesy/Cosy
-	@chmod a-w /home/stesy/Cosy/bending.txt
-	@echo Copy LED offsets 'leds.txt'
-	@chmod u+w /home/stesy/Cosy/leds.txt
-	@cp leds.txt /home/stesy/Cosy/
-	@chmod a-w /home/stesy/Cosy/leds.txt
-	@echo Copy predefined positions 'prepos.txt'
-	@chmod u+w /home/stesy/Cosy/prepos.txt
-	@cp prepos.txt /home/stesy/Cosy/
-	@chmod a-w /home/stesy/Cosy/prepos.txt
-	@echo Copy star catalog 'stars.txt'
-	@chmod u+w /home/stesy/Cosy/stars.txt
-	@cp stars.txt /home/stesy/Cosy/
-	@chmod a-w /home/stesy/Cosy/stars.txt
-	@echo Copy PPM catalog
-	@chmod u+w /home/stesy/Cosy/ppm9.bin
-	@cp ppm9.bin /home/stesy/Cosy/
-	@chmod a-w /home/stesy/Cosy/ppm9.bin
-	@echo finished...
+#Makefile.depend:
+#	(! find ./ Makefile.depend -maxdepth 1 -empty 2> /dev/null && \
+#	echo " Generating dependancies into 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
+#
+#depend:	Makefile.depend	
 
 # @endcode
Index: trunk/MagicSoft/Cosy/Makefile.conf.general
===================================================================
--- trunk/MagicSoft/Cosy/Makefile.conf.general	(revision 8808)
+++ 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
Index: trunk/MagicSoft/Cosy/Makefile.conf.linux
===================================================================
--- trunk/MagicSoft/Cosy/Makefile.conf.linux	(revision 8808)
+++ trunk/MagicSoft/Cosy/Makefile.conf.linux	(revision 8809)
@@ -6,31 +6,32 @@
 # 
 ##################################################################
-# @maintitle
-
-# @code
 
 # compilers
 
-CC  = gcc
-CXX = g++
-F77 = f77
-AR  = ar -rc
+CC       = gcc
+CXX      = g++
+F77      = f77
+AR       = ar -rc
+
 #
 #  ----->>>   settings for compilation
 #
+OPTIM    = -O5 -Wall -fno-exceptions -fPIC -Wpointer-arith -Wcast-align -Wconversion
+OPTIMC   = $(OPTIM) -pedantic
+OPTIMCXX = $(OPTIM) -Woverloaded-virtual
+# ggc 3.2: removed -fnonnull-objects -Wtraditional -Wnested-externs
+# -ftime-report -fmem-report
+DEBUG    =
+ARCHDEF  = -D__LINUX__
+SOFLAG   = -shared
 
-#-O2
-OPTIM = -O5 -Wall -fno-exceptions -fPIC -Wpointer-arith -Wcast-align -Wwrite-strings -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Woverloaded-virtual -D_REENTRANT 
-DEBUG = -g
+# For debugging information use '-g'
+# For producing gmon.out use    '-pg' (needs static linking)
 
-MARS_LIB = -Llib $(SUBDIRS:%=-l%) -lX11 -lXpm
-INCLUDES = -I. $(SUBDIRS:%=-I%)
+#MARS_LIB = -Llib $(SUBDIRS:%=-l%) $(MARSLIBS)
+#MARS_LIB = -Llib $(MARSLIBS) -lmimic $(GLIBLIBS)
+INCLUDES = -I. $(SUBDIRS:%=-I%) -I/usr/local/include
 
 # uncomment this for quiet compilation
 
 .SILENT:
-
-# @endcode
-##EOF
-
-
Index: trunk/MagicSoft/Cosy/Makefile.rules
===================================================================
--- trunk/MagicSoft/Cosy/Makefile.rules	(revision 8808)
+++ trunk/MagicSoft/Cosy/Makefile.rules	(revision 8809)
@@ -1,29 +1,58 @@
+include $(CINT)Dep.d
 
-depend:
-	@makedepend $(SRCS) $(INCLUDES) -I$(INCLUDE_CPLUS) $(ROOTCFLAGS) \
-        -f Makefile.depend 2> kk.kk ; cat kk.kk
+$(MRPROPERS):
+	@echo " Doing Mr.Proper in $(@:.mrproper=)"
+	(cd $(@:.mrproper=); ($(MAKE) -f Makefile mrproper > /dev/null); cd ..;) 
 
-$(LIB): $(HEADERS) $(CINT)Cint.o $(OBJS) 
-	@echo " - Building Library lib$(LIB) ... "
-	$(AR) $(LIB) *.o
+$(CONDOR):
+	@echo " Starting make in $(@:.condor=) via condor"
+	(echo universe=vanilla; \
+         echo executable=/bin/bash; \
+         echo arguments=-c make; \
+         echo log=../.makecondor.log;    \
+         echo initialdir=$(@:.condor=); \
+         echo getenv=true;     \
+         echo notification=never; \
+         echo queue) | condor_submit > /dev/null
+#	(cd $(@:.condor=); (condor_run $(MAKE) &); cd ..;)
+#         echo output=.makecondor.out; \
+#         echo error=.makecondor.err;  \
 
-$(CINT)Cint.cc: $(CINTHEADERS) 
-	@echo 
-	@echo " - Generating dictionary $(CINT)Cint.cc ..."
+$(CLEANERS):
+	@echo "Cleaning $(@:.clean=):"
+	(cd $(@:.clean=); $(MAKE) -f Makefile clean; cd ..;) 
 
+$(LIBRARIES):
+	@echo " Calling make in $(@:.a=)"
+	(cd $*; $(MAKE) -f Makefile all)
+
+$(LIB): $(OBJS) $(CINT)Cint.o
+	@echo " - Building Library $(LIB)"
+	$(CXX) $(CXXFLAGS) $(DYNLIB) $(OBJS) $(CINT)Cint.o -o $(LIB)
+	@echo " "
+
+$(CINT)Cint.cc: $(HEADERS) $(CINT)LinkDef.h
+	@echo " - Generating dictionary $(CINT)Cint.cc"
 	$(ROOTSYS)/bin/rootcint -f $(CINT)Cint.cc \
-	-c $(INCLUDES) $(DEFINES) $(CINTHEADERS) $(CINT)Incl.h $(CINT)LinkDef.h 
+	-c $(INCLUDES) $(DEFINES) $(HEADERS) $(CINT)Incl.h $(CINT)LinkDef.h 
 
-.cxx.o:	
-	@echo "Compiling " $<
+%.d:	
+	@echo " - Generating dependencies" $@
+	$(ROOTSYS)/bin/rmkdepend -f- -Y -w 3000 -- $(INCLUDES) -- $(SRCFILES) -- $(PROGRAMS:=.cc) 2> /dev/null | \
+         sed 's/^\(.*\).o:/$@ \1.o:/' > $@
+	echo "$@: Makefile" >> $@
+
+%.o:	%.cxx
+	@echo " - Compiling" $<
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
-.cc.o:	
-	@echo "Compiling " $<
+%.o:	%.cc
+	@echo " - Compiling" $<
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
-.c.o:	
-	@echo "Compiling " $<
+%.o:	 %.c
+	@echo " - Compiling" $<
 	$(CC) $(CFLAGS) -c $< -o $@
+
 #
 # The cleaning facility
@@ -31,29 +60,50 @@
 
 rmcint:	
-	@echo "Removing cint-stuff..."
+	@echo " Removing cint-stuff..."
 	@rm -f *Cint.*
 
 rmlib:	
-	@echo "Removing libraries..."
-	@rm -f lib/lib*.a  lib*.a
+	@echo " Removing libraries..."
+	@echo " "
+	@rm -f lib/lib*.a lib*.a
 
 rmobjs:	
-	@echo "Removing object files..."
+	@echo " Removing object files..."
 	@rm -f *.o
 
+rmdep:	
+	@echo " Removing dependency files..."
+	@rm -f *Dep.d */*Dep.d
+
 rmcore:	
-	@echo "Removing core files..."
+	@echo " Removing core files..."
 	@rm -f core*
 
 rmbin:	
-	@echo "Removing binary files..."
-	@rm -f $(PROGRAMS) so_locations
+	@echo " Removing binary files..."
+	@rm -f $(PROGRAMS) $(SOLIB) $(DYLIB) so_locations
 
 rmbak:
-	@echo "Removing backup files..."
-	@rm -f *~ kk.kk *.bak
+	@echo " Removing backup files..."
+	@rm -f *~ kk.kk *.bak .#* .*~
+
+rmbakmac:
+	@echo " Removing backup files in macros"
+	@rm -f macros/*~
+
+rmhtml:
+	@echo " Removing htmldoc-tree"
+	rm -rf htmldoc/examples
+	rm -rf htmldoc/src
+	ls htmldoc/* | grep "htmldoc/" | grep -v images | grep -v CVS | xargs rm -f
+
+clean:	rmcint rmobjs rmdep rmcore rmlib
 
 cflags: 
 	@echo $(INCLUDES) $(CXXFLAGS)
 
+diff:
+	@cvs diff | grep -v "^? " > cosy.diff
 
+zdiff:
+	@cvs -z9 diff | grep -v "^? " > cosy.diff
Index: trunk/MagicSoft/Cosy/base/Makefile
===================================================================
--- trunk/MagicSoft/Cosy/base/Makefile	(revision 8808)
+++ trunk/MagicSoft/Cosy/base/Makefile	(revision 8809)
@@ -6,28 +6,13 @@
 #
 ##################################################################
-# @maintitle
 
-# @code
-
-#
-#  please change all system depend values in the 
-#  config.mk.${OSTYPE} file 
-#
-#
 include ../Makefile.conf.$(OSTYPE)
 include ../Makefile.conf.general
 
-# @endcode 
-
 INCLUDES = -I. -I..
 
-# @code 
-
 CINT     = Base
-LIB      = base.a
 
 #------------------------------------------------------------------------------
-
-.SUFFIXES: .c .cc .cxx .h .hxx .o 
 
 SRCFILES = MStopwatch.cc \
@@ -38,20 +23,9 @@
            msgqueue.cc
            
-CINTHEADERS = MStar.h
-	      
-SRCS    = $(SRCFILES)
-HEADERS = $(SRCFILES:.cc=.h)
-OBJS    = $(SRCFILES:.cc=.o) 
-
 ############################################################
 
-all: $(LIB)
+all: $(OBJS)
 
 include ../Makefile.rules
 
-clean:	rmlib rmcint rmobjs rmcore
-
 mrproper:	clean rmbak
-
-# @endcode
-
Index: trunk/MagicSoft/Cosy/candrv/Makefile
===================================================================
--- trunk/MagicSoft/Cosy/candrv/Makefile	(revision 8808)
+++ trunk/MagicSoft/Cosy/candrv/Makefile	(revision 8809)
@@ -6,28 +6,13 @@
 #
 ##################################################################
-# @maintitle
 
-# @code
-
-#
-#  please change all system depend values in the 
-#  config.mk.${OSTYPE} file 
-#
-#
 include ../Makefile.conf.$(OSTYPE)
 include ../Makefile.conf.general
 
-# @endcode 
-
-INCLUDES = -I. -I.. -I../incl -I../base -I../mars
-
-# @code 
+INCLUDES = -I. -I.. -I../incl -I../base -I../mars -I../tcpip
 
 CINT     = Candrv
-LIB      = candrv.a
 
 #------------------------------------------------------------------------------
-
-.SUFFIXES: .c .cc .cxx .h .hxx .o 
 
 SRCFILES = nodedrv.cc \
@@ -35,21 +20,13 @@
 	   sdolist.cc \
 	   canopen.cc \
-	   network.cc
-
-SRCS    = $(SRCFILES)
-HEADERS = $(SRCFILES:.cc=.h)
-OBJS    = $(SRCFILES:.cc=.o) 
-CINTHEADERS = $(HEADERS)
+	   network.cc \
+           ethernet.cc \
+           interface.cc
 
 ############################################################
 
-all: $(LIB)
+all: $(OBJS)
 
 include ../Makefile.rules
 
-clean:	rmlib rmcint rmobjs rmcore
-
 mrproper:	clean rmbak
-
-# @endcode
-
Index: trunk/MagicSoft/Cosy/caos/Makefile
===================================================================
--- trunk/MagicSoft/Cosy/caos/Makefile	(revision 8808)
+++ trunk/MagicSoft/Cosy/caos/Makefile	(revision 8809)
@@ -6,29 +6,13 @@
 #
 ##################################################################
-# @maintitle
 
-# @code
-
-#
-#  please change all system depend values in the 
-#  config.mk.${OSTYPE} file 
-#
-#
 include ../Makefile.conf.$(OSTYPE)
 include ../Makefile.conf.general
 
-# @endcode 
-
 INCLUDES = -I. -I.. -I../base -I../mars
-#base: MString
-
-# @code 
 
 CINT     = Caos
-LIB      = caos.a
 
 #------------------------------------------------------------------------------
-
-.SUFFIXES: .c .cc .cxx .h .hxx .o 
 
 SRCFILES = Led.cc \
@@ -37,19 +21,9 @@
            Rings.cc
 
-SRCS        = $(SRCFILES)
-HEADERS     = $(SRCFILES:.cc=.h)
-OBJS        = $(SRCFILES:.cc=.o) 
-CINTHEADERS = $(HEADERS)
-
 ############################################################
 
-all: $(LIB)
+all: $(OBJS)
 
 include ../Makefile.rules
 
-clean:	rmlib rmcint rmobjs rmcore
-
 mrproper:	clean rmbak
-
-# @endcode
-
Index: trunk/MagicSoft/Cosy/catalog/Makefile
===================================================================
--- trunk/MagicSoft/Cosy/catalog/Makefile	(revision 8808)
+++ trunk/MagicSoft/Cosy/catalog/Makefile	(revision 8809)
@@ -6,28 +6,13 @@
 #
 ##################################################################
-# @maintitle
 
-# @code
-
-#
-#  please change all system depend values in the 
-#  config.mk.${OSTYPE} file 
-#
-#
 include ../Makefile.conf.$(OSTYPE)
 include ../Makefile.conf.general
 
-# @endcode 
-
 INCLUDES = -I. -I.. -I../base -I../slalib -I../mars
 
-# @code 
-
 CINT = Catalog
-LIB  = catalog.a
 
 #------------------------------------------------------------------------------
-
-.SUFFIXES: .c .cc .cxx .h .hxx .o 
 
 SRCFILES = Slalib.cc \
@@ -36,19 +21,9 @@
 	   StarCatalog.cc
 
-SRCS        = $(SRCFILES)
-HEADERS     = $(SRCFILES:.cc=.h)
-OBJS        = $(SRCFILES:.cc=.o) 
-CINTHEADERS = $(HEADERS)
-
 ############################################################
 
-all: $(LIB)
+all: $(OBJS)
 
 include ../Makefile.rules
 
-clean:	rmlib rmcint rmobjs rmcore
-
 mrproper:	clean rmbak
-
-# @endcode
-
Index: trunk/MagicSoft/Cosy/devdrv/Makefile
===================================================================
--- trunk/MagicSoft/Cosy/devdrv/Makefile	(revision 8808)
+++ trunk/MagicSoft/Cosy/devdrv/Makefile	(revision 8809)
@@ -6,47 +6,22 @@
 #
 ##################################################################
-# @maintitle
 
-# @code
-
-#
-#  please change all system depend values in the 
-#  config.mk.${OSTYPE} file 
-#
-#
 include ../Makefile.conf.$(OSTYPE)
 include ../Makefile.conf.general
 
-# @endcode 
-
 DEFINES	 = -DCPU=486 -DBUS_LITTLE_ENDIAN -DDEBUG=0 -DLINUX -DSHOW 
-INCLUDES = -I. -I.. -I../base -I../candrv -I../incl -I../mars
-
-# @code 
+INCLUDES = -I. -I.. -I../base -I../candrv -I../incl -I../mars -I../tcpip
 
 CINT     = Devdrv
-LIB      = devdrv.a
 
 #------------------------------------------------------------------------------
 
-.SUFFIXES: .c .cc .cxx .h .hxx .o 
-
 SRCFILES = shaftencoder.cc macs.cc
-
-SRCS        = $(SRCFILES)
-HEADERS     = $(SRCFILES:.cc=.h)
-OBJS        = $(SRCFILES:.cc=.o) 
-CINTHEADERS = $(HEADERS)
 
 ############################################################
 
-all: $(LIB)
+all: $(OBJS)
 
 include ../Makefile.rules
 
-clean:	rmlib rmcint rmobjs rmcore
-
 mrproper:	clean rmbak
-
-# @endcode
-
Index: trunk/MagicSoft/Cosy/gui/Makefile
===================================================================
--- trunk/MagicSoft/Cosy/gui/Makefile	(revision 8808)
+++ trunk/MagicSoft/Cosy/gui/Makefile	(revision 8809)
@@ -6,17 +6,7 @@
 #
 ##################################################################
-# @maintitle
 
-# @code
-
-#
-#  please change all system depend values in the 
-#  config.mk.${OSTYPE} file 
-#
-#
 include ../Makefile.conf.$(OSTYPE)
 include ../Makefile.conf.general
-
-# @endcode 
 
 INCLUDES = -I. -I.. -I../base -I../slalib -I../candrv -I../incl \
@@ -24,12 +14,7 @@
            -I../mars
 
-# @code 
-
 CINT     = Gui
-LIB      = gui.a
 
 #------------------------------------------------------------------------------
-
-.SUFFIXES: .c .cc .cxx .h .hxx .o 
 
 SRCFILES = MGCosy.cc \
@@ -43,19 +28,9 @@
 	   MGSkyPosition.cc
   
-SRCS        = $(SRCFILES)
-HEADERS     = $(SRCFILES:.cc=.h)
-OBJS        = $(SRCFILES:.cc=.o) 
-CINTHEADERS = $(HEADERS)
-
 ############################################################
 
-all: $(LIB)
+all: $(OBJS)
 
 include ../Makefile.rules
 
-clean:	rmlib rmcint rmobjs rmcore
-
 mrproper:	clean rmbak
-
-# @endcode
-
Index: trunk/MagicSoft/Cosy/main/Makefile
===================================================================
--- trunk/MagicSoft/Cosy/main/Makefile	(revision 8808)
+++ trunk/MagicSoft/Cosy/main/Makefile	(revision 8809)
@@ -6,17 +6,7 @@
 #
 ##################################################################
-# @maintitle
 
-# @code
-
-#
-#  please change all system depend values in the 
-#  config.mk.${OSTYPE} file 
-#
-#
 include ../Makefile.conf.$(OSTYPE)
 include ../Makefile.conf.general
-
-# @endcode 
 
 INCLUDES = -I. -I../base -I.. -I../gui -I../catalog -I../devdrv \
@@ -24,36 +14,20 @@
            -I../mars
 
-# @code 
-
 CINT     = Main
-LIB      = main.a
 
 #------------------------------------------------------------------------------
 
-.SUFFIXES: .c .cc .cxx .h .hxx .o 
-
-SRCFILES = MBending.cc \
-           MStarguider.cc \
+SRCFILES = MStarguider.cc \
            MStargHistograms.cc \
-           MPointing.cc \
+           MSlewing.cc \
            MTracking.cc \
            MCaos.cc \
 	   MCosy.cc
 
-SRCS        = $(SRCFILES)
-HEADERS     = $(SRCFILES:.cc=.h)
-OBJS        = $(SRCFILES:.cc=.o) 
-CINTHEADERS = $(HEADERS)
-
 ############################################################
 
-all: $(LIB)
+all: $(OBJS)
 
 include ../Makefile.rules
 
-clean:	rmlib rmcint rmobjs rmcore
-
 mrproper:	clean rmbak
-
-# @endcode
-
Index: trunk/MagicSoft/Cosy/tcpip/Makefile
===================================================================
--- trunk/MagicSoft/Cosy/tcpip/Makefile	(revision 8808)
+++ trunk/MagicSoft/Cosy/tcpip/Makefile	(revision 8809)
@@ -6,28 +6,13 @@
 #
 ##################################################################
-# @maintitle
 
-# @code
-
-#
-#  please change all system depend values in the 
-#  config.mk.${OSTYPE} file 
-#
-#
 include ../Makefile.conf.$(OSTYPE)
 include ../Makefile.conf.general
 
-# @endcode 
-
 INCLUDES = -I. -I../base -I../catalog -I../main -I../candrv -I../incl -I../caos -I../mars
 
-# @code 
-
 CINT     = TcpIp
-LIB      = tcpip.a
 
 #------------------------------------------------------------------------------
-
-.SUFFIXES: .c .cc .cxx .h .hxx .o 
 
 SRCFILES = MTcpIpIO.cc \
@@ -35,19 +20,9 @@
            MDriveCom.cc
 
-SRCS        = $(SRCFILES)
-HEADERS     = $(SRCFILES:.cc=.h)
-OBJS        = $(SRCFILES:.cc=.o) 
-CINTHEADERS = $(HEADERS)
-
 ############################################################
 
-all: $(LIB)
+all: $(OBJS)
 
 include ../Makefile.rules
 
-clean:	rmlib rmcint rmobjs rmcore
-
 mrproper:	clean rmbak
-
-# @endcode
-
Index: trunk/MagicSoft/Cosy/videodev/CaosFilter.h
===================================================================
--- trunk/MagicSoft/Cosy/videodev/CaosFilter.h	(revision 8808)
+++ trunk/MagicSoft/Cosy/videodev/CaosFilter.h	(revision 8809)
@@ -39,6 +39,7 @@
     static int   FilterLeds(float *xw, float *yw, float *xl, float *yl);
 
+public:
+    virtual ~CaosFilter() { }
 
-public:
     static void Execute(byte *img, float *xw, float *yw, float *xl, float *yl,
                         float &prx, float &pry, float &pr, float *v, float *w);
Index: trunk/MagicSoft/Cosy/videodev/Makefile
===================================================================
--- trunk/MagicSoft/Cosy/videodev/Makefile	(revision 8808)
+++ trunk/MagicSoft/Cosy/videodev/Makefile	(revision 8809)
@@ -6,28 +6,13 @@
 #
 ##################################################################
-# @maintitle
 
-# @code
-
-#
-#  please change all system depend values in the 
-#  config.mk.${OSTYPE} file 
-#
-#
 include ../Makefile.conf.$(OSTYPE)
 include ../Makefile.conf.general
 
-# @endcode 
-
-INCLUDES = -I. -I.. -I../incl -I../base -I../caos -I/usr/X11R6/include -I../mars
-
-# @code 
+INCLUDES = -I. -I.. -I../incl -I../base -I../caos -I/usr/X11R6/include -I../mars -I../mvideo
 
 CINT     = Videodev
-LIB      = videodev.a
 
 #------------------------------------------------------------------------------
-
-.SUFFIXES: .c .cc .cxx .h .hxx .o 
 
 SRCFILES = Camera.cc \
@@ -38,19 +23,9 @@
            Writer.cc 
 
-SRCS        = $(SRCFILES)
-HEADERS     = $(SRCFILES:.cc=.h)
-OBJS        = $(SRCFILES:.cc=.o) 
-CINTHEADERS = $(HEADERS)
-
 ############################################################
 
-all: $(LIB)
+all: $(OBJS)
 
 include ../Makefile.rules
 
-clean:	rmlib rmcint rmobjs rmcore
-
 mrproper:	clean rmbak
-
-# @endcode
-