--- gpamela/Makefile	2002/07/11 16:01:58	3.1
+++ gpamela/Makefile	2005/07/21 13:23:43	3.7
@@ -2,6 +2,7 @@
 # Steering Makefile to create gpamelaX11 and gpamela executable
 # First of all define the src files. One for each subdirectory
 #
+# some addition
 GPAMELASRCS= gpamela/ffuser.F gpamela/gdraws.F gpamela/gpadigi.F \
 	gpamela/gpal.F gpamela/gpdat.F \
 	gpamela/gpffr.F gpamela/gpfil.F gpamela/gpgaus.F \
@@ -22,7 +23,7 @@
 	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 
 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 
@@ -61,7 +62,8 @@
 #
 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
 GARFIELDSRC = ./garfield/src
 #
 INTERFLAGS = -DGPAMELA_UNIX -DGPAMELA_TYPE -DGPAMELA_X11 -DGPAMELA_INTER -DGPAMELA_HIGZ \
@@ -73,7 +75,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 +99,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 +113,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)" && \