Skip to content
Snippets Groups Projects
Commit 01f8f56c authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Fixed install

PLUMED_STATIC_DEPENDENCIES was changed in 2.2. I restore here the value that
it had in 2.0 and 2.1 to keep it compatible with cp2k installation procedure

see https://groups.google.com/d/msgid/plumed-users/CAGZMOouB989WaXVd1E8%3DAVmi_BM7EnSpzN7P-NBjR%2BLXjWYV8A%40mail.gmail.com
parent 39ec47bb
No related branches found
No related tags found
No related merge requests found
...@@ -328,9 +328,15 @@ else ...@@ -328,9 +328,15 @@ else
endif endif
@echo "PLUMED_SHARED_LOAD= \"$(libdir)/lib$(program_name).$(SOEXT)\" $(LIBS) $(LDFLAGS)" >> $@ @echo "PLUMED_SHARED_LOAD= \"$(libdir)/lib$(program_name).$(SOEXT)\" $(LIBS) $(LDFLAGS)" >> $@
@echo "PLUMED_RUNTIME_DEPENDENCIES=" >> $@ @echo "PLUMED_RUNTIME_DEPENDENCIES=" >> $@
# when installing, it is sufficient to include dependence wrt a single object # in principle all objects are replaced at the same time
# indeed, the object are replaced all at the same time # however, to keep compatibility with the include files generated in plumed 2.0 and 2.1,
@echo "PLUMED_STATIC_DEPENDENCIES= \"$(libdir)/$(program_name)/obj/PlumedStatic.o\"" >> $@ # I put all the objects (or shared objects) here
ifdef LD_RO
@echo "PLUMED_STATIC_DEPENDENCIES= \"$(libdir)/$(program_name)/obj/kernel.o\" \"$(libdir)/$(program_name)/obj/PlumedStatic.o\"" >> $@
else
# single quote required to preserve double quote in resulting file
@echo "PLUMED_STATIC_DEPENDENCIES= '$(shell ../maketools/listobjects "$(libdir)/$(program_name)/obj/k" $(OBJ_KERNEL))' \"$(libdir)/$(program_name)/obj/PlumedStatic.o\"" >> $@
endif
@echo "PLUMED_SHARED_DEPENDENCIES= \"$(libdir)/lib$(program_name).$(SOEXT)\"" >> $@ @echo "PLUMED_SHARED_DEPENDENCIES= \"$(libdir)/lib$(program_name).$(SOEXT)\"" >> $@
else else
Plumed.inc: Plumed.inc:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment