Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix library linking #393

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix library linking #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25df35f
Bump version number
sjgardiner Nov 29, 2022
d3e27ee
Address some library-linking errors.
knoepfel Mar 15, 2024
d167a19
Address remaining library-linking errors.
knoepfel Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ framework: FORCE
@echo " "
@echo "** Building GENIE framework..."
cd ${GENIE}/src/Framework && \
cd Messenger && $(MAKE) && cd .. && \
cd Algorithm && $(MAKE) && cd .. && \
cd EventGen && $(MAKE) && cd .. && \
cd GHEP && $(MAKE) && cd .. && \
cd Interaction && $(MAKE) && cd .. && \
cd Messenger && $(MAKE) && cd .. && \
cd Ntuple && $(MAKE) && cd .. && \
cd Numerical && $(MAKE) && cd .. && \
cd ParticleData && $(MAKE) && cd .. && \
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
999.999.999
3.04.00
2 changes: 1 addition & 1 deletion data/logo/genie_banner_long.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Nh+//om Nh+/yN o///s *
* d+//+d my+/smmyhN m///h NEUTRINO MONTE CARLO GENERATOR *
* Ns///yN NdyoshNNs///d h////yN *
* mo//om ms///+m d///////oyhmN Version 999.999.999 *
* mo//om ms///+m d///////oyhmN Version 3.04.00 *
* N+//yN ms////+N h////////////oym *
* s//h ho/+///sN N///////////////od http://www.genie-mc.org *
* N+/h my++yh+//y s/////////////////oN *
Expand Down
2 changes: 1 addition & 1 deletion data/logo/genie_banner_short.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
** .oooooo. oooooooooooo ooooo ooo ooooo oooooooooooo **
** d8P' `Y8b `888' `8 `888b. `8' `888' `888' `8 NEUTRINO MONTE CARLO GENERATOR **
** 888 888 8 `88b. 8 888 888 **
** 888 888oooo8 8 `88b. 8 888 888oooo8 Version 999.999.999 **
** 888 888oooo8 8 `88b. 8 888 888oooo8 Version 3.04.00 **
** 888 ooooo 888 " 8 `88b.8 888 888 " **
** `88. .88' 888 o 8 `888 888 888 o http://www.genie-mc.org **
** `Y8bood8P' o888ooooood8 o8o `8 o888o o888ooooood8 **
Expand Down
2 changes: 1 addition & 1 deletion src/Framework/Algorithm/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ PACKAGE = Framework/Algorithm
PACKAGE_ABBREV = FwAlg
DICTIONARY = _ROOT_DICT_$(PACKAGE_ABBREV)
LIBNAME = libG$(PACKAGE_ABBREV)
EXTRA_EXT_LIBS =
EXTRA_EXT_LIBS = -L$(GENIE_LIB_PATH) -lGFwMsg

all : rootcint lib lib-link
install : install-inc install-lib
Expand Down
2 changes: 1 addition & 1 deletion src/Framework/GHEP/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ PACKAGE = Framework/GHEP
PACKAGE_ABBREV = FwGHEP
DICTIONARY = _ROOT_DICT_$(PACKAGE_ABBREV)
LIBNAME = libG$(PACKAGE_ABBREV)
EXTRA_EXT_LIBS =
EXTRA_EXT_LIBS = $(ROOT_LIBRARIES) -L$(GENIE_LIB_PATH) -lGFwMsg

all : rootcint lib lib-link
install : install-inc install-lib
Expand Down
2 changes: 1 addition & 1 deletion src/Framework/Interaction/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ PACKAGE = Framework/Interaction
PACKAGE_ABBREV = FwInt
DICTIONARY = _ROOT_DICT_$(PACKAGE_ABBREV)
LIBNAME = libG$(PACKAGE_ABBREV)
EXTRA_EXT_LIBS =
EXTRA_EXT_LIBS = $(ROOT_LIBRARIES) -L$(GENIE_LIB_PATH) -lGFwMsg

all : rootcint lib lib-link
install : install-inc install-lib
Expand Down
2 changes: 1 addition & 1 deletion src/Framework/Messenger/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ PACKAGE = Framework/Messenger
PACKAGE_ABBREV = FwMsg
DICTIONARY = _ROOT_DICT_$(PACKAGE_ABBREV)
LIBNAME = libG$(PACKAGE_ABBREV)
EXTRA_EXT_LIBS =
EXTRA_EXT_LIBS = $(LOG_LIBRARIES)

all : rootcint lib lib-link
install : install-inc install-lib
Expand Down
2 changes: 1 addition & 1 deletion src/Framework/Numerical/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ PACKAGE = Framework/Numerical
PACKAGE_ABBREV = FwNum
DICTIONARY = _ROOT_DICT_$(PACKAGE_ABBREV)
LIBNAME = libG$(PACKAGE_ABBREV)
EXTRA_EXT_LIBS =
EXTRA_EXT_LIBS = $(XML_LIBRARIES) $(ROOT_LIBRARIES) -L$(GENIE_LIB_PATH) -lGFwMsg

all : rootcint lib lib-link
install : install-inc install-lib
Expand Down
2 changes: 1 addition & 1 deletion src/Framework/ParticleData/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ PACKAGE = Framework/ParticleData
PACKAGE_ABBREV = FwParDat
DICTIONARY = _ROOT_DICT_$(PACKAGE_ABBREV)
LIBNAME = libG$(PACKAGE_ABBREV)
EXTRA_EXT_LIBS =
EXTRA_EXT_LIBS = -L$(GENIE_LIB_PATH) -lGFwMsg

