Changeset 574 for trunk/MagicSoft/Mars

Timestamp:

01/18/01 17:10:59 (24 years ago)

Author:

tbretz

Message:

see Mars/Changelog

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• Makefile (modified) (2 diffs)
• Makefile.conf.general (modified) (1 diff)
• Makefile.rules (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                -*-*- 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

trunk/MagicSoft/Mars/Makefile

@@ -35 +35 @@
 #  ----->>>   mars libraries
 #
-SUBDIRS = mgui mdatacheck mbase mraw
+SUBDIRS = mgui mdatacheck mbase mraw mmc
 
 LIBRARIES = $(SUBDIRS:=.a)
@@ -90 +90 @@
         @cd mdatacheck; make mrproper; cd ..
         @echo "cd .."
+        @echo "cd mmc"
+        @cd mmc; make mrproper; cd ..
+        @echo "cd .."
 
 

trunk/MagicSoft/Mars/Makefile.conf.general

@@ -11 +11 @@
 #
 
-CXXFLAGS  = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG)
+DEFINES   = -D__MARS__
+
+CXXFLAGS  = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) $(DEFINES)
 CFLAGS    = $(CXXFLAGS)
 FFLAGS    = $(CXXFLAGS)

trunk/MagicSoft/Mars/Makefile.rules

@@ -13 +13 @@
 
         $(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: