Changeset 8913 for trunk/MagicSoft/Mars
- Timestamp:
- 06/02/08 10:46:49 (16 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r8912 r8913 89 89 - Use TString::Data() for second argument in TF1 constructor. 90 90 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 91 95 92 96 -
trunk/MagicSoft/Mars/Makefile
r8615 r8913 20 20 # 21 21 #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 22 PROGRAMS := readdaq merpp readraw sinope callisto star ganymed sponde showlog showplot mars mars-config 23 SOLIB := libmars.so 24 24 25 CINT = M 25 26 … … 35 36 # ----->>> mars libraries 36 37 # 37 SUBDIRS = mbase \38 SUBDIRS := mbase \ 38 39 mastro \ 39 40 mmain \ … … 74 75 75 76 #LIBRARIES = $(SUBDIRS:%=lib/lib%.a) 76 LIBRARIES = $(SUBDIRS:=.a)77 CONDOR = $(SUBDIRS:=.condor)78 MRPROPERS = $(SUBDIRS:=.mrproper)79 CLEANERS = $(SUBDIRS:=.clean)80 LIBS = $(SOLIB)77 LIBRARIES := $(SUBDIRS:=.a) 78 CONDOR := $(SUBDIRS:=.condor) 79 MRPROPERS := $(SUBDIRS:=.mrproper) 80 CLEANERS := $(SUBDIRS:=.clean) 81 LIBS := $(SOLIB) 81 82 82 83 #------------------------------------------------------------------------------ … … 86 87 87 88 ############################################################ 89 RNDMNAME:=$(shell mktemp) 90 88 91 all: $(SOLIB) $(PROGRAMS) 89 92 @echo " Done. " … … 104 107 $(SOLIB): $(LIBRARIES) $(OBJS) $(HEADERS) 105 108 @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} $@ 107 111 108 112 # This is a special workaround to create the shared object (bundle, plugin) -
trunk/MagicSoft/Mars/NEWS
r8904 r8913 44 44 * the MFMagicCuts have a new option to allow a linear area cut (for 45 45 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 46 52 47 53 ;merpp
Note:
See TracChangeset
for help on using the changeset viewer.