Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 2262)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 2263)
@@ -1,3 +1,31 @@
                                                  -*-*- END OF LINE -*-*-
+
+ 2003/07/06: Thomas Bretz
+ 
+   * Makefile:
+     - replaced '-shared' by $(DYNLIB)
+     
+   * Makefile.conf.linux, Makefile.conf.linux-gnu,
+     Makefile.conf.osf1, Makefile.conf.osf5.1:
+     - added DYNLIB
+     
+   * Makefile.conf.darwin:
+     - added
+   
+   * mgui/MCamEvent.cc:
+     - removed obsolete include
+     
+   * mgui/Makefile:
+     - removed obsolete include dirs
+     
+   * mhist/MHCamera.cc:
+     - fixes for root 3.05/01
+     
+   * mraw/MRawEvtData.cc:
+     - added type 1 and 2 to GetPixContent
+     
+   * mraw/MRawEvtPixelIter.[h,cc]:
+     - added GetMax[Hi,Lo]GainSample
+
 
 
@@ -9,4 +37,5 @@
    * mhistmc/MHMcEnergyMigration.cc
      - swap first 2 arguments of fHist.Fill and fHist2.Fill
+
 
 
@@ -19,4 +48,5 @@
    * macros/CT1collarea.C
      - Changed binning in theta to include high ZAs
+
 
 
Index: /trunk/MagicSoft/Mars/Makefile
===================================================================
--- /trunk/MagicSoft/Mars/Makefile	(revision 2262)
+++ /trunk/MagicSoft/Mars/Makefile	(revision 2263)
@@ -81,5 +81,5 @@
 $(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS) MCint.o
 	@echo " Linking $(SOLIB) ..."
-	$(CXX) -shared $(CXXFLAGS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
+	$(CXX) $(DYNLIB) $(CXXFLAGS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
 	mv mars.so lib
 
Index: /trunk/MagicSoft/Mars/Makefile.conf.darwin
===================================================================
--- /trunk/MagicSoft/Mars/Makefile.conf.darwin	(revision 2263)
+++ /trunk/MagicSoft/Mars/Makefile.conf.darwin	(revision 2263)
@@ -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/Mars/Makefile.conf.linux
===================================================================
--- /trunk/MagicSoft/Mars/Makefile.conf.linux	(revision 2262)
+++ /trunk/MagicSoft/Mars/Makefile.conf.linux	(revision 2263)
@@ -24,4 +24,5 @@
 DEBUG    = 
 ARCHDEF  = -D__LINUX__
+DYNLIB   = -shared
 
 # For debugging information use '-g'