Changeset 5104 for trunk/MagicSoft


Ignore:
Timestamp:
09/17/04 16:44:44 (20 years ago)
Author:
moralejo
Message:
 Cleaned up makefiles, it is not necessary longer to recompile MTrigger
 independently for Camera and StarResponse
Location:
trunk/MagicSoft/Simulation/Detector
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r5097 r5104  
    1919#
    2020# $RCSfile: Makefile,v $
    21 # $Revision: 1.26 $
     21# $Revision: 1.27 $
    2222# $Author: moralejo $
    23 # $Date: 2004-09-17 10:34:13 $
     23# $Date: 2004-09-17 15:44:43 $
    2424#
    2525##################################################################
    … …  
    121121############################################################
    122122
    123 all: rmlib rmtrig $(PROGRAM)
     123all: $(PROGRAM)
    124124        @echo " Done. "
    125125        @echo " "
    … …  
    132132        @echo "Cleaning $(@:.clean=):"
    133133        (cd $(@:.clean=); make clean; cd ..;)
    134 rmtrig:
    135         @echo " Removing ..."
    136         @echo " "
    137         @rm -f ${INCLUDE_TRIGGER}/*.o
    138 
    139 depend: rmtrig
    140         @makedepend $(SRCS) $(INCLUDES) -fMakefile 2> kk.kk ; cat kk.kk
     134
     135depend: @makedepend $(SRCS) $(INCLUDES) -fMakefile 2> kk.kk ; cat kk.kk
    141136
    142137doc: camera-doc
    … …  
    196191        @rm -f *Cint.*
    197192
    198 rmlib: 
    199         @echo " Removing libraries..."
    200         @echo " "
    201         @rm -f lib/lib*.a lib*.a
    202 
    203193rmobjs:
    204194        @echo " Removing object files..."

  • trunk/MagicSoft/Simulation/Detector/StarResponse/Makefile

    r5099 r5104  
    1919#
    2020# $RCSfile: Makefile,v $
    21 # $Revision: 1.7 $
     21# $Revision: 1.8 $
    2222# $Author: moralejo $
    23 # $Date: 2004-09-17 13:51:01 $
     23# $Date: 2004-09-17 15:44:44 $
    2424#
    2525##################################################################
    … …  
    6868# compilation and linking flags
    6969
    70 CXXFLAGS  = -D__${SYSTEM}__ -D__STARRESPO__ ${INCLUDES} ${OPTIM} ${DEBUG}
     70CXXFLAGS  = -D__${SYSTEM}__ ${INCLUDES} ${OPTIM} ${DEBUG}
    7171CFLAGS    = ${CXXFLAGS}
    7272FFLAGS    = ${CXXFLAGS}
    … …  
    113113############################################################
    114114
    115 all: rmtrig $(PROGRAM)
     115all: $(PROGRAM)
    116116        @echo " Done. "
    117117        @echo " "
    … …  
    121121        $(CXX) $(CXXFLAGS) $(OBJS) $(LIBS) -o $@
    122122
    123 rmtrig:
    124         @rm -f ${INCLUDE_TRIGGER}/*.o
    125 
    126 depend: rmtrig
    127         @makedepend $(SRCS) $(INCLUDES) -fMakefile 2> kk.kk ; cat kk.kk
     123depend: @makedepend $(SRCS) $(INCLUDES) -fMakefile 2> kk.kk ; cat kk.kk
    128124
    129125.cxx.o:

  • trunk/MagicSoft/Simulation/Detector/include-MTrigger/MTrigger.cxx

    r5099 r5104  
    517517  //
    518518 
    519 #ifndef __STARRESPO__
    520519  for(i=0; i < pixnum;i++ )
    521520    {
    … …  
    525524      }
    526525    }
    527 #endif
     526
    528527  //
    529528  //  Read in the lookup table for trigger cells
Note: See TracChangeset for help on using the changeset viewer.