Merge lp:~maddevelopers/pythia-pgs-for-mg/new_install_cmd into lp:pythia-pgs-for-mg

[Olivier Mattelaer]

change arch_mcfio in order to follow the same idea as the other makefile
(In the mean time before the change of Johan).

[Olivier Mattelaer (olivier-mattelaer)]

Note that this is not that urgent since
cp3wks05 is already down. (Therefore, we can't update any cluster)

[lp:~maddevelopers/pythia-pgs-for-mg/new_install_cmd]

4. By Johan Alwall on 2011-10-14

Moved all options (FC and -m32/64) to make_opts file in the src/ directory

5. By Johan Alwall on 2011-10-14

Fixed UpdateNotes

[Olivier Mattelaer (olivier-mattelaer)]

Hi johan,

I think that you forget to include the make_opts file.

Could you add it?

Cheers,

Olivier

[lp:~maddevelopers/pythia-pgs-for-mg/new_install_cmd]

6. By Johan Alwall on 2011-10-16

Forgot to include the make_opts file, sorry about that

=== modified file 'PyPGSVersion.txt'
--- PyPGSVersion.txt	2011-10-10 19:34:54 +0000
+++ PyPGSVersion.txt	2011-10-16 12:34:24 +0000
@@ -1,1 +1,1 @@
-2.1.11
+2.1.12

=== modified file 'UpdateNotes.txt'
--- UpdateNotes.txt	2011-10-10 19:34:54 +0000
+++ UpdateNotes.txt	2011-10-16 12:34:24 +0000
@@ -1,5 +1,8 @@
 Update notes for the Pythia-PGS package used by MadGraph/MadEvent
 
+2.1.12 (XX/XX/XX) Move FC and -m32/64 definition to separate file
+       src/make_opts, to allow easy setting once for all makefiles.
+
 2.1.11 (06/10/11) PGS is now 10 times faster! (thanks to Junichi)
 
 2.1.10 (03/10/11) Allow for state-of-the-art matching of processes

=== modified file 'libraries/PGS4/Makefile'
--- libraries/PGS4/Makefile	2011-10-10 19:34:54 +0000
+++ libraries/PGS4/Makefile	2011-10-16 12:34:24 +0000
@@ -7,6 +7,7 @@
 # -----------------------------------------------------------------
 # General definitions
 # -----------------------------------------------------------------
+include ../../src/make_opts
 
 MAKE=make
 COMPILE=$(FC)

=== modified file 'libraries/PGS4/examples/CLEAN/Makefile'
--- libraries/PGS4/examples/CLEAN/Makefile	2011-10-10 19:34:54 +0000
+++ libraries/PGS4/examples/CLEAN/Makefile	2011-10-16 12:34:24 +0000
@@ -1,4 +1,6 @@
 # -----------------------------------------------------------------
+include ../../../../src/make_opts
+
 MAKE=make
 COMPILE=$(FC)
 ifeq "$(COMPILE)" ""

=== modified file 'libraries/PGS4/src/stdhep-dir/mcfio/arch_mcfio'
--- libraries/PGS4/src/stdhep-dir/mcfio/arch_mcfio	2011-10-10 19:34:54 +0000
+++ libraries/PGS4/src/stdhep-dir/mcfio/arch_mcfio	2011-10-16 12:34:24 +0000
@@ -2,11 +2,17 @@
 # architecture specific information for StdHep makefiles
 # 
 
+include ../../../../../../src/make_opts
+
 SUNAME = $(shell uname | sed s/[_-].*//)
 
+F77 =$(FC)
+ifeq "$(F77)" ""
+	F77= g77
+endif
+
 ifeq "$(SUNAME)" "CYGWIN"
     CC=gcc
-    F77=g77
     CFLAGS= $(DFLG) -I/usr/X11R6/include
     FFLAGS= $(DFLG) -fno-second-underscore
     MXTLIBS = -L/usr/X11R6/lib -L/usr/lib -lg2c -lXm -lrpc -lX11 -lXt \
@@ -32,21 +38,18 @@
 
 ifeq "$(UNAME)" "IRIX"
     CC=cc
-    F77=f77
     CFLAGS= $(DFLG)
     FFLAGS= $(DFLG)
     MXTLIBS = -lXm -lXt -lX11 -lPW -lm
 endif
 ifeq "$(UNAME)" "IRIX64"
     CC=cc
-    F77=f77
     CFLAGS= $(DFLG) -n32 -mips3
     FFLAGS= $(DFLG) -n32 -mips3
     MXTLIBS = -lXm -lXt -lX11 -lPW -lm
 endif
 ifeq "$(UNAME)" "Linux"
     CC=gcc
-    F77=g77
     CFLAGS= $(DFLG) -I/usr/X11R6/include 
     FFLAGS= $(DFLG) -fno-second-underscore
     MXTLIBS = -L/usr/X11R6/lib -lXm -lX11 -lXt -lXp -lXext -lm
@@ -57,14 +60,12 @@
 ifeq "$(UNAME)" "Darwin"
     CC=gcc
     CPP=gcc
-    F77=g77
-    CFLAGS= $(DFLG) -I/usr/X11R6/include -m32
+    CFLAGS= $(DFLG) -I/usr/X11R6/include -m$(MBITS)
     FFLAGS= $(DFLG)  -fno-second-underscore
     LOCAL = -lSystem -ldl
 endif
 ifeq "$(UNAME)" "OSF1"
     CC=cc
-    F77=f77
     CFLAGS= $(DFLG) 
     FFLAGS= $(DFLG) -fpe2 -check underflow -check overflow
     MXTLIBS = -lXm -lXt -lX11 -lm -lfor -lots
@@ -72,7 +73,6 @@
 endif
 ifeq "$(UNAME)" "SunOS"
     CC=/opt/SUNWspro/bin/cc
-    F77=f77
     CFLAGS= $(DFLG) -I/usr/openwin/include -I/usr/dt/include -DMOTIF12
     FFLAGS= $(DFLG)
     MXTLIBS = -L/usr/openwin/lib -L/usr/dt/lib -lm -lXm -lXt -lX11 -lgen \

=== modified file 'libraries/PGS4/src/stdhep-dir/src/stdhep_Arch'
--- libraries/PGS4/src/stdhep-dir/src/stdhep_Arch	2011-10-10 19:34:54 +0000
+++ libraries/PGS4/src/stdhep-dir/src/stdhep_Arch	2011-10-16 12:34:24 +0000
@@ -2,6 +2,8 @@
 # architecture specific information for StdHep makefiles
 # 
 
+include ../../../../../../src/make_opts
+
 SUNAME = $(shell uname | sed s/[_-].*//)
 
 ifeq "$(FC)" ""
@@ -66,7 +68,7 @@
 ifeq "$(UNAME)" "Darwin"
     CC=gcc
     CPP=gcc -E
-    CFLAGS= $(DFLG)  -I/sw/include -m32
+    CFLAGS= $(DFLG)  -I/sw/include -m$(MBITS)
     FFLAGS= $(DFLG) -fno-second-underscore 
     KPPFLAGS= -C -P -DLinux -DUNIX
     LOCAL = -lSystem -lcc_dynamic -ldl

=== modified file 'libraries/pylib/src/Makefile'
--- libraries/pylib/src/Makefile	2011-10-10 19:34:54 +0000
+++ libraries/pylib/src/Makefile	2011-10-16 12:34:24 +0000
@@ -1,6 +1,8 @@
 SRCS := $(wildcard *.f)
 OBJS = ${SRCS:.f=.o}
 
+include ../../../src/make_opts
+
 FF = $(FC)
 ifeq "$(FC)" ""
 	FF = g77

=== added file 'src/make_opts'
--- src/make_opts	1970-01-01 00:00:00 +0000
+++ src/make_opts	2011-10-16 12:34:24 +0000
@@ -0,0 +1,7 @@
+# Set FC unless it's defined by an environment variable
+ifeq ($(origin FC),default)
+  FC=g77
+endif
+
+# Set MBITS to the number of bits used by the system (used for Darwin)
+MBITS=32

=== modified file 'src/makefile'
--- src/makefile	2011-10-10 19:34:54 +0000
+++ src/makefile	2011-10-16 12:34:24 +0000
@@ -4,6 +4,7 @@
 LHAPDF = ../libraries/lhapdf
 THISDIR = ${PWD}
 
+include make_opts
 UNAME = $(shell uname)
 SUNAME = $(shell uname | sed s/[_-].*//)
 ifeq "$(SUNAME)" "CYGWIN"