all : rootcint lib lib-link
install : install-inc install-lib
Expand Down
2 changes: 1 addition & 1 deletion src/Framework/Registry/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ PACKAGE = Framework/Registry
PACKAGE_ABBREV = FwReg
DICTIONARY = _ROOT_DICT_$(PACKAGE_ABBREV)
LIBNAME = libG$(PACKAGE_ABBREV)
EXTRA_EXT_LIBS =
EXTRA_EXT_LIBS = $(ROOT_LIBRARIES) -L$(GENIE_LIB_PATH) -lGFwMsg

all : rootcint lib lib-link
install : install-inc install-lib
Expand Down
2 changes: 1 addition & 1 deletion src/Framework/Utils/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ PACKAGE = Framework/Utils
PACKAGE_ABBREV = FwUtl
DICTIONARY = _ROOT_DICT_$(PACKAGE_ABBREV)
LIBNAME = libG$(PACKAGE_ABBREV)
EXTRA_EXT_LIBS =
EXTRA_EXT_LIBS = $(XML_LIBRARIES) $(ROOT_LIBRARIES) -L$(GENIE_LIB_PATH) -lGFwMsg

all : rootcint lib lib-link
install : install-inc install-lib
Expand Down
2 changes: 1 addition & 1 deletion src/Physics/HadronTransport/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ PACKAGE = Physics/HadronTransport
PACKAGE_ABBREV = PhHadTransp
DICTIONARY = _ROOT_DICT_$(PACKAGE_ABBREV)
LIBNAME = libG$(PACKAGE_ABBREV)
EXTRA_EXT_LIBS =
EXTRA_EXT_LIBS = -L$(GENIE_LIB_PATH) -lGPhNuclSt

all : rootcint lib lib-link
install : install-inc install-lib
Expand Down
2 changes: 1 addition & 1 deletion src/Physics/InverseBetaDecay/XSection/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ PACKAGE = Physics/InverseBetaDecay/XSection
PACKAGE_ABBREV = PhIBDXS
DICTIONARY = _ROOT_DICT_$(PACKAGE_ABBREV)
LIBNAME = libG$(PACKAGE_ABBREV)
EXTRA_EXT_LIBS =
EXTRA_EXT_LIBS = $(XML_LIBRARIES) -L$(GENIE_LIB_PATH) -lGPhXSIg -lGFwEG -lGFwGHEP

all : rootcint lib lib-link
install : install-inc install-lib
Expand Down
2 changes: 1 addition & 1 deletion src/Physics/Multinucleon/EventGen/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ PACKAGE = Physics/Multinucleon/EventGen
PACKAGE_ABBREV = PhMNucEG
DICTIONARY = _ROOT_DICT_$(PACKAGE_ABBREV)
LIBNAME = libG$(PACKAGE_ABBREV)
EXTRA_EXT_LIBS =
EXTRA_EXT_LIBS = $(XML_LIBRARIES) -L$(GENIE_LIB_PATH) -lGFwAlg -lGFwEG -lGFwGHEP -lGPhMNucXS -lGPhNuclSt

all : rootcint lib lib-link
install : install-inc install-lib
Expand Down
2 changes: 1 addition & 1 deletion src/Physics/Multinucleon/XSection/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ PACKAGE = Physics/Multinucleon/XSection
PACKAGE_ABBREV = PhMNucXS
DICTIONARY = _ROOT_DICT_$(PACKAGE_ABBREV)
LIBNAME = libG$(PACKAGE_ABBREV)
EXTRA_EXT_LIBS =
EXTRA_EXT_LIBS = $(XML_LIBRARIES) -L$(GENIE_LIB_PATH) -lGPhXSIg -lGFwEG -lGFwGHEP -lGPhCmn -lGFwUtl -lGPhHadTens

all : rootcint lib lib-link
install : install-inc install-lib
Expand Down
1 change: 1 addition & 0 deletions src/Physics/NNBarOscillation/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ PACKAGE = Physics/NNBarOscillation
PACKAGE_ABBREV = PhNNBarOsc
DICTIONARY = _ROOT_DICT_$(PACKAGE_ABBREV)
LIBNAME = libG$(PACKAGE_ABBREV)
EXTRA_EXT_LIBS = -L$(GENIE_LIB_PATH) -lGPhNuclSt

all : rootcint lib lib-link
install : install-inc install-lib
Expand Down
1 change: 1 addition & 0 deletions src/Physics/NucleonDecay/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ PACKAGE = Physics/NucleonDecay
PACKAGE_ABBREV = PhNDcy
DICTIONARY = _ROOT_DICT_$(PACKAGE_ABBREV)
LIBNAME = libG$(PACKAGE_ABBREV)
EXTRA_EXT_LIBS = -L$(GENIE_LIB_PATH) -lGPhNuclSt -lGFwEG

all : rootcint lib lib-link
install : install-inc install-lib
Expand Down
1 change: 1 addition & 0 deletions src/Physics/XSectionIntegration/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ PACKAGE = Physics/XSectionIntegration
PACKAGE_ABBREV = PhXSIg
DICTIONARY = _ROOT_DICT_$(PACKAGE_ABBREV)
LIBNAME = libG$(PACKAGE_ABBREV)
EXTRA_EXT_LIBS = $(ROOT_LIBRARIES) -L$(GENIE_LIB_PATH) -lGFwAlg

all : rootcint lib lib-link
install : install-inc install-lib
Expand Down