Changeset 2800


Ignore:
Timestamp:
01/14/04 10:13:02 (21 years ago)
Author:
tbretz
Message:
*** empty log message ***
Location:
trunk/MagicSoft
Files:
28 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagicSoft/Mars/Changelog

    r2799 r2800  
    44
    55                                                 -*-*- END OF LINE -*-*-
     6
     7 2004/01/14: Thomas Bretz
     8
     9   * Makefile:
     10     - replaced old style Makefile.depend by directory specific
     11       dependancy files
     12       
     13   * Makefile.rules:
     14     - changed obsolete '.cc.o' style to newer style '%.o: %.c'
     15     - added rule to make dependency files
     16     - added rule to remove dependancy files.
     17     - added rmdep as prerequisite to clean
     18     - include dependency file
     19
     20   * mbase/Makefile, mcalib/Makefile, mcamera/Makefile,
     21     mdata/Makefile, mfileio/Makefile, mfilter/Makefile,
     22     mgeom/Makefile, mgui/Makefile, mhbase/Makefile,
     23     mhist/Makefile, mhistmc/Makefile, mimage/Makefile,
     24     mmain/Makefile, mmc/Makefile, mmontecarlo/Makefile,
     25     mpointing/Makefile, mranforest/Makefile, mraw/Makefile,
     26     mreflector/Makefile, mreport/Makefile, mtemp/Makefile,
     27     mtools/Makefile:
     28     - removed clean-rule, use the one in Makefile.rules instead
     29
     30   * mreport/Makefile, mreport/ReportLinkDef.h:
     31     - added MReportHelp
     32
     33   * mreport/MReportFileRead.cc:
     34     - moved code from MReportHelp to new file
     35     - removed usage of MRepoort class completely
     36
    637
    738

  • trunk/MagicSoft/Mars/Makefile

    r2780 r2800  
    8888
    8989include Makefile.rules
    90 include Makefile.depend
    9190
    9291#
    … …  
    103102        $(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(LIBS) $@.o $(MARS_LIB) -o $@
    104103
     104# FOR CONVINIENCE CREATE Dep-file first!
    105105$(LIBRARIES):
    106106        @echo " Creating lib$@:"
    … …  
    123123        @echo
    124124
    125 clean:  rmmake rmcint rmobjs rmcore rmlib
     125#clean: rmcint rmobjs rmdep rmcore rmlib
    126126
    127 mrproper:       $(MRPROPERS) rmmake rmbin rmbak rmbakmac rmhtml clean
     127mrproper:       $(MRPROPERS) rmbin rmbak rmbakmac rmhtml clean
    128128        @echo " Done."
    129129        @echo " "
    … …  
    135135#       @gzip -9 ../mars.tar
    136136
    137 Makefile.depend:
    138         (! find ./ Makefile.depend -maxdepth 1 -empty 2> /dev/null && \
    139         echo " Generating dependancies into Makefile.depend" && \
    140         makedepend -- $(INCLUDES) -- $(PROGRAMS:=.cc) $(SRCS) $(SUBDIRS:=/*.cc) -w1024 -f- 2> /dev/null | grep -v Cint | grep -v "/usr/" > Makefile.depend && \
    141         echo " ") || find -maxdepth 0 -true > /dev/null
    142 
    143 depend: Makefile.depend
     137#Makefile.depend:
     138#       (! find ./ Makefile.depend -maxdepth 1 -empty 2> /dev/null && \
     139#       echo " Generating dependancies into Makefile.depend" && \
     140#       makedepend -- $(INCLUDES) -- $(PROGRAMS:=.cc) $(SRCS) $(SUBDIRS:=/*.cc) -w1024 -f- 2> /dev/null | grep -v Cint | grep -v "/usr/" > Makefile.depend && \
     141#       echo " ") || find -maxdepth 0 -true > /dev/null
     142#
     143#depend:        Makefile.depend
    144144
    145145# @endcode

  • trunk/MagicSoft/Mars/Makefile.rules

    r2711 r2800  
     1include $(CINT)Dep.d
    12
    23$(LIB): $(OBJS) $(CINT)Cint.o
    … …  
    1112        -c $(INCLUDES) $(DEFINES) $(HEADERS) $(CINT)Incl.h $(CINT)LinkDef.h
    1213
    13 .cxx.o:
     14%.d:   
     15        @echo " - Generating dependancies" $@
     16        $(ROOTSYS)/bin/rmkdepend -f- -Y -w 3000 -- $(INCLUDES) -- $(SRCFILES) 2> /dev/null | \
     17        sed 's/^\(.*\).o:/$@ \1.o:/' > $@
     18
     19%.o:    %.cxx
    1420        @echo " - Compiling" $<
    1521        $(CXX) $(CXXFLAGS) -c $< -o $@
    1622
    17 .cc.o: 
     23%.o:    %.cc
    1824        @echo " - Compiling" $<
    1925        $(CXX) $(CXXFLAGS) -c $< -o $@
    2026
    21 .c.o:   
     27%.o:     %.c
    2228        @echo " - Compiling" $<
    2329        $(CC) $(CFLAGS) -c $< -o $@
    … …  
    2632# The cleaning facility
    2733#
    28 
    29 rmmake:
    30         @echo " Removing Makefile.depend"
    31         @rm -f Makefile.depend
    3234
    3335rmcint:
    … …  
    4345        @echo " Removing object files..."
    4446        @rm -f *.o
     47
     48rmdep: 
     49        @echo " Removing dependency file..."
     50        @rm -f *Dep.d
    4551
    4652rmcore:
    … …  
    6672        ls htmldoc/* | grep "htmldoc/" | grep -v images | grep -v CVS | xargs rm -f
    6773
     74clean:  rmcint rmobjs rmdep rmcore rmlib
     75
    6876cflags:
    6977        @echo $(INCLUDES) $(CXXFLAGS)

  • trunk/MagicSoft/Mars/manalysis/Makefile

    r2777 r2800  
    2424INCLUDES = -I. -I../mbase -I../mmc -I../mraw -I../mgeom -I../mfilter \
    2525           -I../mdata -I../mhbase -I../mhist -I../mgui -I../mimage   \
    26            -I../mhistmc -I../mfileio -I../mmain -I../mcalib
     26           -I../mhistmc -I../mfileio -I../mmain -I../mcalib          \
     27           -I../mpointing
    2728# mcalib: MGeomApply (MCalibrationCam)
    2829
    … …  
    3334SRCFILES = MPedestalPix.cc \
    3435           MPedestalCam.cc \
     36           MPedPhotPix.cc \
     37           MPedPhotCam.cc \
    3538           MPedCalcPedRun.cc \
    3639           MMcPedestalCopy.cc \
    3740           MMcPedestalNSBAdd.cc \
    3841           MGeomApply.cc \
    39            MCurrents.cc \
    4042           MCameraData.cc \
    4143           MEnergyEst.cc \
    … …  
    8284           MArrivalTimeCalc.cc \
    8385           MMcCalibrationCalc.cc \
    84            MSimulatedAnnealing.cc \
    85            MPedPhotCam.cc \
    86            MPedPhotPix.cc
     86           MSimulatedAnnealing.cc
    8787
    8888SRCS    = $(SRCFILES)

  • trunk/MagicSoft/Mars/mbase/Makefile

    r2784 r2800  
    7777include ../Makefile.rules
    7878
    79 clean:  rmcint rmobjs rmcore rmlib
     79#clean: rmcint rmobjs rmcore rmlib
    8080
    8181mrproper:       clean rmbak
    8282
    8383# @endcode
    84 

  • trunk/MagicSoft/Mars/mcalib/Makefile

    r2736 r2800  
    5555include ../Makefile.rules
    5656
    57 clean:  rmcint rmobjs rmcore rmlib
     57#clean: rmcint rmobjs rmcore rmlib
    5858
    5959mrproper:       clean rmbak

  • trunk/MagicSoft/Mars/mcamera/Makefile

    r2632 r2800  
    4949include ../Makefile.rules
    5050
    51 clean:  rmcint rmobjs rmcore rmlib
     51#clean: rmcint rmobjs rmcore rmlib
    5252
    5353mrproper:       clean rmbak

  • trunk/MagicSoft/Mars/mdata/Makefile

    r2738 r2800  
    4949include ../Makefile.rules
    5050
    51 clean:  rmcint rmobjs rmcore rmlib
     51#clean: rmcint rmobjs rmcore rmlib
    5252
    5353mrproper:       clean rmbak

  • trunk/MagicSoft/Mars/mfileio/Makefile

    r2740 r2800  
    6262include ../Makefile.rules
    6363
    64 clean:  rmcint rmobjs rmcore rmlib
     64#clean: rmcint rmobjs rmcore rmlib
    6565
    6666mrproper:       clean rmbak

  • trunk/MagicSoft/Mars/mfilter/Makefile

    r2743 r2800  
    6464include ../Makefile.rules
    6565
    66 clean:  rmcint rmobjs rmcore rmlib
     66#clean: rmcint rmobjs rmcore rmlib
    6767
    6868mrproper:       clean rmbak

  • trunk/MagicSoft/Mars/mgeom/Makefile

    r2283 r2800  
    5151include ../Makefile.rules
    5252
    53 clean:  rmcint rmobjs rmcore rmlib
     53#clean: rmcint rmobjs rmcore rmlib
    5454
    5555mrproper:       clean rmbak

  • trunk/MagicSoft/Mars/mgui/Makefile

    r2264 r2800  
    4141include ../Makefile.rules
    4242
    43 clean:  rmcint rmobjs rmcore rmlib
     43#clean: rmcint rmobjs rmcore rmlib
    4444
    4545mrproper:       clean rmbak

  • trunk/MagicSoft/Mars/mhbase/Makefile

    r2738 r2800  
    4646include ../Makefile.rules
    4747
    48 clean:  rmcint rmobjs rmcore rmlib
     48#clean: rmcint rmobjs rmcore rmlib
    4949
    5050mrproper:       clean rmbak

  • trunk/MagicSoft/Mars/mhist/Makefile

    r2738 r2800  
    2424INCLUDES = -I. -I../mbase -I../mhbase -I../mraw -I../manalysis \
    2525           -I../mgui -I../mgeom -I../mdata -I../mfilter -I../mimage \
    26            -I../mmain -I../mmc -I../mreflector
     26           -I../mmain -I../mmc -I../mreflector -I../mpointing
    2727
    2828#------------------------------------------------------------------------------
    … …  
    7474include ../Makefile.rules
    7575
    76 clean:  rmcint rmobjs rmcore rmlib
     76#clean: rmcint rmobjs rmcore rmlib
    7777
    7878mrproper:       clean rmbak

  • trunk/MagicSoft/Mars/mhistmc/Makefile

    r2737 r2800  
    5252include ../Makefile.rules
    5353
    54 clean:  rmcint rmobjs rmcore rmlib
     54#clean: rmcint rmobjs rmcore rmlib
    5555
    5656mrproper:       clean rmbak

  • trunk/MagicSoft/Mars/mimage/Makefile

    r2737 r2800  
    5454include ../Makefile.rules
    5555
    56 clean:  rmcint rmobjs rmcore rmlib
     56#clean: rmcint rmobjs rmcore rmlib
    5757
    5858mrproper:       clean rmbak

  • trunk/MagicSoft/Mars/mmain/Makefile

    r2738 r2800  
    5252include ../Makefile.rules
    5353
    54 clean:  rmcint rmobjs rmcore rmlib
     54#clean: rmcint rmobjs rmcore rmlib
    5555
    5656mrproper:       clean rmbak

  • trunk/MagicSoft/Mars/mmontecarlo/Makefile

    r2738 r2800  
    4747include ../Makefile.rules
    4848
    49 clean:  rmcint rmobjs rmcore rmlib
     49#clean: rmcint rmobjs rmcore rmlib
    5050
    5151mrproper:       clean rmbak

  • trunk/MagicSoft/Mars/mpointing/Makefile

    r2600 r2800  
    4141include ../Makefile.rules
    4242
    43 clean:  rmcint rmobjs rmcore rmlib
     43#clean: rmcint rmobjs rmcore rmlib
    4444
    4545mrproper:       clean rmbak

  • trunk/MagicSoft/Mars/mranforest/Makefile

    r2739 r2800  
    4747include ../Makefile.rules
    4848
    49 clean:  rmcint rmobjs rmcore rmlib
     49#clean: rmcint rmobjs rmcore rmlib
    5050
    5151mrproper:       clean rmbak

  • trunk/MagicSoft/Mars/mraw/Makefile

    r2675 r2800  
    5050include ../Makefile.rules
    5151
    52 clean:  rmcint rmobjs rmcore rmlib
     52#clean: rmcint rmobjs rmcore rmlib
    5353
    5454mrproper:       clean rmbak

  • trunk/MagicSoft/Mars/mreflector/Makefile

    r2208 r2800  
    4343include ../Makefile.rules
    4444
    45 clean:  rmcint rmobjs rmcore rmlib
     45#clean: rmcint rmobjs rmcore rmlib
    4646
    4747mrproper:       clean rmbak

  • trunk/MagicSoft/Mars/mreport/MReportFileRead.cc

    r2711 r2800  
    4242#include <fstream>
    4343
    44 #include <TClass.h>
    4544#include <TRegexp.h>
    4645#include <THashTable.h>
    … …  
    4948#include "MLogManip.h"
    5049
    51 #include "MReport.h"
    5250#include "MParList.h"
     51#include "MReportHelp.h"
    5352
    5453ClassImp(MReportFileRead);
    … …  
    5857const TString MReportFileRead::gsReportHeader ="[CC Report File]";
    5958const TString MReportFileRead::gsVersionPrefix="Arehucas Version Number";
    60 
    61 class MReportHelp : public TObject
    62 {
    63 private:
    64     MReport *fReport;
    65     ULong_t  fNumReports;
    66 
    67 public:
    68     MReportHelp(const char *name, MLog *fLog) : fReport(NULL), fNumReports(0)
    69     {
    70         TClass *cls = gROOT->GetClass(name);
    71         Int_t rc = 0;
    72         if (!cls)
    73             rc =1;
    74         else
    75         {
    76             if (!cls->Property())
    77                 rc = 5;
    78             if (!cls->Size())
    79                 rc = 4;
    80             if (!cls->IsLoaded())
    81                 rc = 3;
    82             if (!cls->HasDefaultConstructor())
    83                 rc = 2;
    84         }
    85 
    86         if (rc)
    87         {
    88             *fLog << err << dbginf << "Cannot create new instance of class '" << name << "': ";
    89             switch (rc)
    90             {
    91             case 1:
    92                 *fLog << "gROOT->GetClass() returned NULL." << endl;
    93                 return;
    94             case 2:
    95                 *fLog << "no default constructor." << endl;
    96                 return;
    97             case 3:
    98                 *fLog << "not loaded." << endl;
    99                 return;
    100             case 4:
    101                 *fLog << "zero size." << endl;
    102                 return;
    103             case 5:
    104                 *fLog << "no property." << endl;
    105                 return;
    106             }
    107         }
    108 
    109         //
    110         // create the parameter container of the the given class type
    111         //
    112         fReport = (MReport*)cls->New();
    113     }
    114     ~MReportHelp() { if (fReport) delete fReport; }
    115 
    116     const char *GetName() const { return fReport->GetIdentifier(); }
    117     ULong_t GetNumReports() const { return fNumReports; }
    118     ULong_t Hash() const { return fReport->GetIdentifier().Hash(); }
    119     MReport *GetReport() { return fReport; }
    120     //void SetTime(MTime *t) { fReport->SetTime(t); }
    121     Int_t Interprete(TString &str, const MTime &start, const MTime &stop)
    122     {
    123         const Int_t rc = fReport->Interprete(str, start, stop);
    124 
    125         if (rc==kFALSE)
    126             return kFALSE;
    127 
    128         fNumReports++;
    129         return rc;
    130     }
    131     Bool_t SetupReading(MParList &plist) { return fReport->SetupReading(plist); }
    132     void AddToList(MParList &plist) { plist.AddToList(fReport); }
    133 };
    13459
    13560// --------------------------------------------------------------------------
    … …  
    183108    MReportHelp *help = new MReportHelp(name, fLog);
    184109
    185     MReport *rep = NULL;
    186     if (!(rep=help->GetReport()))
    187         return kFALSE;
    188 
    189     if (GetReport(rep->GetIdentifier()))
     110    if (!help->GetReport())
     111        return kFALSE;
     112
     113    if (GetReport(help->GetName()))
    190114    {
    191115        *fLog << warn << "WARNING - Report with Identifier '";
    192         *fLog << rep->GetIdentifier() << "' already added to the list... ";
     116        *fLog << help->GetName() << "' already added to the list... ";
    193117        *fLog << "ignored." << endl;
    194118        delete help;

  • trunk/MagicSoft/Mars/mreport/Makefile

    r2707 r2800  
    3333           MReportRun.cc \
    3434           MReportDAQ.cc \
     35           MReportHelp.cc \
    3536           MReportDrive.cc \
    3637           MReportCamera.cc \
    … …  
    4950include ../Makefile.rules
    5051
    51 clean:  rmcint rmobjs rmcore rmlib
     52#clean: rmcint rmobjs rmcore rmlib
    5253
    5354mrproper:       clean rmbak

  • trunk/MagicSoft/Mars/mreport/ReportLinkDef.h

    r2707 r2800  
    1515#pragma link C++ class MReportCurrents+;
    1616
     17#pragma link C++ class MReportHelp+;
    1718#pragma link C++ class MReportFileRead+;
    1819

  • trunk/MagicSoft/Mars/mtemp/Makefile

    r1681 r2800  
    4343include ../Makefile.rules
    4444
    45 clean:  rmcint rmobjs rmcore rmlib
     45#clean: rmcint rmobjs rmcore rmlib
    4646
    4747mrproper:       clean rmbak

  • trunk/MagicSoft/Mars/mtools/Makefile

    r2745 r2800  
    5050include ../Makefile.rules
    5151
    52 clean:  rmcint rmobjs rmcore rmlib
     52#clean: rmcint rmobjs rmcore rmlib
    5353
    5454mrproper:       clean rmbak

  • trunk/MagicSoft/include-Classes/MMcFormat/Makefile

    r1619 r2800  
    5252include ../Makefile.rules
    5353
    54 clean:  rmcint rmobjs rmcore rmlib
     54#clean: rmcint rmobjs rmcore rmlib
    5555
    5656mrproper:       clean rmbak
Note: See TracChangeset for help on using the changeset viewer.