Changeset 2344 for trunk/MagicSoft


Ignore:
Timestamp:
09/15/03 12:48:51 (21 years ago)
Author:
blanch
Message:
*** empty log message ***
Location:
trunk/MagicSoft/Simulation/Detector/Camera
Files:
3 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.general

    r1566 r2344  
    44
    55ROOTVER    =  `root-config --version`
    6 ROOTLIBS   =  `root-config --libs`
    7 ROOTGLIBS  =  `root-config --glibs`
     6ROOTLIBS   =  `root-config --libs` -lMinuit -lHistPainter
     7ROOTGLIBS  =  `root-config --glibs` -lMinuit -lHistPainter
    88ROOTCFLAGS =  `root-config --cflags`
    99
    … …  
    1212#
    1313
    14 DEFINES   = -DROOTVER=\"$(ROOTVER)\" $(ARCHDEF)
     14#
     15# You can use this flags to further costumize compilation:
     16#   export MARSDEFINES="-DHAVE_DARKBACKGROUND -DHAVE_XPM"
     17#   export MARSFLAGS=
     18#   export MARSLIBS="-lX11 -lXpm -L/usr/X11R6/lib"
     19#
     20DEFINES   = -DMARSVER=\"\<cvs\>\" -D__MARS__ -DROOTVER=\"$(ROOTVER)\" $(ARCHDEF) $(MARSDEFINES)
    1521
    1622CXXFLAGS  = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) $(DEFINES)
    17 CFLAGS    = $(CXXFLAGS)
     23CFLAGS    = $(CXXFLAGS) $(MARSFLAGS)
    1824FFLAGS    = $(CXXFLAGS)
    1925

  • trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.linux

    r1157 r2344  
    2020#  ----->>>   settings for compilation
    2121#
    22 OPTIM    = -O3 -Wall -fno-rtti -fnonnull-objects -fno-exceptions -fPIC -Wtraditional -Wpointer-arith -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Woverloaded-virtual
    23 DEBUG    =
     22OPTIM    = -O5 -Wall -fno-exceptions -fPIC -Wpointer-arith -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Woverloaded-virtual
     23# ggc 3.2: removed -fnonnull-objects -Wtraditional -Wnested-externs
     24DEBUG    =
    2425ARCHDEF  = -D__LINUX__
     26DYNLIB   = -shared
    2527
    2628# For debugging information use '-g'
    2729# For producing gmon.out use    '-pg'
    2830
    29 MARS_LIB = -Llib $(SUBDIRS:%=-l%)
     31MARS_LIB = -Llib $(SUBDIRS:%=-l%) $(MARSLIBS)
    3032INCLUDES = -I. $(SUBDIRS:%=-I%)
    3133

  • trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.osf1

    r1309 r2344  
    2323#
    2424
    25 OPTIM    = -O2 -ieee -arch host
     25OPTIM    = -O2 -ieee -arch host -lpthread
    2626DEBUG    = -g  -w0 -msg_display_tag -msg_disable castqualtyp,undpreid,unrfunprm,extrasemi,intconlosbit,nonfundec,partovrd,stoclsnotfirst,boolexprconst
    27 ARCHDEF  = -D__OSF__
     27ARCHDEF  = -D__OSF__ -D__USE_STD_IOSTREAM -DR__ANSISTREAM
     28DYNLIB   = -shared
    2829
    29 MARS_LIB = -Llib $(SUBDIRS/*/-l&)
     30MARS_LIB = -Llib $(SUBDIRS/*/-l&)  $(MARSLIBS)
    3031INCLUDES = -I. $(SUBDIRS/*/-I&)
    3132
    … …  
    3839
    3940
     41

  • trunk/MagicSoft/Simulation/Detector/Camera/Makefile.rules

    r1156 r2344  
    5353rmbak:
    5454        @echo " Removing backup files..."
    55         @rm -f *~ kk.kk *.bak
     55        @rm -f *~ kk.kk *.bak .#* .*~
    5656
    5757rmbakmac:
    … …  
    6161rmhtml:
    6262        @echo " Removing htmldoc-tree"
    63         @rm -rf htmldoc
     63        rm -rf htmldoc/examples
     64        rm -rf htmldoc/src
     65        ls htmldoc/* | grep "htmldoc/" | grep -v images | grep -v CVS | xargs rm -f
    6466
    6567cflags:
    6668        @echo $(INCLUDES) $(CXXFLAGS)
    6769
    68 
     70diff:
     71        @cvs diff | grep -v "^? " > mars.diff
Note: See TracChangeset for help on using the changeset viewer.