Changeset 8913 for trunk/MagicSoft/Mars


Ignore:
Timestamp:
06/02/08 10:46:49 (16 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Mars
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/MagicSoft/Mars/Changelog

    r8912 r8913  
    8989     - Use TString::Data() for second argument in TF1 constructor.
    9090       Otherwise it is ambiguous in root 5.18
     91
     92   * Makefile:
     93     - linking of the shared object is now done in /tmp
     94     - replaced = by := where possible
    9195
    9296
  • trunk/MagicSoft/Mars/Makefile

    r8615 r8913  
    2020#
    2121#PROGRAMS = readraw merpp mars test mona status
    22 PROGRAMS = readdaq merpp readraw sinope callisto star ganymed sponde showlog showplot mars mars-config
    23 SOLIB    = libmars.so
     22PROGRAMS := readdaq merpp readraw sinope callisto star ganymed sponde showlog showplot mars mars-config
     23SOLIB    := libmars.so
     24
    2425CINT     = M
    2526
     
    3536#  ----->>>   mars libraries
    3637#
    37 SUBDIRS = mbase \
     38SUBDIRS := mbase \
    3839          mastro \
    3940          mmain \
     
    7475
    7576#LIBRARIES = $(SUBDIRS:%=lib/lib%.a)
    76 LIBRARIES = $(SUBDIRS:=.a)
    77 CONDOR    = $(SUBDIRS:=.condor)
    78 MRPROPERS = $(SUBDIRS:=.mrproper)
    79 CLEANERS  = $(SUBDIRS:=.clean)
    80 LIBS      = $(SOLIB)
     77LIBRARIES := $(SUBDIRS:=.a)
     78CONDOR    := $(SUBDIRS:=.condor)
     79MRPROPERS := $(SUBDIRS:=.mrproper)
     80CLEANERS  := $(SUBDIRS:=.clean)
     81LIBS      := $(SOLIB)
    8182
    8283#------------------------------------------------------------------------------
     
    8687
    8788############################################################
     89RNDMNAME:=$(shell mktemp)
     90
    8891all: $(SOLIB) $(PROGRAMS)
    8992        @echo " Done. "
     
    104107$(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS)
    105108        @echo " Linking shared object $(SOLIB) ..."
    106         $(CXX) $(CXXFLAGS) $(SOFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o $@
     109        $(CXX) $(CXXFLAGS) $(SOFLAG) $(OBJS) $(SUBDIRS:=/*.o) $(ROOTGLIBS) -o ${RNDMNAME}
     110        mv ${RNDMNAME} $@
    107111
    108112# This is a special workaround to create the shared object (bundle, plugin)
  • trunk/MagicSoft/Mars/NEWS

    r8904 r8913  
    4444   * the MFMagicCuts have a new option to allow a linear area cut (for
    4545     special studies)
     46
     47   * The liniking of the shared object is now done into a file defined
     48     by ´mktemp´. This should be a local file system which accelerates
     49     liniking a lot.
     50
     51   * The code has been prepared for compilation with root 5.18/00d
    4652
    4753 ;merpp
Note: See TracChangeset for help on using the changeset viewer.