Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 571)
+++ trunk/MagicSoft/Mars/Changelog	(revision 574)
@@ -1,3 +1,28 @@
                                                                -*-*- END -*-*-
+ 2000/01/18: Thomas Bretz
+ 
+ * Makefile:
+    - mmc-library added
+ 
+ * Makefile.conf.general:
+    - Added definition of __MARS__
+    
+ * Makefile.rules:
+    - Added definitions to rootcint
+ 
+ * Oscar added the McFormat subdir of the Monte Carlo as mmc
+ 
+ * mmc/MMcEvt.h:
+    - renamed to MMcEvt.hxx
+ 
+ * mmc/*.hxx:
+    - added necessary defintions from MDefineTrigger.h
+ 
+ * mmc/Makefile, mmc/McLinkDef.h, mmc/McIncl.h, mmc/readme.txt:
+    - added
+    
+ * mmc/LinkDef.h:
+    - removed
+    
 
  2000/01/17: Thomas Bretz
Index: trunk/MagicSoft/Mars/Makefile
===================================================================
--- trunk/MagicSoft/Mars/Makefile	(revision 571)
+++ trunk/MagicSoft/Mars/Makefile	(revision 574)
@@ -35,5 +35,5 @@
 #  ----->>>   mars libraries
 #
-SUBDIRS = mgui mdatacheck mbase mraw
+SUBDIRS = mgui mdatacheck mbase mraw mmc
 
 LIBRARIES = $(SUBDIRS:=.a)
@@ -90,4 +90,7 @@
 	@cd mdatacheck; make mrproper; cd ..
 	@echo "cd .."
+	@echo "cd mmc"
+	@cd mmc; make mrproper; cd ..
+	@echo "cd .."
 
 
Index: trunk/MagicSoft/Mars/Makefile.conf.general
===================================================================
--- trunk/MagicSoft/Mars/Makefile.conf.general	(revision 571)
+++ trunk/MagicSoft/Mars/Makefile.conf.general	(revision 574)
@@ -11,5 +11,7 @@
 #
 
-CXXFLAGS  = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG)
+DEFINES	  = -D__MARS__
+
+CXXFLAGS  = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) $(DEFINES)
 CFLAGS    = $(CXXFLAGS)
 FFLAGS    = $(CXXFLAGS)
Index: trunk/MagicSoft/Mars/Makefile.rules
===================================================================
--- trunk/MagicSoft/Mars/Makefile.rules	(revision 571)
+++ trunk/MagicSoft/Mars/Makefile.rules	(revision 574)
@@ -13,5 +13,5 @@
 
 	$(ROOTSYS)/bin/rootcint -f $(CINT)Cint.cc \
-	-c $(INCLUDES) $(HEADERS) $(CINT)Incl.h $(CINT)LinkDef.h 
+	-c $(INCLUDES) $(DEFINES) $(HEADERS) $(CINT)Incl.h $(CINT)LinkDef.h 
 
 .cxx.o: