X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=LHAPDF%2Fliblhapdf.pkg;h=3cc7685af212f849e040cefaaf68d559c1039859;hp=59420aed5740e0d78988bfb97d7486ad41c3d3cb;hb=ad18edcffaa3a04ff6fad3972def8f252b392894;hpb=808d86fb338a8e8ebd9eaeabc583bc2d53406864

diff --git a/LHAPDF/liblhapdf.pkg b/LHAPDF/liblhapdf.pkg
index 59420aed574..3cc7685af21 100644
--- a/LHAPDF/liblhapdf.pkg
+++ b/LHAPDF/liblhapdf.pkg
@@ -1,82 +1,66 @@
-#-*- Mode: Makefile -*-
+SRCS:=AliStructFuncType.cxx lhapdf5.5.1/src/version.cxx  lhapdf5.5.1/src/getdatapath.cxx
 
-SRCS:=AliStructFuncType.cxx
+HDRS:= $(SRCS:.cxx=.h) 
+HDRS:= $(filter-out lhapdf5.5.1/src/version.h,$(HDRS)) 
+HDRS:= $(filter-out lhapdf5.5.1/src/getdatapath.h,$(HDRS)) 
 
-HDRS= $(SRCS:.cxx=.h) 
-DHDR:=LHAPDFLinkDef.h
+DHDR:=lhapdfLinkDef.h
 
-EINCLUDE:= LHAPDF/lhapdf5.2.2
+EINCLUDE:= LHAPDF/lhapdf5.5.1 LHAPDF/lhapdf5.5.1/include
 
 FSRCS:= \
