@@ -274,13 +274,6 @@ endif
274274 cp ../config/config.txt "$(DESTDIR)$(libdir)/$(program_name)/src/config/config.txt"
275275ifeq ($(make_static_archive ) ,yes)
276276 cp install/lib$(program_name).a "$(DESTDIR)$(libdir)/"
277- else
278- cp $(OBJ_WRAPPER) "$(DESTDIR)$(libdir)/$(program_name)/obj/PlumedStatic.o"
279- ifdef LD_RO
280- cp install/kernel.o "$(DESTDIR)$(libdir)/$(program_name)/obj/kernel.o"
281- else
282- ../maketools/copyobjects "$(DESTDIR)$(libdir)/$(program_name)/obj/k" $(subst ../config/Config.o,../config/ConfigInstall.o,$(OBJ_KERNEL))
283- endif
284277endif
285278# also copy .h files into include/ dir
286279 $(MAKE) install-headers
@@ -302,8 +295,6 @@ ifdef SOEXT
302295 if test -e install/"$(program_name)"-runtime ; then cp install/"$(program_name)"-runtime "$(DESTDIR)$(libdir)/$(program_name)/plumed-runtime" ; fi
303296ifdef AR_CR
304297 cp install/lib$(program_name)Wrapper.a "$(DESTDIR)$(libdir)/"
305- else
306- cp $(OBJ_DYNAMIC_WRAPPER) "$(DESTDIR)$(libdir)/$(program_name)/obj/Plumed.o"
307298endif
308299endif
309300# modulefile
@@ -518,33 +509,14 @@ $(PLUMED_LIBDIR)Plumed.inc:
518509 @echo Building Plumed.inc
519510ifdef AR_CR
520511 @echo "PLUMED_RUNTIME_LOAD= \"$(libdir)/lib$(program_name)Wrapper.a\" $(LIBS) $(LDFLAGS)" > $@
521- else
522- @echo "PLUMED_RUNTIME_LOAD= \"$(libdir)/$(program_name)/obj/Plumed.o\" $(LIBS) $(LDFLAGS)" > $@
523512endif
524513ifeq ($(make_static_archive ) ,yes)
525514 @echo "PLUMED_STATIC_LOAD= \"$(libdir)/lib$(program_name).a\" $(LIBS) $(DYNAMIC_LIBS) $(LDFLAGS)" >> $@
526- else
527- ifdef LD_RO
528- @echo "PLUMED_STATIC_LOAD= \"$(libdir)/$(program_name)/obj/kernel.o\" \"$(libdir)/$(program_name)/obj/PlumedStatic.o\" $(LIBS) $(DYNAMIC_LIBS) $(LDFLAGS)" >> $@
529- else
530- # single quote required to preserve double quote in resulting file
531- @echo "PLUMED_STATIC_LOAD= '$(shell ../maketools/listobjects "$(libdir)/$(program_name)/obj/k" $(OBJ_KERNEL))' \"$(libdir)/$(program_name)/obj/PlumedStatic.o\" $(LIBS) $(DYNAMIC_LIBS) $(LDFLAGS)" >> $@
532- endif
533515endif
534516 @echo "PLUMED_SHARED_LOAD= \"$(libdir)/lib$(program_name).$(SOEXT)\" $(LIBS) $(LDFLAGS)" >> $@
535517 @echo "PLUMED_RUNTIME_DEPENDENCIES=" >> $@
536- # in principle all objects are replaced at the same time
537- # however, to keep compatibility with the include files generated in plumed 2.0 and 2.1,
538- # I put all the objects (or shared objects) here
539518ifeq ($(make_static_archive ) ,yes)
540519 @echo "PLUMED_STATIC_DEPENDENCIES= \"$(libdir)/lib$(program_name).a\"" >> $@
541- else
542- ifdef LD_RO
543- @echo "PLUMED_STATIC_DEPENDENCIES= \"$(libdir)/$(program_name)/obj/kernel.o\" \"$(libdir)/$(program_name)/obj/PlumedStatic.o\"" >> $@
544- else
545- # single quote required to preserve double quote in resulting file
546- @echo "PLUMED_STATIC_DEPENDENCIES= '$(shell ../maketools/listobjects "$(libdir)/$(program_name)/obj/k" $(OBJ_KERNEL))' \"$(libdir)/$(program_name)/obj/PlumedStatic.o\"" >> $@
547- endif
548520endif
549521 @echo "PLUMED_SHARED_DEPENDENCIES= \"$(libdir)/lib$(program_name).$(SOEXT)\"" >> $@
550522else
0 commit comments