Changeset 5096 for trunk


Ignore:
Timestamp:
09/17/04 11:32:54 (20 years ago)
Author:
moralejo
Message:
Simplified. Now Mars code is not compiled by camera. Instead, libmars.so
is used for the linking at the very end.
Location:
trunk/MagicSoft/Simulation/Detector/Camera
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Simulation/Detector/Camera/config.mk.Linux

    r5072 r5096  
    1818#---------------------------------------------------------------
    1919# $RCSfile: config.mk.Linux,v $
    20 # $Revision: 1.8 $
     20# $Revision: 1.9 $
    2121# $Author: moralejo $
    22 # $Date: 2004-09-16 15:16:34 $
     22# $Date: 2004-09-17 10:32:54 $
    2323##################################################################
    2424# @maintitle
    … …  
    4646INCLUDE_TRIGGER      = ../include-MTrigger
    4747INCLUDE_FADC         = ../include-MFadc
    48 INCLUDE_EVITA        = ../../../include-Classes
    49 INCLUDE_EVITA_MC     = ../../../include-Classes/MMcFormat
    50 INCLUDE_EVITA_RAW    = ../../../include-Classes/MRawFormat
    51 INCLUDE_EVITA_BASE   = ../../../include-Classes/MBase
    52 INCLUDE_MARS_MGEOM   = ../../../include-Classes/mgeom
    53 INCLUDE_REFL         = ../ReflectorII
    5448INCLUDE_STAR         = ../StarResponse
    5549INCLUDE_ROOT         = ${ROOTSYS}/include
    5650INCLUDE_CPLUS        = /usr/include/g++
    5751
     52INCLUDE_MARS_MBASE  = ../../../Mars/mbase
     53INCLUDE_MARS_MGEOM  = ../../../Mars/mgeom
     54INCLUDE_MARS_MGUI   = ../../../Mars/mgui
     55INCLUDE_MARS_MC     = ../../../Mars/mmc
     56INCLUDE_MARS_MRAW   = ../../../Mars/mraw
     57
     58
    5859OPTIM    = -O5 -Wall -fno-exceptions -fPIC -Wpointer-arith -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Woverloaded-virtual -Wno-deprecated
     60
    5961DEBUG    = -g
    6062
    … …  
    6365ROOTLIBS =  `root-config --libs` -lMinuit -lHistPainter -lThread
    6466
    65 #       -L/CERN/root/lib -lNew -lCore -lCint -lHist \
    66 #               -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript \
    67 #               -lMatrix -lPhysics -lm 
    68 
    6967ROOTGLIBS = `root-config --glibs` -lMinuit -lHistPainter -lThread
    70 
    71 #       0-L/CERN/root/lib -lNew -lCore -lCint -lHist \
    72 #               -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript \
    73 #               -lMatrix -lPhysics -lGui -lm 
    74 
    75 GLIBS =         $(ROOTLIBS) $(ROOTGLIBS)
    7668
    7769ROOTVER   = `root-config  --version`
    7870ROOTCFLAGS= `root-config  --cflags`
    7971
     72GLIBS =         $(ROOTLIBS) $(ROOTGLIBS)
     73
     74#
     75# AM TEST: to compile statically uncomments lines below (you need root
     76# to be compiled statically too!):
     77# Be aware that you have to put -L/your_root_path/lib
     78#ROOTLIBS =
     79#ROOTGLIBS =
     80#GLIBS = -static -L/cern/root/root/lib -lRoot -lpthread -lm -ldl
     81#
    8082
    8183RANLIBDIR = ../lib
    82 CERNDIR = /cern
    8384
    8485# system
    … …  
    9394##EOF
    9495
     96
     97

  • trunk/MagicSoft/Simulation/Detector/Camera/config.mk.linux

    r5072 r5096  
    1818#---------------------------------------------------------------
    1919# $RCSfile: config.mk.linux,v $
    20 # $Revision: 1.5 $
     20# $Revision: 1.6 $
    2121# $Author: moralejo $
    22 # $Date: 2004-09-16 15:16:34 $
     22# $Date: 2004-09-17 10:32:54 $
    2323##################################################################
    2424# @maintitle
    … …  
    4646INCLUDE_TRIGGER      = ../include-MTrigger
    4747INCLUDE_FADC         = ../include-MFadc
    48 INCLUDE_EVITA        = ../../../include-Classes
    49 INCLUDE_EVITA_MC     = ../../../include-Classes/MMcFormat
    50 INCLUDE_EVITA_RAW    = ../../../include-Classes/MRawFormat
    51 INCLUDE_EVITA_BASE   = ../../../include-Classes/MBase
    52 INCLUDE_MARS_MGEOM   = ../../../include-Classes/mgeom
    53 INCLUDE_REFL         = ../ReflectorII
    5448INCLUDE_STAR         = ../StarResponse
    5549INCLUDE_ROOT         = ${ROOTSYS}/include
    5650INCLUDE_CPLUS        = /usr/include/g++
    5751
    58 #OPTIM    = -O2 -Wall -fno-rtti -fno-exceptions -fPIC
     52INCLUDE_MARS_MBASE  = ../../../Mars/mbase
     53INCLUDE_MARS_MGEOM  = ../../../Mars/mgeom
     54INCLUDE_MARS_MGUI   = ../../../Mars/mgui
     55INCLUDE_MARS_MC     = ../../../Mars/mmc
     56INCLUDE_MARS_MRAW   = ../../../Mars/mraw
     57
    5958OPTIM    = -O5 -Wall -fno-exceptions -fPIC -Wpointer-arith -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Woverloaded-virtual -Wno-deprecated
    60 
    6159DEBUG    = -g
    6260
    … …  
    6563ROOTLIBS =  `root-config --libs` -lMinuit -lHistPainter -lThread
    6664
    67 #       -L/CERN/root/lib -lNew -lCore -lCint -lHist \
    68 #               -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript \
    69 #               -lMatrix -lPhysics -lm 
    70 
    71 ROOTGLIBS = `root-config --glibs` -lThread -lMinuit -lHistPainter -lThread
    72 
    73 #       0-L/CERN/root/lib -lNew -lCore -lCint -lHist \
    74 #               -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript \
    75 #               -lMatrix -lPhysics -lGui -lm 
     65ROOTGLIBS = `root-config --glibs` -lMinuit -lHistPainter -lThread
    7666
    7767ROOTVER   = `root-config  --version`
    7868ROOTCFLAGS= `root-config  --cflags`
    7969
     70GLIBS =         $(ROOTLIBS) $(ROOTGLIBS)
    8071
    81 GLIBS =         $(ROOTLIBS) $(ROOTGLIBS)
     72RANLIBDIR = ../lib
    8273
    8374#
    … …  
    8980#GLIBS = -static -L/cern/root/root/lib -lRoot -lpthread -lm -ldl
    9081#
    91 
    92 RANLIBDIR = ../lib
    93 CERNDIR = /cern
    9482
    9583# system

  • trunk/MagicSoft/Simulation/Detector/Camera/config.mk.linux-gnu

    r5072 r5096  
    1818#---------------------------------------------------------------
    1919# $RCSfile: config.mk.linux-gnu,v $
    20 # $Revision: 1.9 $
     20# $Revision: 1.10 $
    2121# $Author: moralejo $
    22 # $Date: 2004-09-16 15:16:34 $
     22# $Date: 2004-09-17 10:32:54 $
    2323##################################################################
    2424# @maintitle
    … …  
    4646INCLUDE_TRIGGER      = ../include-MTrigger
    4747INCLUDE_FADC         = ../include-MFadc
    48 INCLUDE_EVITA        = ../../../include-Classes
    49 INCLUDE_EVITA_MC     = ../../../include-Classes/MMcFormat
    50 INCLUDE_EVITA_RAW    = ../../../include-Classes/MRawFormat
    51 INCLUDE_EVITA_BASE   = ../../../include-Classes/MBase
    52 INCLUDE_MARS_MGEOM   = ../../../include-Classes/mgeom
    53 INCLUDE_REFL         = ../ReflectorII
    5448INCLUDE_STAR         = ../StarResponse
    5549INCLUDE_ROOT         = ${ROOTSYS}/include
    5650INCLUDE_CPLUS        = /usr/include/g++
     51
     52INCLUDE_MARS_MBASE  = ../../../Mars/mbase
     53INCLUDE_MARS_MGEOM  = ../../../Mars/mgeom
     54INCLUDE_MARS_MGUI   = ../../../Mars/mgui
     55INCLUDE_MARS_MC     = ../../../Mars/mmc
     56INCLUDE_MARS_MRAW   = ../../../Mars/mraw
    5757
    5858OPTIM    = -O5 -Wall -fno-exceptions -fPIC -Wpointer-arith -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Woverloaded-virtual -Wno-deprecated
    … …  
    6363ROOTLIBS =  `root-config --libs` -lMinuit -lHistPainter -lThread
    6464
    65 #       -L/CERN/root/lib -lNew -lCore -lCint -lHist \
    66 #               -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript \
    67 #               -lMatrix -lPhysics -lm 
    68 
    6965ROOTGLIBS = `root-config --glibs` -lMinuit -lHistPainter -lThread
    70 
    71 #       -L/CERN/root/lib -lNew -lCore -lCint -lHist \
    72 #               -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript \
    73 #               -lMatrix -lPhysics -lGui -lm 
    74 
    75 GLIBS =         $(ROOTLIBS) $(ROOTGLIBS)
    7666
    7767ROOTVER   = `root-config  --version`
    7868ROOTCFLAGS= `root-config  --cflags`
    7969
     70GLIBS =         $(ROOTLIBS) $(ROOTGLIBS)
    8071
    8172RANLIBDIR = ../lib
    82 CERNDIR = /cern
    8373
    8474# system

  • trunk/MagicSoft/Simulation/Detector/Camera/config.mk.osf1

    r3045 r5096  
    1818#---------------------------------------------------------------
    1919# $RCSfile: config.mk.osf1,v $
    20 # $Revision: 1.10 $
    21 # $Author: blanch $
    22 # $Date: 2004-02-06 17:40:41 $
     20# $Revision: 1.11 $
     21# $Author: moralejo $
     22# $Date: 2004-09-17 10:32:54 $
    2323##################################################################
    2424# @maintitle
    … …  
    4747INCLUDE_TRIGGER      = ../include-MTrigger
    4848INCLUDE_FADC         = ../include-MFadc
    49 INCLUDE_EVITA        = ../../../include-Classes
    50 INCLUDE_EVITA_MC     = ../../../include-Classes/MMcFormat
    51 INCLUDE_EVITA_RAW    = ../../../include-Classes/MRawFormat
    52 INCLUDE_EVITA_BASE   = ../../../include-Classes/MBase
    53 INCLUDE_MARS_MGEOM   = ../../../include-Classes/mgeom
    54 INCLUDE_REFL         = ../ReflectorII
    5549INCLUDE_STAR         = ../StarResponse
    5650INCLUDE_ROOT         = ${ROOTSYS}/include
    5751INCLUDE_CPLUS        = /usr/include/cxx
     52
     53INCLUDE_MARS_MBASE  = ../../../Mars/mbase
     54INCLUDE_MARS_MGEOM  = ../../../Mars/mgeom
     55INCLUDE_MARS_MGUI   = ../../../Mars/mgui
     56INCLUDE_MARS_MC     = ../../../Mars/mmc
     57INCLUDE_MARS_MRAW   = ../../../Mars/mraw
    5858
    5959OPTIM    = -O2 -ieee -arch host -lpthread   
    … …  
    6262# libraries
    6363ROOTLIBS = `root-config --libs` -lMinuit -lHistPainter -lThread
    64 #ROOTLIBS =     -L${ROOTSYS}/lib -lNew -lCore -lCint -lHist \
    65 #               -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript \
    66 #               -lMatrix -lPhysics -lm 
    6764
    68 ROOTGLIBS = `root-config --glibs` -lMinuit -lHistPainter -lThread
    69 #ROOTGLIBS =    -L${ROOTSYS}/lib -lNew -lCore -lCint -lHist \
    70 #               -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript \
    71 #               -lMatrix -lPhysics -lGui -lm 
     65ROOTGLIBS = `root-config --glibs` -lMinuit -lHistPainter -lThread -lMatrix -lPhysics -lGui -lm 
    7266
    7367ROOTVER   = `root-config  --version`
    … …  
    7670GLIBS =         $(ROOTLIBS) $(ROOTGLIBS)
    7771
    78 
    79 
    8072RANLIBDIR = ../lib
    81 CERNDIR = /CERN
    8273 
    8374# system
Note: See TracChangeset for help on using the changeset viewer.