Rollback since problems with Mac

diff --git a/PYTHIA6/libAliPythia6.pkg b/PYTHIA6/libAliPythia6.pkg
index 98c2ebf9d9aa56a4d049ccbecdbe6e28a5448d92..ba819ff71a24fd9a556a276b5c08f991ebbb3950 100644 (file)
--- a/PYTHIA6/libAliPythia6.pkg
+++ b/PYTHIA6/libAliPythia6.pkg
@@ -3,12 +3,8 @@
 SRCS= AliPythiaBase.cxx AliPythia.cxx AliPythia6.cxx AliGenPythia.cxx AliGenPythiaPlus.cxx AliDecayerPythia.cxx
 
 FSRCS:= \
-pythia6_common_block_address.F \
-tpythia6_called_from_cc.F \
 openDecayTable.F
 
-CSRCS:= \
-main.c pythia6_common_address.c 
 
 HDRS= $(SRCS:.cxx=.h) 
 

diff --git a/PYTHIA6/libpythia6.pkg b/PYTHIA6/libpythia6.pkg
index a60b92f5ae7e84e28b7d1a65ad2cea536655f2ec..affe4fc51440d13edbbabfe36ada42255fc51d03 100644 (file)
--- a/PYTHIA6/libpythia6.pkg
+++ b/PYTHIA6/libpythia6.pkg
@@ -6,9 +6,13 @@ DHDR:=pythia6LinkDef.h
 
 EXPORT:=
 
+CSRCS:= \
+main.c pythia6_common_address.c 
 
 
 FSRCS:= \
+pythia6_common_block_address.F \
+tpythia6_called_from_cc.F\
 pythia6214.f \
 pydummy.f \
 pdf_alice.F    

diff --git a/PYTHIA6/pythia6_common_address.c b/PYTHIA6/pythia6_common_address.c
index 8a6546e3262183a4211a3df301bdf9ff5c538523..b546f901b5bf86c9adb31cceb3361782fe4378ae 100644 (file)
--- a/PYTHIA6/pythia6_common_address.c
+++ b/PYTHIA6/pythia6_common_address.c
@@ -18,7 +18,6 @@
 # define pyint7 pyint7_
 # define pyint8 pyint8_
 # define pyint9 pyint9_
-# define pyuppr pyuppr_
 # define pymssm pymssm_
 # define pyssmt pyssmt_
 # define pyints pyints_
@@ -41,7 +40,6 @@
 # define pyint7 PYINT7
 # define pyint8 PYINT8
 # define pyint9 PYINT9
-# define pyuppr PYUPPR
 # define pymssm PYMSSM
 # define pyssmt PYSSMT
 # define pyints PYINTS
@@ -65,7 +63,6 @@ extern char pyint6[501*28];
 extern int pyint7[2*6*7*7];
 extern int pyint8[2*5*13];
 extern int pyint9[2*4*13];
-extern int pyuppr[1+7*20+1+2*10+2*5*20+2*11];
 extern int pymssm[100+2*100];
 extern int pyssmt[2*4*4+2*2*2+2*2*2+2*4+2*2+2*4*16];
 extern int pyints[2*20];
@@ -90,7 +87,6 @@ void *pythia6_common_address(const char* name) {
    else if (!strcmp(name,"PYINT7")) return pyint7;
    else if (!strcmp(name,"PYINT8")) return pyint8;
    else if (!strcmp(name,"PYINT9")) return pyint9;
-   else if (!strcmp(name,"PYUPPR")) return pyuppr;
    else if (!strcmp(name,"PYMSSM")) return pymssm;
    else if (!strcmp(name,"PYSSMT")) return pyssmt;
    else if (!strcmp(name,"PYINTS")) return pyints;