--- gpamela/Makefile	2002/07/11 16:01:58	3.1.1.1
+++ gpamela/Makefile	2005/12/06 11:34:07	3.11
@@ -22,20 +22,23 @@
 	gpamela/guphad.F gpamela/gustep.F \
 	gpamela/gutrak.F gpamela/gutrev.F \
 	gpamela/gviewyz.F gpamela/n2g.F \
-	gpamela/uginit.F gpamela/uglast.F
+	gpamela/uginit.F gpamela/uglast.F \
+	gpamela/gprnhran.F
 GPCALSRCS = gpcal/gpcalv.F gpcal/gpce.F gpcal/gpdcal.F \
 	gpcal/gpg10c.F gpcal/gpg10.F gpcal/gpsica.F \
 	gpcal/gpucal.F gpcal/gpw2.F gpcal/gpw.F 
 GPCASSRCS = gpcas/gpcasv.F gpcas/gpdcas.F gpcas/gpucas.F
 GPCATSRCS = gpcat/gpcatv.F gpcat/gpdcat.F gpcat/gpucat.F 
-GPFIELDSRCS = gpfield/flin3.F gpfield/gufld.F 
+GPFIELDSRCS = gpfield/flin3.F gpfield/gufld.F gpfield/gprbi.F \
+	gpfield/inter_B.F gpfield/inter_B_inner.F 
 GPGARSRCS = gpgar/gpgacl.F  gpgar/gpgapart.F gpgar/gpgarin.F \
 	gpgar/gpgarsel.F gpgar/gptogar.F gpgar/grinit.F 
 GPHYSSRCSRCS = gphys/gfluct.F
 GPMAINSRCS = gpmain/gpmain.F 
 GPSPESRCS  = gpspe/gpcp.F gpspe/gpdspe.F gpspe/gpfe.F \
 	gpspe/gpkap.F gpspe/gpmaspe.F gpspe/gproa.F \
-	gpspe/gpsitr.F gpspe/gpspema.F gpspe/gpspev.F gpspe/gpuspe.F 
+	gpspe/gpsitr.F gpspe/gpspema.F gpspe/gpspev.F gpspe/gpuspe.F \
+	gpspe/gprspe.F 
 GPTOFSRCS = gptof/gpdtof.F gptof/gpscin.F gptof/gpscint.F \
 	gptof/gptofv.F gptof/gputof.F 
 GPTRDSRCS = gptrd/gpdtrd.F gptrd/gptrad.F gptrd/gptrdv.F \
@@ -57,11 +60,12 @@
 GPINC = gpcdes
 CERNLIB = `cernlib geant,genlib,pawlib,graflib/X11,packlib,mathlib`
 GPLIBDIR = ./lib
-GPLIB = ${GPLIBDIR}/libgarfield-7.a 
+GPLIB = ${GPLIBDIR}/libgarfield-7.a
 #
 BIN = ./bin
 AUX = ./aux
-AUXFILES = ${AUX}/gpfield.rz ${AUX}/GPAMELA.FFR ${AUX}/TRD_ATT.DAT ${AUX}/PROVA.GAR
+AUXFILES = ${AUX}/gpfield.rz ${AUX}/GPAMELA.FFR ${AUX}/TRD_ATT.DAT ${AUX}/GARFIELD.GAR \
+$(AUX)/xe_80_co2_20.gas $(AUX)/measure_n3_290302.rz $(AUX)/measure_n4_110402_corrected.rz $(AUX)/resxy_new.rz $(AUX)/INPUTSEED.DAT $(AUX)/readseeds.f $(AUX)/writeseeds.f
 GARFIELDSRC = ./garfield/src
 #
 INTERFLAGS = -DGPAMELA_UNIX -DGPAMELA_TYPE -DGPAMELA_X11 -DGPAMELA_INTER -DGPAMELA_HIGZ \
@@ -73,7 +77,7 @@
 DEBFLAGS =  -g -fdebug-kludge
 FFLAGS = -fvxt -fno-automatic -Wno-globals -I${GPINC} -I${GEANTINC} ${BATCHFLAGS}
 LDFLAGS= ${GPLIB} ${CERNLIB}
-PHONY: distclean clean createdir install 
+
 
 gpamelax11.exe: FFLAGS =  -fvxt -fno-automatic -Wno-globals -I${GPINC} -I${GEANTINC} ${INTERFLAGS}
 gpamelax11.exe: createdir  ${GPLIBDIR}/libgarfield-7.a ${GPSRCS} ${GPOBJS} ${GPDEPENDS}  ${GPXINTSRCS} ${GPXINTOBJS} ${GPXINTDEPENDS} 
@@ -97,11 +101,11 @@
 	@rm -f ${GPOBJS) ${GPXINTOBJS}
 
 gpamela_deb.exe: FFLAGS =  -fvxt -fno-automatic -Wno-globals  ${DEBFLAGS} -I${GPINC} -I${GEANTINC} ${BATCHFLAGS}
-gpamela_deb.exe: createdir ${GPLIBDIR}/libgarfield-7.a ${GPSRCS} ${GPOBJS} ${GPDEPENDS}  ${GPXINTSRCS} ${GPXINTOBJS} ${GPXINTDEPENDS}
+gpamela_deb.exe: createdir ${GPLIBDIR}/libgarfield-7.a ${GPSRCS} ${GPOBJS} ${GPDEPENDS}  ${GPMAINSRCS} ${GPMAINOBJS} ${GPMAINDEPENDS}
 	@echo Creating $@ .....
-	$(FC) -o ${BIN}/$@ ${GPOBJS} ${GPXINTOBJS} ${LDFLAGS}
+	$(FC) -o ${BIN}/$@ ${GPOBJS} ${GPMAINOBJS} ${LDFLAGS}
 	@echo Removing object files .....
-	@rm -f ${GPOBJS) ${GPXINTOBJS}
+	@rm -f ${GPOBJS) ${GPMAINOBJS}
 
 depend: ${GPXINTDEPENDS} ${GPMAINDEPENDS} ${GPDEPENDS}
 
@@ -111,6 +115,7 @@
                 | sed '\''s/\($(*F)\)\.o[ :]*/ $(*D)\/\1.o $(*D)\/$(*F)\.d : /g'\'' > $@; \
                 [ -s $@ ] || rm -f $@'
 
+.PHONY: distclean clean createdir install 
 # Move binaries from the local repository to the official repositories
 install :
 	@test -d "$(GPAMELA_BIN)" && \