|
 |
81d417c |
diff -ur pythia8180.orig/Makefile pythia8180/Makefile
|
|
|
81d417c |
--- pythia8180.orig/Makefile 2013-09-21 18:43:06.000000000 +0200
|
|
|
81d417c |
+++ pythia8180/Makefile 2013-11-06 11:56:52.820286793 +0100
|
|
|
81d417c |
@@ -40,11 +40,8 @@
|
|
|
7badc08 |
ifeq ($(SHAREDLIBS),yes)
|
|
|
7badc08 |
targets=$(LIBDIRARCH)/libpythia8.a
|
|
|
81d417c |
targets+=$(LIBDIR)/libpythia8.$(SHAREDSUFFIX)
|
|
|
7badc08 |
- targets+=$(LIBDIRARCH)/liblhapdfdummy.a
|
|
|
7badc08 |
- targets+=$(LIBDIR)/liblhapdfdummy.$(SHAREDSUFFIX)
|
|
|
7badc08 |
else
|
|
|
7badc08 |
targets=$(LIBDIRARCH)/libpythia8.a
|
|
|
7badc08 |
- targets+=$(LIBDIRARCH)/liblhapdfdummy.a
|
|
|
7badc08 |
endif
|
|
|
7badc08 |
|
|
|
7badc08 |
ifneq (x$(HEPMCLOCATION),x)
|
|
|
81d417c |
@@ -72,14 +69,6 @@
|
|
|
7badc08 |
@mkdir -p $(MYTMPDIR)/archive
|
|
|
7badc08 |
$(CXX) $(CXXFLAGS) -c -I$(INCDIR) $< -o $@
|
|
|
7badc08 |
|
|
|
7badc08 |
-$(MYTMPDIR)/%.o : lhapdfdummy/%.cc
|
|
|
7badc08 |
- @mkdir -p $(MYTMPDIR)
|
|
|
7badc08 |
- $(CXX) $(CXXFLAGS) $(CXXFLAGSSHARED) -c -I$(INCDIR) $< -o $@
|
|
|
7badc08 |
-
|
|
|
7badc08 |
-$(MYTMPDIR)/archive/%.o : lhapdfdummy/%.cc
|
|
|
7badc08 |
- @mkdir -p $(MYTMPDIR)/archive
|
|
|
7badc08 |
- $(CXX) $(CXXFLAGS) -c -I$(INCDIR) $< -o $@
|
|
|
7badc08 |
-
|
|
|
7badc08 |
# Creating the dependency files *.d
|
|
|
7badc08 |
# The compiler with option -M is used to build the dependency strings. They
|
|
|
7badc08 |
# are further edited with sed (stream editor). The first sed command adds the
|
|
|
81d417c |
@@ -110,23 +99,15 @@
|
|
|
7badc08 |
|
|
|
81d417c |
$(LIBDIR)/libpythia8.$(SHAREDSUFFIX): $(objects)
|
|
|
7badc08 |
@mkdir -p $(LIBDIR)
|
|
|
7badc08 |
- $(CXX) $(LDFLAGSSHARED) -o $@ $(objects) $(LDFLAGLIBNAME),$(notdir $@)
|
|
|
7badc08 |
+ $(CXX) $(LDFLAGSSHARED) -o $@ $(objects) $(LDFLAGLIBNAME),$(notdir $@) -lLHAPDF
|
|
|
81d417c |
+ if [ $(SHAREDSUFFIX) != 'so' ] ; then \
|
|
|
81d417c |
+ ln -s $(notdir $@) $(LIBDIR)/libpythia8.so ; \
|
|
|
81d417c |
+ fi
|
|
|
7badc08 |
|
|
|
7badc08 |
$(LIBDIRARCH)/libpythia8.a: $(objectsarch)
|
|
|
7badc08 |
@mkdir -p $(LIBDIRARCH)
|
|
|
7badc08 |
ar cru $@ $(objectsarch)
|
|
|
7badc08 |
|
|
|
7badc08 |
-objdum := $(patsubst lhapdfdummy/%.cc,$(MYTMPDIR)/%.o,$(wildcard lhapdfdummy/*.cc))
|
|
|
7badc08 |
-objdumarch := $(patsubst lhapdfdummy/%.cc,$(MYTMPDIR)/archive/%.o,$(wildcard lhapdfdummy/*.cc))
|
|
|
7badc08 |
-
|
|
|
7badc08 |
-$(LIBDIR)/liblhapdfdummy.$(SHAREDSUFFIX): $(objdum)
|
|
|
7badc08 |
- @mkdir -p $(LIBDIR)
|
|
|
7badc08 |
- $(CXX) $(LDFLAGSSHARED) -o $@ $(objdum) $(LDFLAGLIBNAME),$(notdir $@)
|
|
|
7badc08 |
-
|
|
|
7badc08 |
-$(LIBDIRARCH)/liblhapdfdummy.a: $(objdumarch)
|
|
|
7badc08 |
- @mkdir -p $(LIBDIRARCH)
|
|
|
7badc08 |
- ar cru $@ $(objdumarch)
|
|
|
7badc08 |
-
|
|
|
7badc08 |
deps := $(patsubst $(SRCDIR)/%.cc,$(MYTMPDIR)/%.d,$(wildcard $(SRCDIR)/*.cc))
|
|
|
7badc08 |
depsarch := $(patsubst $(SRCDIR)/%.cc,$(MYTMPDIR)/archive/%.d,$(wildcard $(SRCDIR)/*.cc))
|
|
|
7badc08 |
|
|
|
81d417c |
@@ -173,9 +154,12 @@
|
|
|
81d417c |
objectsI := $(patsubst pythia8tohepmc/%.cc,$(MYTMPDIR)/%.o,$(wildcard pythia8tohepmc/*.cc))
|
|
|
81d417c |
objectsIarch := $(patsubst pythia8tohepmc/%.cc,$(MYTMPDIR)/archive/%.o,$(wildcard pythia8tohepmc/*.cc))
|
|
|
7badc08 |
|
|
|
81d417c |
- $(LIBDIR)/libpythia8tohepmc.$(SHAREDSUFFIX) : $(objectsI)
|
|
|
81d417c |
+ $(LIBDIR)/libpythia8tohepmc.$(SHAREDSUFFIX) : $(objectsI) $(LIBDIR)/libpythia8.$(SHAREDSUFFIX)
|
|
|
7badc08 |
@mkdir -p $(LIBDIR)
|
|
|
7badc08 |
- $(CXX) $(LDFLAGSSHARED) $(objectsI) -o $@ $(LDFLAGLIBNAME),$(notdir $@)
|
|
|
81d417c |
+ $(CXX) $(LDFLAGSSHARED) $(objectsI) -o $@ $(LDFLAGLIBNAME),$(notdir $@) -lHepMC -L$(LIBDIR) -lpythia8
|
|
|
81d417c |
+ if [ $(SHAREDSUFFIX) != 'so' ] ; then \
|
|
|
81d417c |
+ ln -s $(notdir $@) $(LIBDIR)/libpythia8tohepmc.so ; \
|
|
|
81d417c |
+ fi
|
|
|
7badc08 |
|
|
|
81d417c |
$(LIBDIRARCH)/libpythia8tohepmc.a : $(objectsIarch)
|
|
|
7badc08 |
@mkdir -p $(LIBDIRARCH)
|
|
|
81d417c |
@@ -252,7 +236,6 @@
|
|
|
7badc08 |
cd htmldoc; rm -f *~; rm -f \#*; cd -
|
|
|
7badc08 |
cd phpdoc; rm -f *~; rm -f \#*; cd -
|
|
|
81d417c |
cd pythia8tohepmc; rm -f *~; rm -f \#*; cd -
|
|
|
7badc08 |
- cd lhapdfdummy; rm -f *~; rm -f \#*; cd -
|
|
|
7badc08 |
cd examples; rm -f *~; rm -f \#*; rm -f core*; rm -f config.*; cd -
|
|
|
7badc08 |
cd rootexamples; rm -f *~; rm -f \#*; rm -f core*; rm -f config.*; cd -
|
|
|
7badc08 |
|