Index: trunk/MagicSoft/Simulation/Detector/Camera/Makefile =================================================================== --- trunk/MagicSoft/Simulation/Detector/Camera/Makefile (revision 3044) +++ trunk/MagicSoft/Simulation/Detector/Camera/Makefile (revision 3045) @@ -19,7 +19,7 @@ # # $RCSfile: Makefile,v $ -# $Revision: 1.23 $ +# $Revision: 1.24 $ # $Author: blanch $ -# $Date: 2003-06-18 17:16:06 $ +# $Date: 2004-02-06 17:41:27 $ # ################################################################## @@ -68,5 +68,5 @@ # compilation and linking flags -CXXFLAGS = -D__${SYSTEM}__ ${INCLUDES} ${OPTIM} ${DEBUG} +CXXFLAGS = -D__${SYSTEM}__ $(ROOTCFLAGS) ${INCLUDES} ${OPTIM} ${DEBUG} CFLAGS = ${CXXFLAGS} FFLAGS = ${CXXFLAGS} @@ -175,13 +175,13 @@ .cxx.o: - @echo "Compiling " $< + @echo "Compiling " $(CXXFLAGS) $< $(CXX) $(CXXFLAGS) -c $< -o $@ .cc.o: - @echo "Compiling " $< + @echo "Compiling " $(CXXFLAGS) $< $(CXX) $(CXXFLAGS) -c $< -o $@ .c.o: - @echo "Compiling " $< + @echo "Compiling " $(CFLAGS) $< $(CC) $(CFLAGS) -c $< -o $@ @@ -253,4 +253,5 @@ ../StarResponse/MStarLight.c.o: /cern/root/root/include/Byteswap.h ../StarResponse/MStarLight.c.o: /cern/root/root/include/DllImport.h +../StarResponse/MStarLight.c.o: /cern/root/root/include/Foption.h ../StarResponse/MStarLight.c.o: /cern/root/root/include/Gtypes.h ../StarResponse/MStarLight.c.o: /cern/root/root/include/Htypes.h @@ -258,4 +259,6 @@ ../StarResponse/MStarLight.c.o: /cern/root/root/include/RConfig.h ../StarResponse/MStarLight.c.o: /cern/root/root/include/RVersion.h +../StarResponse/MStarLight.c.o: /cern/root/root/include/Riosfwd.h +../StarResponse/MStarLight.c.o: /cern/root/root/include/Rtypeinfo.h ../StarResponse/MStarLight.c.o: /cern/root/root/include/Rtypes.h ../StarResponse/MStarLight.c.o: /cern/root/root/include/TArray.h @@ -263,4 +266,5 @@ ../StarResponse/MStarLight.c.o: /cern/root/root/include/TArrayD.h ../StarResponse/MStarLight.c.o: /cern/root/root/include/TArrayF.h +../StarResponse/MStarLight.c.o: /cern/root/root/include/TArrayI.h ../StarResponse/MStarLight.c.o: /cern/root/root/include/TArrayS.h ../StarResponse/MStarLight.c.o: /cern/root/root/include/TAttAxis.h @@ -277,6 +281,8 @@ ../StarResponse/MStarLight.c.o: /cern/root/root/include/TDirectory.h ../StarResponse/MStarLight.c.o: /cern/root/root/include/TFile.h +../StarResponse/MStarLight.c.o: /cern/root/root/include/TGenericClassInfo.h ../StarResponse/MStarLight.c.o: /cern/root/root/include/TH1.h ../StarResponse/MStarLight.c.o: /cern/root/root/include/THashList.h +../StarResponse/MStarLight.c.o: /cern/root/root/include/TInetAddress.h ../StarResponse/MStarLight.c.o: /cern/root/root/include/TIterator.h ../StarResponse/MStarLight.c.o: /cern/root/root/include/TList.h @@ -291,4 +297,5 @@ ../StarResponse/MStarLight.c.o: /cern/root/root/include/TStorage.h ../StarResponse/MStarLight.c.o: /cern/root/root/include/TString.h +../StarResponse/MStarLight.c.o: /cern/root/root/include/TUUID.h ../StarResponse/MStarLight.c.o: /cern/root/root/include/TVirtualHistPainter.h ../StarResponse/MStarLight.c.o: /cern/root/root/include/Varargs.h @@ -322,12 +329,38 @@ ../StarResponse/MStarLight.c.o: /usr/include/sys/types.h /usr/include/time.h ../StarResponse/MStarLight.c.o: /usr/include/wchar.h /usr/include/xlocale.h +../StarResponse/MStarLight.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/exception ../StarResponse/MStarLight.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/float.h ../StarResponse/MStarLight.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/stdarg.h ../StarResponse/MStarLight.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/stddef.h -../include-MC/MCCphoton.c.o: ../include-GENERAL/DllImport.h -../include-MC/MCCphoton.c.o: ../include-GENERAL/RConfig.h -../include-MC/MCCphoton.c.o: ../include-GENERAL/Rtypes.h +../StarResponse/MStarLight.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/typeinfo ../include-MC/MCCphoton.c.o: ../include-GENERAL/jcmacros.h ../include-MC/MCCphoton.c.o: ../include-MC/MCCphoton.hxx +../include-MC/MCCphoton.c.o: /cern/root/root/include/Bytes.h +../include-MC/MCCphoton.c.o: /cern/root/root/include/Byteswap.h +../include-MC/MCCphoton.c.o: /cern/root/root/include/DllImport.h +../include-MC/MCCphoton.c.o: /cern/root/root/include/Htypes.h +../include-MC/MCCphoton.c.o: /cern/root/root/include/RConfig.h +../include-MC/MCCphoton.c.o: /cern/root/root/include/RVersion.h +../include-MC/MCCphoton.c.o: /cern/root/root/include/Riosfwd.h +../include-MC/MCCphoton.c.o: /cern/root/root/include/Rtypeinfo.h +../include-MC/MCCphoton.c.o: /cern/root/root/include/Rtypes.h +../include-MC/MCCphoton.c.o: /cern/root/root/include/TBuffer.h +../include-MC/MCCphoton.c.o: /cern/root/root/include/TCollection.h +../include-MC/MCCphoton.c.o: /cern/root/root/include/TDatime.h +../include-MC/MCCphoton.c.o: /cern/root/root/include/TDirectory.h +../include-MC/MCCphoton.c.o: /cern/root/root/include/TGenericClassInfo.h +../include-MC/MCCphoton.c.o: /cern/root/root/include/TInetAddress.h +../include-MC/MCCphoton.c.o: /cern/root/root/include/TIterator.h +../include-MC/MCCphoton.c.o: /cern/root/root/include/TList.h +../include-MC/MCCphoton.c.o: /cern/root/root/include/TMath.h +../include-MC/MCCphoton.c.o: /cern/root/root/include/TNamed.h +../include-MC/MCCphoton.c.o: /cern/root/root/include/TObject.h +../include-MC/MCCphoton.c.o: /cern/root/root/include/TROOT.h +../include-MC/MCCphoton.c.o: /cern/root/root/include/TRefCnt.h +../include-MC/MCCphoton.c.o: /cern/root/root/include/TSeqCollection.h +../include-MC/MCCphoton.c.o: /cern/root/root/include/TStorage.h +../include-MC/MCCphoton.c.o: /cern/root/root/include/TString.h +../include-MC/MCCphoton.c.o: /cern/root/root/include/TUUID.h +../include-MC/MCCphoton.c.o: /cern/root/root/include/Varargs.h ../include-MC/MCCphoton.c.o: /usr/include/_G_config.h /usr/include/alloca.h ../include-MC/MCCphoton.c.o: /usr/include/bits/endian.h @@ -349,4 +382,5 @@ ../include-MC/MCCphoton.c.o: /usr/include/g++/fstream.h ../include-MC/MCCphoton.c.o: /usr/include/g++/iomanip.h +../include-MC/MCCphoton.c.o: /usr/include/g++/iosfwd ../include-MC/MCCphoton.c.o: /usr/include/g++/iostream.h ../include-MC/MCCphoton.c.o: /usr/include/g++/streambuf.h /usr/include/gconv.h @@ -359,11 +393,38 @@ ../include-MC/MCCphoton.c.o: /usr/include/sys/types.h /usr/include/time.h ../include-MC/MCCphoton.c.o: /usr/include/wchar.h /usr/include/xlocale.h +../include-MC/MCCphoton.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/exception +../include-MC/MCCphoton.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/float.h ../include-MC/MCCphoton.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/stdarg.h ../include-MC/MCCphoton.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/stddef.h +../include-MC/MCCphoton.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/typeinfo ../include-MC/MCEventHeader.c.o: ../include-CORSIKA/COREventHeader.hxx -../include-MC/MCEventHeader.c.o: ../include-GENERAL/DllImport.h -../include-MC/MCEventHeader.c.o: ../include-GENERAL/RConfig.h -../include-MC/MCEventHeader.c.o: ../include-GENERAL/Rtypes.h ../include-MC/MCEventHeader.c.o: ../include-MC/MCEventHeader.hxx +../include-MC/MCEventHeader.c.o: /cern/root/root/include/Bytes.h +../include-MC/MCEventHeader.c.o: /cern/root/root/include/Byteswap.h +../include-MC/MCEventHeader.c.o: /cern/root/root/include/DllImport.h +../include-MC/MCEventHeader.c.o: /cern/root/root/include/Htypes.h +../include-MC/MCEventHeader.c.o: /cern/root/root/include/RConfig.h +../include-MC/MCEventHeader.c.o: /cern/root/root/include/RVersion.h +../include-MC/MCEventHeader.c.o: /cern/root/root/include/Riosfwd.h +../include-MC/MCEventHeader.c.o: /cern/root/root/include/Rtypeinfo.h +../include-MC/MCEventHeader.c.o: /cern/root/root/include/Rtypes.h +../include-MC/MCEventHeader.c.o: /cern/root/root/include/TBuffer.h +../include-MC/MCEventHeader.c.o: /cern/root/root/include/TCollection.h +../include-MC/MCEventHeader.c.o: /cern/root/root/include/TDatime.h +../include-MC/MCEventHeader.c.o: /cern/root/root/include/TDirectory.h +../include-MC/MCEventHeader.c.o: /cern/root/root/include/TGenericClassInfo.h +../include-MC/MCEventHeader.c.o: /cern/root/root/include/TInetAddress.h +../include-MC/MCEventHeader.c.o: /cern/root/root/include/TIterator.h +../include-MC/MCEventHeader.c.o: /cern/root/root/include/TList.h +../include-MC/MCEventHeader.c.o: /cern/root/root/include/TMath.h +../include-MC/MCEventHeader.c.o: /cern/root/root/include/TNamed.h +../include-MC/MCEventHeader.c.o: /cern/root/root/include/TObject.h +../include-MC/MCEventHeader.c.o: /cern/root/root/include/TROOT.h +../include-MC/MCEventHeader.c.o: /cern/root/root/include/TRefCnt.h +../include-MC/MCEventHeader.c.o: /cern/root/root/include/TSeqCollection.h +../include-MC/MCEventHeader.c.o: /cern/root/root/include/TStorage.h +../include-MC/MCEventHeader.c.o: /cern/root/root/include/TString.h +../include-MC/MCEventHeader.c.o: /cern/root/root/include/TUUID.h +../include-MC/MCEventHeader.c.o: /cern/root/root/include/Varargs.h ../include-MC/MCEventHeader.c.o: /usr/include/_G_config.h ../include-MC/MCEventHeader.c.o: /usr/include/alloca.h @@ -386,4 +447,6 @@ ../include-MC/MCEventHeader.c.o: /usr/include/g++/fstream.h ../include-MC/MCEventHeader.c.o: /usr/include/g++/iomanip.h +../include-MC/MCEventHeader.c.o: /usr/include/g++/iosfwd +../include-MC/MCEventHeader.c.o: /usr/include/g++/iostream ../include-MC/MCEventHeader.c.o: /usr/include/g++/iostream.h ../include-MC/MCEventHeader.c.o: /usr/include/g++/streambuf.h @@ -397,11 +460,38 @@ ../include-MC/MCEventHeader.c.o: /usr/include/sys/types.h /usr/include/time.h ../include-MC/MCEventHeader.c.o: /usr/include/wchar.h /usr/include/xlocale.h +../include-MC/MCEventHeader.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/exception +../include-MC/MCEventHeader.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/float.h ../include-MC/MCEventHeader.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/stdarg.h ../include-MC/MCEventHeader.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/stddef.h +../include-MC/MCEventHeader.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/typeinfo ../include-MC/MCEventHeader_2.c.o: ../include-CORSIKA/COREventHeader.hxx -../include-MC/MCEventHeader_2.c.o: ../include-GENERAL/DllImport.h -../include-MC/MCEventHeader_2.c.o: ../include-GENERAL/RConfig.h -../include-MC/MCEventHeader_2.c.o: ../include-GENERAL/Rtypes.h ../include-MC/MCEventHeader_2.c.o: ../include-MC/MCEventHeader_2.hxx +../include-MC/MCEventHeader_2.c.o: /cern/root/root/include/Bytes.h +../include-MC/MCEventHeader_2.c.o: /cern/root/root/include/Byteswap.h +../include-MC/MCEventHeader_2.c.o: /cern/root/root/include/DllImport.h +../include-MC/MCEventHeader_2.c.o: /cern/root/root/include/Htypes.h +../include-MC/MCEventHeader_2.c.o: /cern/root/root/include/RConfig.h +../include-MC/MCEventHeader_2.c.o: /cern/root/root/include/RVersion.h +../include-MC/MCEventHeader_2.c.o: /cern/root/root/include/Riosfwd.h +../include-MC/MCEventHeader_2.c.o: /cern/root/root/include/Rtypeinfo.h +../include-MC/MCEventHeader_2.c.o: /cern/root/root/include/Rtypes.h +../include-MC/MCEventHeader_2.c.o: /cern/root/root/include/TBuffer.h +../include-MC/MCEventHeader_2.c.o: /cern/root/root/include/TCollection.h +../include-MC/MCEventHeader_2.c.o: /cern/root/root/include/TDatime.h +../include-MC/MCEventHeader_2.c.o: /cern/root/root/include/TDirectory.h +../include-MC/MCEventHeader_2.c.o: /cern/root/root/include/TGenericClassInfo.h +../include-MC/MCEventHeader_2.c.o: /cern/root/root/include/TInetAddress.h +../include-MC/MCEventHeader_2.c.o: /cern/root/root/include/TIterator.h +../include-MC/MCEventHeader_2.c.o: /cern/root/root/include/TList.h +../include-MC/MCEventHeader_2.c.o: /cern/root/root/include/TMath.h +../include-MC/MCEventHeader_2.c.o: /cern/root/root/include/TNamed.h +../include-MC/MCEventHeader_2.c.o: /cern/root/root/include/TObject.h +../include-MC/MCEventHeader_2.c.o: /cern/root/root/include/TROOT.h +../include-MC/MCEventHeader_2.c.o: /cern/root/root/include/TRefCnt.h +../include-MC/MCEventHeader_2.c.o: /cern/root/root/include/TSeqCollection.h +../include-MC/MCEventHeader_2.c.o: /cern/root/root/include/TStorage.h +../include-MC/MCEventHeader_2.c.o: /cern/root/root/include/TString.h +../include-MC/MCEventHeader_2.c.o: /cern/root/root/include/TUUID.h +../include-MC/MCEventHeader_2.c.o: /cern/root/root/include/Varargs.h ../include-MC/MCEventHeader_2.c.o: /usr/include/_G_config.h ../include-MC/MCEventHeader_2.c.o: /usr/include/alloca.h @@ -425,4 +515,5 @@ ../include-MC/MCEventHeader_2.c.o: /usr/include/g++/fstream.h ../include-MC/MCEventHeader_2.c.o: /usr/include/g++/iomanip.h +../include-MC/MCEventHeader_2.c.o: /usr/include/g++/iosfwd ../include-MC/MCEventHeader_2.c.o: /usr/include/g++/iostream.h ../include-MC/MCEventHeader_2.c.o: /usr/include/g++/streambuf.h @@ -438,6 +529,9 @@ ../include-MC/MCEventHeader_2.c.o: /usr/include/time.h /usr/include/wchar.h ../include-MC/MCEventHeader_2.c.o: /usr/include/xlocale.h +../include-MC/MCEventHeader_2.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/exception +../include-MC/MCEventHeader_2.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/float.h ../include-MC/MCEventHeader_2.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/stdarg.h ../include-MC/MCEventHeader_2.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/stddef.h +../include-MC/MCEventHeader_2.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/typeinfo ../include-MFadc/MFadc.c.o: ../include-MFadc/MFadc.hxx ../include-MFadc/MFadc.c.o: ../include-MFadc/MGFadcSignal.hxx @@ -446,4 +540,5 @@ ../include-MFadc/MFadc.c.o: /cern/root/root/include/Byteswap.h ../include-MFadc/MFadc.c.o: /cern/root/root/include/DllImport.h +../include-MFadc/MFadc.c.o: /cern/root/root/include/Foption.h ../include-MFadc/MFadc.c.o: /cern/root/root/include/G__ci.h ../include-MFadc/MFadc.c.o: /cern/root/root/include/Gtypes.h @@ -453,4 +548,6 @@ ../include-MFadc/MFadc.c.o: /cern/root/root/include/RConfig.h ../include-MFadc/MFadc.c.o: /cern/root/root/include/RVersion.h +../include-MFadc/MFadc.c.o: /cern/root/root/include/Riosfwd.h +../include-MFadc/MFadc.c.o: /cern/root/root/include/Rtypeinfo.h ../include-MFadc/MFadc.c.o: /cern/root/root/include/Rtypes.h ../include-MFadc/MFadc.c.o: /cern/root/root/include/TApplication.h @@ -460,4 +557,5 @@ ../include-MFadc/MFadc.c.o: /cern/root/root/include/TArrayD.h ../include-MFadc/MFadc.c.o: /cern/root/root/include/TArrayF.h +../include-MFadc/MFadc.c.o: /cern/root/root/include/TArrayI.h ../include-MFadc/MFadc.c.o: /cern/root/root/include/TArrayS.h ../include-MFadc/MFadc.c.o: /cern/root/root/include/TAttAxis.h @@ -485,4 +583,5 @@ ../include-MFadc/MFadc.c.o: /cern/root/root/include/TGDoubleSlider.h ../include-MFadc/MFadc.c.o: /cern/root/root/include/TGFileDialog.h +../include-MFadc/MFadc.c.o: /cern/root/root/include/TGFont.h ../include-MFadc/MFadc.c.o: /cern/root/root/include/TGFrame.h ../include-MFadc/MFadc.c.o: /cern/root/root/include/TGGC.h @@ -503,4 +602,5 @@ ../include-MFadc/MFadc.c.o: /cern/root/root/include/TGWidget.h ../include-MFadc/MFadc.c.o: /cern/root/root/include/TGWindow.h +../include-MFadc/MFadc.c.o: /cern/root/root/include/TGenericClassInfo.h ../include-MFadc/MFadc.c.o: /cern/root/root/include/TH1.h ../include-MFadc/MFadc.c.o: /cern/root/root/include/TH2.h @@ -526,4 +626,5 @@ ../include-MFadc/MFadc.c.o: /cern/root/root/include/TTime.h ../include-MFadc/MFadc.c.o: /cern/root/root/include/TTimer.h +../include-MFadc/MFadc.c.o: /cern/root/root/include/TUUID.h ../include-MFadc/MFadc.c.o: /cern/root/root/include/TVirtualHistPainter.h ../include-MFadc/MFadc.c.o: /cern/root/root/include/TVirtualPad.h @@ -582,4 +683,5 @@ ../include-MFadc/MFadc.c.o: /usr/include/ucontext.h /usr/include/unistd.h ../include-MFadc/MFadc.c.o: /usr/include/wchar.h /usr/include/xlocale.h +../include-MFadc/MFadc.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/exception ../include-MFadc/MFadc.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/float.h ../include-MFadc/MFadc.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/limits.h @@ -587,4 +689,5 @@ ../include-MFadc/MFadc.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/stddef.h ../include-MFadc/MFadc.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/syslimits.h +../include-MFadc/MFadc.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/typeinfo ../include-MFadc/MGFadcSignal.c.o: ../include-MFadc/MGFadcSignal.hxx ../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/Buttons.h @@ -592,4 +695,5 @@ ../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/Byteswap.h ../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/DllImport.h +../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/Foption.h ../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/G__ci.h ../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/Gtypes.h @@ -599,4 +703,6 @@ ../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/RConfig.h ../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/RVersion.h +../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/Riosfwd.h +../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/Rtypeinfo.h ../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/Rtypes.h ../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/TApplication.h @@ -606,4 +712,5 @@ ../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/TArrayD.h ../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/TArrayF.h +../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/TArrayI.h ../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/TArrayS.h ../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/TAttAxis.h @@ -632,4 +739,5 @@ ../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/TGDoubleSlider.h ../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/TGFileDialog.h +../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/TGFont.h ../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/TGFrame.h ../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/TGGC.h @@ -650,4 +758,5 @@ ../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/TGWidget.h ../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/TGWindow.h +../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/TGenericClassInfo.h ../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/TH1.h ../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/TH2.h @@ -678,4 +787,5 @@ ../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/TTime.h ../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/TTimer.h +../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/TUUID.h ../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/TVirtualHistPainter.h ../include-MFadc/MGFadcSignal.c.o: /cern/root/root/include/TVirtualPad.h @@ -742,4 +852,5 @@ ../include-MFadc/MGFadcSignal.c.o: /usr/include/unistd.h /usr/include/wchar.h ../include-MFadc/MGFadcSignal.c.o: /usr/include/xlocale.h +../include-MFadc/MGFadcSignal.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/exception ../include-MFadc/MGFadcSignal.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/float.h ../include-MFadc/MGFadcSignal.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/limits.h @@ -747,4 +858,5 @@ ../include-MFadc/MGFadcSignal.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/stddef.h ../include-MFadc/MGFadcSignal.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/syslimits.h +../include-MFadc/MGFadcSignal.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/typeinfo ../include-MLons/MLons.c.o: ../StarResponse/MStarLight.hxx ../include-MLons/MLons.c.o: ../include-MFadc/MFadc.hxx @@ -753,4 +865,5 @@ ../include-MLons/MLons.c.o: /cern/root/root/include/Byteswap.h ../include-MLons/MLons.c.o: /cern/root/root/include/DllImport.h +../include-MLons/MLons.c.o: /cern/root/root/include/Foption.h ../include-MLons/MLons.c.o: /cern/root/root/include/Gtypes.h ../include-MLons/MLons.c.o: /cern/root/root/include/Htypes.h @@ -758,4 +871,6 @@ ../include-MLons/MLons.c.o: /cern/root/root/include/RConfig.h ../include-MLons/MLons.c.o: /cern/root/root/include/RVersion.h +../include-MLons/MLons.c.o: /cern/root/root/include/Riosfwd.h +../include-MLons/MLons.c.o: /cern/root/root/include/Rtypeinfo.h ../include-MLons/MLons.c.o: /cern/root/root/include/Rtypes.h ../include-MLons/MLons.c.o: /cern/root/root/include/TArray.h @@ -763,4 +878,5 @@ ../include-MLons/MLons.c.o: /cern/root/root/include/TArrayD.h ../include-MLons/MLons.c.o: /cern/root/root/include/TArrayF.h +../include-MLons/MLons.c.o: /cern/root/root/include/TArrayI.h ../include-MLons/MLons.c.o: /cern/root/root/include/TArrayS.h ../include-MLons/MLons.c.o: /cern/root/root/include/TAttAxis.h @@ -777,6 +893,8 @@ ../include-MLons/MLons.c.o: /cern/root/root/include/TDirectory.h ../include-MLons/MLons.c.o: /cern/root/root/include/TFile.h +../include-MLons/MLons.c.o: /cern/root/root/include/TGenericClassInfo.h ../include-MLons/MLons.c.o: /cern/root/root/include/TH1.h ../include-MLons/MLons.c.o: /cern/root/root/include/THashList.h +../include-MLons/MLons.c.o: /cern/root/root/include/TInetAddress.h ../include-MLons/MLons.c.o: /cern/root/root/include/TIterator.h ../include-MLons/MLons.c.o: /cern/root/root/include/TList.h @@ -791,4 +909,5 @@ ../include-MLons/MLons.c.o: /cern/root/root/include/TStorage.h ../include-MLons/MLons.c.o: /cern/root/root/include/TString.h +../include-MLons/MLons.c.o: /cern/root/root/include/TUUID.h ../include-MLons/MLons.c.o: /cern/root/root/include/TVirtualHistPainter.h ../include-MLons/MLons.c.o: /cern/root/root/include/Varargs.h @@ -820,7 +939,9 @@ ../include-MLons/MLons.c.o: /usr/include/sys/types.h /usr/include/time.h ../include-MLons/MLons.c.o: /usr/include/wchar.h /usr/include/xlocale.h +../include-MLons/MLons.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/exception ../include-MLons/MLons.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/float.h ../include-MLons/MLons.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/stdarg.h ../include-MLons/MLons.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/stddef.h +../include-MLons/MLons.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/typeinfo ../include-MTrigger/MGTriggerSignal.c.o: ../include-MTrigger/MGTriggerSignal.hxx ../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/Buttons.h @@ -828,4 +949,5 @@ ../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/Byteswap.h ../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/DllImport.h +../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/Foption.h ../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/G__ci.h ../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/Gtypes.h @@ -835,4 +957,6 @@ ../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/RConfig.h ../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/RVersion.h +../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/Riosfwd.h +../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/Rtypeinfo.h ../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/Rtypes.h ../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/TApplication.h @@ -842,4 +966,5 @@ ../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/TArrayD.h ../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/TArrayF.h +../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/TArrayI.h ../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/TArrayS.h ../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/TAttAxis.h @@ -868,4 +993,5 @@ ../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/TGDoubleSlider.h ../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/TGFileDialog.h +../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/TGFont.h ../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/TGFrame.h ../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/TGGC.h @@ -886,4 +1012,5 @@ ../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/TGWidget.h ../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/TGWindow.h +../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/TGenericClassInfo.h ../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/TH1.h ../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/TH2.h @@ -914,4 +1041,5 @@ ../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/TTime.h ../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/TTimer.h +../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/TUUID.h ../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/TVirtualHistPainter.h ../include-MTrigger/MGTriggerSignal.c.o: /cern/root/root/include/TVirtualPad.h @@ -986,4 +1114,5 @@ ../include-MTrigger/MGTriggerSignal.c.o: /usr/include/wchar.h ../include-MTrigger/MGTriggerSignal.c.o: /usr/include/xlocale.h +../include-MTrigger/MGTriggerSignal.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/exception ../include-MTrigger/MGTriggerSignal.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/float.h ../include-MTrigger/MGTriggerSignal.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/limits.h @@ -991,4 +1120,5 @@ ../include-MTrigger/MGTriggerSignal.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/stddef.h ../include-MTrigger/MGTriggerSignal.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/syslimits.h +../include-MTrigger/MGTriggerSignal.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/typeinfo ../include-MTrigger/MTrigger.c.o: ../include-MTrigger/MGTriggerSignal.hxx ../include-MTrigger/MTrigger.c.o: ../include-MTrigger/MTrigger.hxx @@ -997,4 +1127,5 @@ ../include-MTrigger/MTrigger.c.o: /cern/root/root/include/Byteswap.h ../include-MTrigger/MTrigger.c.o: /cern/root/root/include/DllImport.h +../include-MTrigger/MTrigger.c.o: /cern/root/root/include/Foption.h ../include-MTrigger/MTrigger.c.o: /cern/root/root/include/G__ci.h ../include-MTrigger/MTrigger.c.o: /cern/root/root/include/Gtypes.h @@ -1004,4 +1135,6 @@ ../include-MTrigger/MTrigger.c.o: /cern/root/root/include/RConfig.h ../include-MTrigger/MTrigger.c.o: /cern/root/root/include/RVersion.h +../include-MTrigger/MTrigger.c.o: /cern/root/root/include/Riosfwd.h +../include-MTrigger/MTrigger.c.o: /cern/root/root/include/Rtypeinfo.h ../include-MTrigger/MTrigger.c.o: /cern/root/root/include/Rtypes.h ../include-MTrigger/MTrigger.c.o: /cern/root/root/include/TApplication.h @@ -1011,4 +1144,5 @@ ../include-MTrigger/MTrigger.c.o: /cern/root/root/include/TArrayD.h ../include-MTrigger/MTrigger.c.o: /cern/root/root/include/TArrayF.h +../include-MTrigger/MTrigger.c.o: /cern/root/root/include/TArrayI.h ../include-MTrigger/MTrigger.c.o: /cern/root/root/include/TArrayS.h ../include-MTrigger/MTrigger.c.o: /cern/root/root/include/TAttAxis.h @@ -1038,4 +1172,5 @@ ../include-MTrigger/MTrigger.c.o: /cern/root/root/include/TGDoubleSlider.h ../include-MTrigger/MTrigger.c.o: /cern/root/root/include/TGFileDialog.h +../include-MTrigger/MTrigger.c.o: /cern/root/root/include/TGFont.h ../include-MTrigger/MTrigger.c.o: /cern/root/root/include/TGFrame.h ../include-MTrigger/MTrigger.c.o: /cern/root/root/include/TGGC.h @@ -1056,4 +1191,5 @@ ../include-MTrigger/MTrigger.c.o: /cern/root/root/include/TGWidget.h ../include-MTrigger/MTrigger.c.o: /cern/root/root/include/TGWindow.h +../include-MTrigger/MTrigger.c.o: /cern/root/root/include/TGenericClassInfo.h ../include-MTrigger/MTrigger.c.o: /cern/root/root/include/TH1.h ../include-MTrigger/MTrigger.c.o: /cern/root/root/include/TH2.h @@ -1079,4 +1215,5 @@ ../include-MTrigger/MTrigger.c.o: /cern/root/root/include/TTime.h ../include-MTrigger/MTrigger.c.o: /cern/root/root/include/TTimer.h +../include-MTrigger/MTrigger.c.o: /cern/root/root/include/TUUID.h ../include-MTrigger/MTrigger.c.o: /cern/root/root/include/TVirtualHistPainter.h ../include-MTrigger/MTrigger.c.o: /cern/root/root/include/TVirtualPad.h @@ -1142,4 +1279,5 @@ ../include-MTrigger/MTrigger.c.o: /usr/include/unistd.h /usr/include/wchar.h ../include-MTrigger/MTrigger.c.o: /usr/include/xlocale.h +../include-MTrigger/MTrigger.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/exception ../include-MTrigger/MTrigger.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/float.h ../include-MTrigger/MTrigger.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/limits.h @@ -1147,8 +1285,10 @@ ../include-MTrigger/MTrigger.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/stddef.h ../include-MTrigger/MTrigger.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/syslimits.h +../include-MTrigger/MTrigger.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/typeinfo camera.c.o: ../../../include-Classes/MBase/MAGIC.h camera.c.o: ../../../include-Classes/MBase/MArray.h camera.c.o: ../../../include-Classes/MBase/MLog.h camera.c.o: ../../../include-Classes/MBase/MParContainer.h +camera.c.o: ../../../include-Classes/MBase/MTime.h camera.c.o: ../../../include-Classes/MMcFormat/MFadcDefine.h camera.c.o: ../../../include-Classes/MMcFormat/MMcConfigRunHeader.h @@ -1161,25 +1301,31 @@ camera.c.o: ../../../include-Classes/MMcFormat/MTriggerDefine.h camera.c.o: ../../../include-Classes/MMcFormat/Mdefine.h -camera.c.o: ../../../include-Classes/MRawFormat/MCamEvent.h +camera.c.o: ../../../include-Classes/MRawFormat/MRawCrateArray.h camera.c.o: ../../../include-Classes/MRawFormat/MRawCrateData.h camera.c.o: ../../../include-Classes/MRawFormat/MRawEvtData.h camera.c.o: ../../../include-Classes/MRawFormat/MRawEvtHeader.h camera.c.o: ../../../include-Classes/MRawFormat/MRawRunHeader.h +camera.c.o: ../../../include-Classes/mgeom/MCamEvent.h camera.c.o: ../../../include-Classes/mgeom/MGeomCam.h +camera.c.o: ../../../include-Classes/mgeom/MGeomCamCT1.h +camera.c.o: ../../../include-Classes/mgeom/MGeomCamCT1Daniel.h +camera.c.o: ../../../include-Classes/mgeom/MGeomCamECO1000.h +camera.c.o: ../../../include-Classes/mgeom/MGeomCamECO1000HG.h camera.c.o: ../../../include-Classes/mgeom/MGeomCamMagic.h +camera.c.o: ../../../include-Classes/mgeom/MGeomCamMagic919.h +camera.c.o: ../../../include-Classes/mgeom/MGeomCamMagicHG.h camera.c.o: ../../../include-Classes/mgeom/MGeomMirror.h camera.c.o: ../../../include-Classes/mgeom/MGeomPMT.h camera.c.o: ../../../include-Classes/mgeom/MGeomPix.h camera.c.o: ../StarResponse/MStarLight.hxx -camera.c.o: ../include-CORSIKA/COREventHeader.hxx ../include-GENERAL/Rtypes.h -camera.c.o: ../include-GENERAL/jcdebug.h ../include-GENERAL/jcmacros.h -camera.c.o: ../include-GENERAL/ranlib.h ../include-MC/MCCphoton.hxx -camera.c.o: ../include-MC/MCEventHeader.hxx ../include-MC/MCEventHeader_2.hxx -camera.c.o: ../include-MC/MCRunHeader.hxx ../include-MFadc/MFadc.hxx -camera.c.o: ../include-MLons/MLons.hxx ../include-MTrigger/MTrigger.hxx -camera.c.o: /cern/root/root/include/Buttons.h /cern/root/root/include/Bytes.h -camera.c.o: /cern/root/root/include/Byteswap.h +camera.c.o: ../include-CORSIKA/COREventHeader.hxx ../include-GENERAL/jcdebug.h +camera.c.o: ../include-GENERAL/jcmacros.h ../include-GENERAL/ranlib.h +camera.c.o: ../include-MC/MCCphoton.hxx ../include-MC/MCEventHeader.hxx +camera.c.o: ../include-MC/MCEventHeader_2.hxx ../include-MC/MCRunHeader.hxx +camera.c.o: ../include-MFadc/MFadc.hxx ../include-MLons/MLons.hxx +camera.c.o: ../include-MTrigger/MTrigger.hxx /cern/root/root/include/Buttons.h +camera.c.o: /cern/root/root/include/Bytes.h /cern/root/root/include/Byteswap.h camera.c.o: /cern/root/root/include/DllImport.h -camera.c.o: /cern/root/root/include/Gtypes.h +camera.c.o: /cern/root/root/include/Foption.h /cern/root/root/include/Gtypes.h camera.c.o: /cern/root/root/include/GuiTypes.h camera.c.o: /cern/root/root/include/Htypes.h @@ -1187,4 +1333,6 @@ camera.c.o: /cern/root/root/include/RConfig.h camera.c.o: /cern/root/root/include/RVersion.h +camera.c.o: /cern/root/root/include/Riosfwd.h +camera.c.o: /cern/root/root/include/Rtypeinfo.h camera.c.o: /cern/root/root/include/Rtypes.h camera.c.o: /cern/root/root/include/TApplication.h @@ -1209,11 +1357,15 @@ camera.c.o: /cern/root/root/include/TClonesArray.h camera.c.o: /cern/root/root/include/TCollection.h -camera.c.o: /cern/root/root/include/TCut.h /cern/root/root/include/TDatime.h +camera.c.o: /cern/root/root/include/TDatime.h camera.c.o: /cern/root/root/include/TDictionary.h camera.c.o: /cern/root/root/include/TDirectory.h -camera.c.o: /cern/root/root/include/TFile.h /cern/root/root/include/TH1.h -camera.c.o: /cern/root/root/include/THashList.h +camera.c.o: /cern/root/root/include/TError.h /cern/root/root/include/TFile.h +camera.c.o: /cern/root/root/include/TGenericClassInfo.h +camera.c.o: /cern/root/root/include/TH1.h /cern/root/root/include/THashList.h +camera.c.o: /cern/root/root/include/TInetAddress.h camera.c.o: /cern/root/root/include/TIterator.h camera.c.o: /cern/root/root/include/TList.h /cern/root/root/include/TMath.h +camera.c.o: /cern/root/root/include/TMatrix.h +camera.c.o: /cern/root/root/include/TMatrixUtils.h camera.c.o: /cern/root/root/include/TNamed.h camera.c.o: /cern/root/root/include/TObjArray.h @@ -1227,5 +1379,8 @@ camera.c.o: /cern/root/root/include/TString.h camera.c.o: /cern/root/root/include/TStringLong.h -camera.c.o: /cern/root/root/include/TTree.h +camera.c.o: /cern/root/root/include/TTime.h /cern/root/root/include/TTree.h +camera.c.o: /cern/root/root/include/TUUID.h /cern/root/root/include/TVector.h +camera.c.o: /cern/root/root/include/TVector2.h +camera.c.o: /cern/root/root/include/TVector3.h camera.c.o: /cern/root/root/include/TVirtualHistPainter.h camera.c.o: /cern/root/root/include/TVirtualPad.h @@ -1238,11 +1393,12 @@ camera.c.o: /usr/include/bits/local_lim.h /usr/include/bits/mathcalls.h camera.c.o: /usr/include/bits/mathdef.h /usr/include/bits/nan.h -camera.c.o: /usr/include/bits/posix1_lim.h /usr/include/bits/posix_opt.h -camera.c.o: /usr/include/bits/pthreadtypes.h /usr/include/bits/sched.h -camera.c.o: /usr/include/bits/select.h /usr/include/bits/sigset.h -camera.c.o: /usr/include/bits/stdio_lim.h /usr/include/bits/time.h -camera.c.o: /usr/include/bits/types.h /usr/include/bits/waitflags.h -camera.c.o: /usr/include/bits/waitstatus.h /usr/include/bits/wchar.h -camera.c.o: /usr/include/bits/wordsize.h /usr/include/dirent.h +camera.c.o: /usr/include/bits/posix1_lim.h /usr/include/bits/posix2_lim.h +camera.c.o: /usr/include/bits/posix_opt.h /usr/include/bits/pthreadtypes.h +camera.c.o: /usr/include/bits/sched.h /usr/include/bits/select.h +camera.c.o: /usr/include/bits/sigset.h /usr/include/bits/stdio_lim.h +camera.c.o: /usr/include/bits/time.h /usr/include/bits/types.h +camera.c.o: /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h +camera.c.o: /usr/include/bits/wchar.h /usr/include/bits/wordsize.h +camera.c.o: /usr/include/bits/xopen_lim.h /usr/include/dirent.h camera.c.o: /usr/include/endian.h /usr/include/features.h camera.c.o: /usr/include/g++/fstream.h /usr/include/g++/iomanip.h @@ -1251,5 +1407,5 @@ camera.c.o: /usr/include/g++/streambuf.h /usr/include/gconv.h camera.c.o: /usr/include/getopt.h /usr/include/gnu/stubs.h -camera.c.o: /usr/include/libgen.h /usr/include/libio.h +camera.c.o: /usr/include/libgen.h /usr/include/libio.h /usr/include/limits.h camera.c.o: /usr/include/linux/limits.h /usr/include/math.h camera.c.o: /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h @@ -1258,7 +1414,11 @@ camera.c.o: /usr/include/time.h /usr/include/unistd.h /usr/include/wchar.h camera.c.o: /usr/include/xlocale.h +camera.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/exception camera.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/float.h +camera.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/limits.h camera.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/stdarg.h camera.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/stddef.h +camera.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/syslimits.h +camera.c.o: /usr/lib/gcc-lib/i486-suse-linux/2.95.3/include/typeinfo camera.c.o: camera-v.h camera.h creadparam.h moments.h creadparam.c.o: ../../../include-Classes/MMcFormat/MFadcDefine.h Index: trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.darwin =================================================================== --- trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.darwin (revision 3044) +++ trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.darwin (revision 3045) @@ -29,5 +29,6 @@ # For producing gmon.out use '-pg' -MARS_LIB = -Llib $(SUBDIRS:%=-l%) $(MARSLIBS) +#MARS_LIB = -Llib $(SUBDIRS:%=-l%) $(MARSLIBS) +MARS_LIB = -Llib $(MARSLIBS) INCLUDES = -I. $(SUBDIRS:%=-I%) Index: trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.general =================================================================== --- trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.general (revision 3044) +++ trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.general (revision 3045) @@ -4,6 +4,6 @@ ROOTVER = `root-config --version` -ROOTLIBS = `root-config --libs` -lMinuit -lHistPainter -ROOTGLIBS = `root-config --glibs` -lMinuit -lHistPainter +ROOTLIBS = `root-config --libs` -lMinuit -lHistPainter -lThread +ROOTGLIBS = `root-config --glibs` -lMinuit -lHistPainter -lThread ROOTCFLAGS = `root-config --cflags` @@ -18,5 +18,5 @@ # export MARSLIBS="-lX11 -lXpm -L/usr/X11R6/lib" # -DEFINES = -DMARSVER=\"\\" -DROOTVER=\"$(ROOTVER)\" $(ARCHDEF) $(MARSDEFINES) +DEFINES = -DMARSVER=\"\\" -D__MARS__ -DROOTVER=\"$(ROOTVER)\" $(ARCHDEF) $(MARSDEFINES) CXXFLAGS = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) $(DEFINES) Index: trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.linux =================================================================== --- trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.linux (revision 3044) +++ trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.linux (revision 3045) @@ -27,7 +27,8 @@ # For debugging information use '-g' -# For producing gmon.out use '-pg' +# For producing gmon.out use '-pg' (needs static linking) -MARS_LIB = -Llib $(SUBDIRS:%=-l%) $(MARSLIBS) +#MARS_LIB = -Llib $(SUBDIRS:%=-l%) $(MARSLIBS) +MARS_LIB = -Llib $(MARSLIBS) INCLUDES = -I. $(SUBDIRS:%=-I%) Index: trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.linux-gnu =================================================================== --- trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.linux-gnu (revision 3044) +++ trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.linux-gnu (revision 3045) @@ -21,5 +21,5 @@ OPTIM = -O5 -Wall -fno-rtti -fnonnull-objects -fno-exceptions -fPIC -Wtraditional -Wpointer-arith -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Woverloaded-virtual -DEBUG = +DEBUG = ARCHDEF = -D__LINUX__ DYNLIB = -shared @@ -32,5 +32,6 @@ # For producing gmon.out use '-pg' -MARS_LIB = -Llib $(SUBDIRS:%=-l%) $(MARSLIBS) +#MARS_LIB = -Llib $(SUBDIRS:%=-l%) $(MARSLIBS) +MARS_LIB = -Llib $(MARSLIBS) INCLUDES = -I. $(SUBDIRS:%=-I%) Index: trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.osf1 =================================================================== --- trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.osf1 (revision 3044) +++ trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.osf1 (revision 3045) @@ -28,5 +28,6 @@ DYNLIB = -shared -MARS_LIB = -Llib $(SUBDIRS/*/-l&) $(MARSLIBS) +#MARS_LIB = -Llib $(SUBDIRS/*/-l&) $(MARSLIBS) +MARS_LIB = -Llib $(MARSLIBS) INCLUDES = -I. $(SUBDIRS/*/-I&) Index: trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.osf5.1 =================================================================== --- trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.osf5.1 (revision 3044) +++ trunk/MagicSoft/Simulation/Detector/Camera/Makefile.conf.osf5.1 (revision 3045) @@ -28,5 +28,6 @@ DYNLIB = -shared -MARS_LIB = -Llib $(SUBDIRS/*/-l&) $(MARSLIBS) +#MARS_LIB = -Llib $(SUBDIRS/*/-l&) $(MARSLIBS) +MARS_LIB = -Llib $(MARSLIBS) INCLUDES = -I. $(SUBDIRS/*/-I&) Index: trunk/MagicSoft/Simulation/Detector/Camera/Makefile.rules =================================================================== --- trunk/MagicSoft/Simulation/Detector/Camera/Makefile.rules (revision 3044) +++ trunk/MagicSoft/Simulation/Detector/Camera/Makefile.rules (revision 3045) @@ -1,13 +1,10 @@ +include $(CINT)Dep.d -depend: - @makedepend $(SRCS) $(INCLUDES) -I$(INCLUDE_CPLUS) $(ROOTCFLAGS) \ - -f Makefile.depend 2> kk.kk ; cat kk.kk - -$(LIB): $(OBJS) $(HEADERS) $(CINT)Cint.o +$(LIB): $(OBJS) $(CINT)Cint.o @echo " - Building Library lib$(LIB)" $(AR) $(LIB) *.o @echo " " -$(CINT)Cint.cc: $(HEADERS) +$(CINT)Cint.cc: $(HEADERS) $(CINT)LinkDef.h @echo " - Generating dictionary $(CINT)Cint.cc" @@ -15,15 +12,22 @@ -c $(INCLUDES) $(DEFINES) $(HEADERS) $(CINT)Incl.h $(CINT)LinkDef.h -.cxx.o: +%.d: + @echo " - Generating dependencies" $@ + $(ROOTSYS)/bin/rmkdepend -f- -Y -w 3000 -- $(INCLUDES) -- $(SRCFILES) 2> /dev/null | \ + sed 's/^\(.*\).o:/$@ \1.o:/' > $@ + echo "$@: Makefile" >> $@ + +%.o: %.cxx @echo " - Compiling" $< $(CXX) $(CXXFLAGS) -c $< -o $@ -.cc.o: +%.o: %.cc @echo " - Compiling" $< $(CXX) $(CXXFLAGS) -c $< -o $@ -.c.o: +%.o: %.c @echo " - Compiling" $< $(CC) $(CFLAGS) -c $< -o $@ + # # The cleaning facility @@ -43,4 +47,8 @@ @rm -f *.o +rmdep: + @echo " Removing dependency file..." + @rm -f *Dep.d + rmcore: @echo " Removing core files..." @@ -49,5 +57,5 @@ rmbin: @echo " Removing binary files..." - @rm -f $(PROGRAMS) lib/$(SOLIB) so_locations + @rm -f $(PROGRAMS) $(SOLIB) so_locations rmbak: @@ -65,4 +73,6 @@ ls htmldoc/* | grep "htmldoc/" | grep -v images | grep -v CVS | xargs rm -f +clean: rmcint rmobjs rmdep rmcore rmlib + cflags: @echo $(INCLUDES) $(CXXFLAGS) Index: trunk/MagicSoft/Simulation/Detector/Camera/config.mk.Linux =================================================================== --- trunk/MagicSoft/Simulation/Detector/Camera/config.mk.Linux (revision 3044) +++ trunk/MagicSoft/Simulation/Detector/Camera/config.mk.Linux (revision 3045) @@ -18,7 +18,7 @@ #--------------------------------------------------------------- # $RCSfile: config.mk.Linux,v $ -# $Revision: 1.6 $ +# $Revision: 1.7 $ # $Author: blanch $ -# $Date: 2002-09-04 10:03:03 $ +# $Date: 2004-02-06 17:40:10 $ ################################################################## # @maintitle @@ -56,10 +56,10 @@ INCLUDE_CPLUS = /usr/include/g++ -OPTIM = -O2 -Wall -fno-rtti -fno-exceptions -fPIC +OPTIM = -O5 -Wall -fno-exceptions -fPIC -Wpointer-arith -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Woverloaded-virtual DEBUG = -g # libraries -ROOTLIBS = `root-config --libs` +ROOTLIBS = `root-config --libs` -lMinuit -lHistPainter -lThread # -L/CERN/root/lib -lNew -lCore -lCint -lHist \ @@ -67,5 +67,5 @@ # -lMatrix -lPhysics -lm -ROOTGLIBS = `root-config --glibs` +ROOTGLIBS = `root-config --glibs` -lMinuit -lHistPainter -lThread # 0-L/CERN/root/lib -lNew -lCore -lCint -lHist \ @@ -75,4 +75,6 @@ GLIBS = $(ROOTLIBS) $(ROOTGLIBS) +ROOTVER = `root-config --version` +ROOTCFLAGS= `root-config --cflags` Index: trunk/MagicSoft/Simulation/Detector/Camera/config.mk.linux =================================================================== --- trunk/MagicSoft/Simulation/Detector/Camera/config.mk.linux (revision 3044) +++ trunk/MagicSoft/Simulation/Detector/Camera/config.mk.linux (revision 3045) @@ -18,7 +18,7 @@ #--------------------------------------------------------------- # $RCSfile: config.mk.linux,v $ -# $Revision: 1.3 $ +# $Revision: 1.4 $ # $Author: blanch $ -# $Date: 2004-01-30 09:52:59 $ +# $Date: 2004-02-06 17:39:51 $ ################################################################## # @maintitle @@ -56,10 +56,11 @@ INCLUDE_CPLUS = /usr/include/g++ -OPTIM = -O2 -Wall -fno-rtti -fno-exceptions -fPIC +# OPTIM = -O2 -Wall -fno-rtti -fno-exceptions -fPIC +OPTIM = -O5 -Wall -fno-exceptions -fPIC -Wpointer-arith -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Woverloaded-virtual DEBUG = -g # libraries -ROOTLIBS = `root-config --libs` +ROOTLIBS = `root-config --libs` -lMinuit -lHistPainter -lThread # -L/CERN/root/lib -lNew -lCore -lCint -lHist \ @@ -67,9 +68,13 @@ # -lMatrix -lPhysics -lm -ROOTGLIBS = `root-config --glibs` +ROOTGLIBS = `root-config --glibs` -lMinuit -lHistPainter -lThread # 0-L/CERN/root/lib -lNew -lCore -lCint -lHist \ # -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript \ # -lMatrix -lPhysics -lGui -lm + +ROOTVER = `root-config --version` +ROOTCFLAGS= `root-config --cflags` + GLIBS = $(ROOTLIBS) $(ROOTGLIBS) Index: trunk/MagicSoft/Simulation/Detector/Camera/config.mk.linux-gnu =================================================================== --- trunk/MagicSoft/Simulation/Detector/Camera/config.mk.linux-gnu (revision 3044) +++ trunk/MagicSoft/Simulation/Detector/Camera/config.mk.linux-gnu (revision 3045) @@ -18,7 +18,7 @@ #--------------------------------------------------------------- # $RCSfile: config.mk.linux-gnu,v $ -# $Revision: 1.7 $ +# $Revision: 1.8 $ # $Author: blanch $ -# $Date: 2002-09-04 10:04:45 $ +# $Date: 2004-02-06 17:40:21 $ ################################################################## # @maintitle @@ -56,10 +56,10 @@ INCLUDE_CPLUS = /usr/include/g++ -OPTIM = -O2 -Wall -fno-rtti -fno-exceptions -fPIC +OPTIM = -O5 -Wall -fno-exceptions -fPIC -Wpointer-arith -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Woverloaded-virtual DEBUG = -g # libraries -ROOTLIBS = `root-config --libs` +ROOTLIBS = `root-config --libs` -lMinuit -lHistPainter -lThread # -L/CERN/root/lib -lNew -lCore -lCint -lHist \ @@ -67,5 +67,5 @@ # -lMatrix -lPhysics -lm -ROOTGLIBS = `root-config --glibs` +ROOTGLIBS = `root-config --glibs` -lMinuit -lHistPainter -lThread # -L/CERN/root/lib -lNew -lCore -lCint -lHist \ @@ -75,4 +75,6 @@ GLIBS = $(ROOTLIBS) $(ROOTGLIBS) +ROOTVER = `root-config --version` +ROOTCFLAGS= `root-config --cflags` Index: trunk/MagicSoft/Simulation/Detector/Camera/config.mk.osf1 =================================================================== --- trunk/MagicSoft/Simulation/Detector/Camera/config.mk.osf1 (revision 3044) +++ trunk/MagicSoft/Simulation/Detector/Camera/config.mk.osf1 (revision 3045) @@ -18,7 +18,7 @@ #--------------------------------------------------------------- # $RCSfile: config.mk.osf1,v $ -# $Revision: 1.9 $ +# $Revision: 1.10 $ # $Author: blanch $ -# $Date: 2002-09-04 10:06:54 $ +# $Date: 2004-02-06 17:40:41 $ ################################################################## # @maintitle @@ -57,15 +57,14 @@ INCLUDE_CPLUS = /usr/include/cxx -OPTIM = -ieee -arch host -#OPTIM = -O2 -Wall -fno-rtti -fno-exceptions -fPIC +OPTIM = -O2 -ieee -arch host -lpthread DEBUG = -g -w0 -msg_display_tag -msg_disable castqualtyp,undpreid,unrfunprm,extrasemi,intconlosbit,nonfundec,partovrd,stoclsnotfirst,boolexprconst # libraries -ROOTLIBS = `root-config --libs` +ROOTLIBS = `root-config --libs` -lMinuit -lHistPainter -lThread #ROOTLIBS = -L${ROOTSYS}/lib -lNew -lCore -lCint -lHist \ # -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript \ # -lMatrix -lPhysics -lm -ROOTGLIBS = `root-config --glibs` +ROOTGLIBS = `root-config --glibs` -lMinuit -lHistPainter -lThread #ROOTGLIBS = -L${ROOTSYS}/lib -lNew -lCore -lCint -lHist \ # -lGraf -lGraf3d -lGpad -lTree -lRint -lPostscript \