Changeset 8913 for trunk

Timestamp:

06/02/08 10:46:49 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• Makefile (modified) (5 diffs)
• NEWS (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -89 +89 @@
      - Use TString::Data() for second argument in TF1 constructor.
        Otherwise it is ambiguous in root 5.18
+
+   * Makefile:
+     - linking of the shared object is now done in /tmp
+     - replaced = by := where possible
 
 

trunk/MagicSoft/Mars/Makefile

@@ -20 +20 @@
 #
 #PROGRAMS = readraw merpp mars test mona status
-PROGRAMS = readdaq merpp readraw sinope callisto star ganymed sponde showlog showplot mars mars-config
-SOLIB    = libmars.so
+PROGRAMS := readdaq merpp readraw sinope callisto star ganymed sponde showlog showplot mars mars-config
+SOLIB    := libmars.so
+
 CINT     = M
 
@@ -35 +36 @@
 #  ----->>>   mars libraries
 #
-SUBDIRS = mbase \
+SUBDIRS := mbase \
           mastro \
           mmain \
@@ -74 +75 @@
 
 #LIBRARIES = $(SUBDIRS:%=lib/lib%.a)
-LIBRARIES = $(SUBDIRS:=.a)
-CONDOR    = $(SUBDIRS:=.condor)
-MRPROPERS = $(SUBDIRS:=.mrproper)
-CLEANERS  = $(SUBDIRS:=.clean)
-LIBS      = $(SOLIB)
+LIBRARIES := $(SUBDIRS:=.a)
+CONDOR    := $(SUBDIRS:=.condor)
+MRPROPERS := $(SUBDIRS:=.mrproper)
+CLEANERS  := $(SUBDIRS:=.clean)
+LIBS      := $(SOLIB)
 
 #------------------------------------------------------------------------------
@@ -86 +87 @@
 
 ############################################################
+RNDMNAME:=$(shell mktemp)
+
 all: $(SOLIB) $(PROGRAMS)
         @echo " Done. "
@@ -104 +107 @@
 $(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS)
         @echo " Linking shared object $(SOLIB) ..."
-        $(CXX) $(CXXFLAGS) $(SOFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
+        $(CXX) $(CXXFLAGS) $(SOFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o ${RNDMNAME}
+        mv ${RNDMNAME} $@
 
 # This is a special workaround to create the shared object (bundle, plugin)

trunk/MagicSoft/Mars/NEWS

@@ -44 +44 @@
    * the MFMagicCuts have a new option to allow a linear area cut (for
      special studies)
+
+   * The liniking of the shared object is now done into a file defined
+     by ´mktemp´. This should be a local file system which accelerates
+     liniking a lot.
+
+   * The code has been prepared for compilation with root 5.18/00d
 
  ;merpp