Index: trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.darwin
===================================================================
--- trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.darwin	(revision 2344)
+++ trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.darwin	(revision 2344)
@@ -0,0 +1,41 @@
+##################################################################
+#
+# config.mk
+#
+# @file        config.mk
+# 
+##################################################################
+# @maintitle
+
+# @code
+
+# compilers
+
+CC       = gcc
+CXX      = g++
+F77      = f77
+AR       = ar -src
+
+#
+#  ----->>>   settings for compilation
+#
+OPTIM    = -O5 -Wall -fno-exceptions -fPIC -Wpointer-arith -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Woverloaded-virtual
+# ggc 3.2: removed -fnonnull-objects -Wtraditional -Wnested-externs
+DEBUG    = 
+ARCHDEF  = -D__LINUX__
+DYNLIB   = -dynamiclib
+
+# For debugging information use '-g'
+# For producing gmon.out use    '-pg'
+
+MARS_LIB = -Llib $(SUBDIRS:%=-l%) $(MARSLIBS)
+INCLUDES = -I. $(SUBDIRS:%=-I%)
+
+# uncomment this for quiet compilation
+
+.SILENT:
+
+# @endcode
+##EOF
+
+
Index: trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.general
===================================================================
--- trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.general	(revision 2343)
+++ trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.general	(revision 2344)
@@ -4,6 +4,6 @@
 
 ROOTVER    =  `root-config --version`
-ROOTLIBS   =  `root-config --libs`
-ROOTGLIBS  =  `root-config --glibs`
+ROOTLIBS   =  `root-config --libs` -lMinuit -lHistPainter
+ROOTGLIBS  =  `root-config --glibs` -lMinuit -lHistPainter
 ROOTCFLAGS =  `root-config --cflags`
 
@@ -12,8 +12,14 @@
 #
 
-DEFINES	  = -DROOTVER=\"$(ROOTVER)\" $(ARCHDEF)
+#
+# 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__ -DROOTVER=\"$(ROOTVER)\" $(ARCHDEF) $(MARSDEFINES)
 
 CXXFLAGS  = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) $(DEFINES)
-CFLAGS    = $(CXXFLAGS)
+CFLAGS    = $(CXXFLAGS) $(MARSFLAGS)
 FFLAGS    = $(CXXFLAGS)
 
Index: trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.linux
===================================================================
--- trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.linux	(revision 2343)
+++ trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.linux	(revision 2344)
@@ -20,12 +20,14 @@
 #  ----->>>   settings for compilation
 #
-OPTIM    = -O3 -Wall -fno-rtti -fnonnull-objects -fno-exceptions -fPIC -Wtraditional -Wpointer-arith -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Woverloaded-virtual
-DEBUG    =
+OPTIM    = -O5 -Wall -fno-exceptions -fPIC -Wpointer-arith -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Woverloaded-virtual
+# ggc 3.2: removed -fnonnull-objects -Wtraditional -Wnested-externs
+DEBUG    = 
 ARCHDEF  = -D__LINUX__
+DYNLIB   = -shared
 
 # For debugging information use '-g'
 # For producing gmon.out use    '-pg'
 
-MARS_LIB = -Llib $(SUBDIRS:%=-l%)
+MARS_LIB = -Llib $(SUBDIRS:%=-l%) $(MARSLIBS)
 INCLUDES = -I. $(SUBDIRS:%=-I%)
 
Index: trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.linux-gnu
===================================================================
--- trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.linux-gnu	(revision 2344)
+++ trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.linux-gnu	(revision 2344)
@@ -0,0 +1,44 @@
+##################################################################
+#
+# config.mk
+#
+# @file        config.mk
+# 
+##################################################################
+# @maintitle
+
+# @code
+
+# compilers
+
+CC       = gcc
+CXX      = g++
+F77      = f77
+AR       = ar -rc
+#
+#  ----->>>   settings for compilation
+#
+
+OPTIM    = -O5 -Wall -fno-rtti -fnonnull-objects -fno-exceptions -fPIC -Wtraditional -Wpointer-arith -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Woverloaded-virtual
+DEBUG    =
+ARCHDEF  = -D__LINUX__
+DYNLIB   = -shared
+
+# To be tested:
+# OPTIM    = -pipe  
+# OPTIM2   = -fomit-frame-pointer -ffast-math -march=i686 -mcpu=i686
+
+# For debugging information use '-g'
+# For producing gmon.out use    '-pg'
+
+MARS_LIB = -Llib $(SUBDIRS:%=-l%)  $(MARSLIBS)
+INCLUDES = -I. $(SUBDIRS:%=-I%)
+
+# uncomment this for quiet compilation
+
+.SILENT:
+
+# @endcode
+##EOF
+
+
Index: trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.osf1
===================================================================
--- trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.osf1	(revision 2343)
+++ trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.osf1	(revision 2344)
@@ -23,9 +23,10 @@
 #
 
-OPTIM    = -O2 -ieee -arch host
+OPTIM    = -O2 -ieee -arch host -lpthread
 DEBUG    = -g  -w0 -msg_display_tag -msg_disable castqualtyp,undpreid,unrfunprm,extrasemi,intconlosbit,nonfundec,partovrd,stoclsnotfirst,boolexprconst
-ARCHDEF  = -D__OSF__
+ARCHDEF  = -D__OSF__ -D__USE_STD_IOSTREAM -DR__ANSISTREAM
+DYNLIB   = -shared
 
-MARS_LIB = -Llib $(SUBDIRS/*/-l&)
+MARS_LIB = -Llib $(SUBDIRS/*/-l&)  $(MARSLIBS)
 INCLUDES = -I. $(SUBDIRS/*/-I&)
 
@@ -38,2 +39,3 @@
 
 
+
Index: trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.osf5.1
===================================================================
--- trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.osf5.1	(revision 2344)
+++ trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.osf5.1	(revision 2344)
@@ -0,0 +1,40 @@
+##################################################################
+#
+# config.mk
+#
+# @file        config.mk
+# 
+##################################################################
+# @maintitle
+
+# @code
+
+#
+# compilers
+#
+
+CC       = cc
+CXX      = cxx
+F77      = f77
+AR       = ar -c -r
+
+#
+#  ----->>>   settings for compilation
+#
+
+OPTIM    = -O2 -ieee -arch host
+DEBUG    = -g3  -w0 -msg_display_tag -msg_disable castqualtyp,undpreid,unrfunprm,extrasemi,intconlosbit,nonfundec,partovrd,stoclsnotfirst,boolexprconst
+ARCHDEF  = -D__OSF__ -D__USE_STD_IOSTREAM -DR__ANSISTREAM
+DYNLIB   = -shared
+
+MARS_LIB = -Llib $(SUBDIRS/*/-l&)  $(MARSLIBS)
+INCLUDES = -I. $(SUBDIRS/*/-I&)
+
+# uncomment this for quiet compilation
+
+.SILENT:
+
+# @endcode
+##EOF
+
+
Index: trunk/MagicSoft/Simulation/Detector/Camera/Makefile.rules
===================================================================
--- trunk/MagicSoft/Simulation/Detector/Camera/Makefile.rules	(revision 2343)
+++ trunk/MagicSoft/Simulation/Detector/Camera/Makefile.rules	(revision 2344)
@@ -53,5 +53,5 @@
 rmbak:
 	@echo " Removing backup files..."
-	@rm -f *~ kk.kk *.bak
+	@rm -f *~ kk.kk *.bak .#* .*~
 
 rmbakmac:
@@ -61,8 +61,11 @@
 rmhtml:
 	@echo " Removing htmldoc-tree"
-	@rm -rf htmldoc
+	rm -rf htmldoc/examples
+	rm -rf htmldoc/src
+	ls htmldoc/* | grep "htmldoc/" | grep -v images | grep -v CVS | xargs rm -f
 
 cflags: 
 	@echo $(INCLUDES) $(CXXFLAGS)
 
-
+diff:
+	@cvs diff | grep -v "^? " > mars.diff