--- PamelaDigitizer/Makefile	2008/09/25 08:49:42	1.11
+++ PamelaDigitizer/Makefile	2009/08/11 14:56:31	1.17
@@ -1,6 +1,6 @@
 # PamelaDigitizer
 # SOFTWARE VERSION
-VER= v3r00
+VER= v3r05
 # An almost general purpouse Makefile for PAMELA repository
 # Let's start with some useful definition to make the echo colored
 RED='\E[1;31;40m'
@@ -42,20 +42,26 @@
 
 # Compilers settings
 ROOTCFLAGS  =`root-config --cflags`
-ROOTLDFLAGS =`root-config --ldflags`
+ROOTLDFLAGS =`root-config --ldflags` 
 ROOTLIBS    =`root-config --libs` -lHbook
-CERNLIBS    =`cernlib_noshift kernlib,packlib,genlib`
-F77LIBS     =-lg2c -lnsl
+#CERNLIBS    =`cernlib_noshift kernlib,packlib,genlib`
+CERNLIBS    =
+#F77LIBS     =-lg2c -lnsl
+F77LIBS     =--lnsl
 SYSLIBS     =-lm -ldl -rdynamic
 LD          =g++
 CXXFLAGS= -O3 -Wall -fPIC ${ROOTCFLAGS} ${PAM_BIT}
 #CXXFLAGS= -g -Wall -O ${ROOTCFLAGS} ${PAM_BIT}
 # flags needed on the pamelatov's:
-#LDFLAGS = $(PAM_BIT) 
-LDFLAGS = -lmathlib -lpacklib -lkernlib -llapack -lg2c -lm -lnsl -lcrypt -L/cern/2005/lib $(PAM_BIT)
+
+#LDFLAGS = $(PAM_BIT) -g -lmathlib -lpacklib -lkernlib -llapack -lg2c -lm -lnsl -lcrypt -L/cern/2005/lib
+#LDFLAGS = -g -llapack -lg2c -lm -lnsl -lcrypt -L/cern/2005/lib
+LDFLAGS = $(PAM_BIT) $(CERNLIBS)
+#LDFLAGS = -lmathlib -lpacklib -lkernlib -llapack -lg2c -lm -lnsl -lcrypt -L/cern/2005/lib $(PAM_BIT)
+
 #LDFLAGS = -g -llapack -lg2c -lm -lnsl -lcrypt -L/cern/2005/lib $(PAM_BIT)
 
-CXXSRCS=  Digitizer.cxx DigitizeRunHeader.cxx DigitizeCalo.cxx DigitizeTOF.cxx DigitizeAC.cxx DigitizeS4.cxx DigitizeND.cxx  Write.cxx DigitizeTRK.cxx Pamelagp2Digits.cxx DigitVersion.cxx
+CXXSRCS= Digitizer.cxx DigitizePSCU.cxx DigitizeCalo.cxx DigitizeTOF.cxx DigitizeAC.cxx DigitizeS4.cxx DigitizeND.cxx  Write.cxx DigitizeTRK.cxx Pamelagp2Digits.cxx DigitVersion.cxx
 OBJS=$(CXXSRCS:%.cxx=%.o)
 
 CPPSRCS= CRC.cpp calcrc.cpp 
@@ -88,7 +94,7 @@
 	@rm -f *.o
 
 Digitizer: Digitizer.o ${OBJS} ${DICO}
-	$(LD) $(LDFLAGS) -o $@ $^ ${ROOTLIBS} ${CERNLIBS} ${F77LIBS} ${SYSLIBS}	
+	$(LD) $(LDFLAGS) -o $@ $^ ${ROOTLIBS} ${CERNLIBS} ${F77LIBS} ${SYSLIBS}
 
 depend: ${DEPS}
 
@@ -111,7 +117,7 @@
 
 mkverpath:
 	@(${EGREEN} creating file DigitVersion.cxx; ${RESET})
-	@echo '#include <TSystem.h>' >  DigitVersion.cxx; echo ' char *DigitizerInfo(bool print){ if ( print ) printf("\nPAMELA PamelaDigitizer version: ${VER}\n\nCompiled on '${TODAY}' with: '${GCCVER}'\n\nOn: '${UNAMEA}'\n\n"); return("${VER}"); }' >>  DigitVersion.cxx
+	@echo '#include <TSystem.h>' >  DigitVersion.cxx; echo ' const char *DigitizerInfo(bool print){ if ( print ) printf("\nPAMELA PamelaDigitizer version: ${VER}\n\nCompiled on '${TODAY}' with: '${GCCVER}'\n\nOn: '${UNAMEA}'\n\n"); return("${VER}"); }' >>  DigitVersion.cxx
 	@sleep 1.2
 
 clean:
@@ -130,6 +136,7 @@
 	@echo " Removing Pamelagp2Digits ....."
 	@rm -f ${JUNK}
 	@rm -f Pamelagp2Digits; ${RESET}
+	@touch DigitVersion.cxx
 
 install:
 #	@echo "TEST: copying the executable in the PAM_BIN directory";