-lhapdf5.2.2/alphas.f \
-lhapdf5.2.2/description.f \
-lhapdf5.2.2/eks98.f \
-lhapdf5.2.2/eksarp.f \
-lhapdf5.2.2/EVLCTEQ.f \
-lhapdf5.2.2/evolution.f \
-lhapdf5.2.2/inputPDF.f \
-lhapdf5.2.2/LHpdflib.f \
-lhapdf5.2.2/parameter.f \
-lhapdf5.2.2/QCDNUM.f \
-lhapdf5.2.2/QCDparams.f \
-lhapdf5.2.2/Sqcdnum.f \
-lhapdf5.2.2/wrapa02.f \
-lhapdf5.2.2/wrapa02m.f \
-lhapdf5.2.2/wrapabfkwpi.f \
-lhapdf5.2.2/wrapacfgpg.f \
-lhapdf5.2.2/wrapcteq5.f \
-lhapdf5.2.2/wrapcteq6.f \
-lhapdf5.2.2/wrapdgg.f \
-lhapdf5.2.2/wrapdog.f \
-lhapdf5.2.2/wrapEVLCTEQ.f \
-lhapdf5.2.2/wrapevolve.f \
-lhapdf5.2.2/wrapgrv.f \
-lhapdf5.2.2/wrapgrvg.f \
-lhapdf5.2.2/wrapgrvpi.f \
-lhapdf5.2.2/wrapgsg96.f \
-lhapdf5.2.2/wrapgsg.f \
-lhapdf5.2.2/wraph1.f \
-lhapdf5.2.2/wraplacg.f \
-lhapdf5.2.2/wrapmrst98.f \
-lhapdf5.2.2/wrapmrst.f \
-lhapdf5.2.2/wrapowpi.f \
-lhapdf5.2.2/wrapQCDNUM3.f \
-lhapdf5.2.2/wrapQCDNUM4.f \
-lhapdf5.2.2/wrapQCDNUM.f \
-lhapdf5.2.2/wrapsasg.f \
-lhapdf5.2.2/wrapsmrspi.f \
-lhapdf5.2.2/wrapwhitg.f \
-lhapdf5.2.2/wrapzeus.f \
-lhapdf5.2.2/commons.f \
-lhapdf5.2.2/lhaglue.f
-
-
-
+lhapdf5.5.1/src/alphas.f \
+lhapdf5.5.1/src/commoninit.f \
+lhapdf5.5.1/src/description.f \
+lhapdf5.5.1/src/eks98.f \
+lhapdf5.5.1/src/eksarp.f \
+lhapdf5.5.1/src/eps08.f \
+lhapdf5.5.1/src/EVLCTEQ.f \
+lhapdf5.5.1/src/evolution.f \
+lhapdf5.5.1/src/inputPDF.f \
+lhapdf5.5.1/src/LHpdflib.f \
+lhapdf5.5.1/src/parameter.f \
+lhapdf5.5.1/src/QCDNUM.f \
+lhapdf5.5.1/src/QCDparams.f \
+lhapdf5.5.1/src/Sqcdnum.f \
+lhapdf5.5.1/src/wrapa02.f \
+lhapdf5.5.1/src/wrapa02m.f \
+lhapdf5.5.1/src/wrapabfkwpi.f \
+lhapdf5.5.1/src/wrapacfgpg.f \
+lhapdf5.5.1/src/wrapcteq5.f \
+lhapdf5.5.1/src/wrapcteq6.f \
+lhapdf5.5.1/src/wrapcteq6lg.f \
+lhapdf5.5.1/src/wrapdgg.f \
+lhapdf5.5.1/src/wrapdog.f \
+lhapdf5.5.1/src/wrapEVLCTEQ.f \
+lhapdf5.5.1/src/wrapevolve.f \
+lhapdf5.5.1/src/wrapgrv.f \
+lhapdf5.5.1/src/wrapgrvg.f \
+lhapdf5.5.1/src/wrapgrvpi.f \
+lhapdf5.5.1/src/wrapgsg96.f \
+lhapdf5.5.1/src/wrapgsg.f \
+lhapdf5.5.1/src/wraph1.f \
+lhapdf5.5.1/src/wraplacg.f \
+lhapdf5.5.1/src/wrapowpi.f \
+lhapdf5.5.1/src/wrapQCDNUM3.f \
+lhapdf5.5.1/src/wrapQCDNUM4.f \
+lhapdf5.5.1/src/wrapQCDNUM.f \
+lhapdf5.5.1/src/wrapsasg.f \
+lhapdf5.5.1/src/wrapsmrspi.f \
+lhapdf5.5.1/src/wrapwhitg.f \
+lhapdf5.5.1/src/wrapzeus.f \
+lhapdf5.5.1/src/lhaglue.f\
+lhapdf5.5.1/src/wrapUSER.f
+
+ifeq (solarisCC5,$(ALICE_TARGET))
+PACKFFLAGS = $(FFLAGS) -free
+else 
+ifeq (linuxicc,$(ALICE_TARGET))
+PACKFFLAGS = $(FFLAGS) -nofixed
+else
+PACKFFLAGS = $(FFLAGS) -ffree-form
+endif
+endif
+PACKCXXFLAGS = $(CXXFLAGS) -DDEFAULTPREFIXPATH=\"NONE\" -DDEFAULTLHAPATH=\"$(ALICE_ROOT)/LHAPDF/PDFsets\"
 EXPORT:=AliStructFuncType.h
 
-
-#ifeq (,$(findstring macosx,$(ALICE_TARGET)))
-
-# FSRCS += lhapdf5.2.2/lhaglue.f
-
-#else
-
-
-#TCSRCS=ctmp/lhapdf5.2.2/lhaglue.c
-
-#CSRCS+=$(TCSRCS)
-
-#.SECONDARY: $(TCSRCS)
-
-#PACKCFLAGS:=$(CFLAGS) -w
-
-#LHAPDF/ctmp/%.c: LHAPDF/%.f
-#	[ -d $(dir $@) ] || mkdir -p $(dir $@)
-#ifeq (macosx,$(ALICE_TARGET))
-#	$(F77) -E $(lhapdfINC) $(lhapdfFFLAGS) $< | f2c -E | sed -e 's/___/__/g' > $@
-#endif
-#ifeq (macosxgcc4,$(ALICE_TARGET))
-#	$(F77) -E $(lhapdfINC) $(lhapdfFFLAGS) $< | f2c -E | sed -e 's/\___/__/g' > $@
-#endif
-
-#endif