Rename "libsapporo.so" and "libsapporo.a"

In Conda environments for AMUSE where Sapporo Light has already been installed and Sapporo 2 is being installed after that, we will run into problems when building the "tests" folder or executing its code. This is shown from e.g. "ldd libsapporoG6.so":
"
libsapporo.so => /My/path/to/conda/envs/amuse_p313/lib/libsapporo.so
"
i.e. it will point to the shared object for Sapporo Light and not to the shared object for Sapporo 2.
By renaming "libsapporo.so" to "libsapporo2.so" and "libsapporo.a" to "libsapporo2.a" this problem can be avoided.

Author: HannoSpreeuw

Makefile

@@ -10,7 +10,7 @@ CUDA_TK ?= $(CUDA_PATH)
 endif
 
 .PHONY: all
-all: libsapporo.a libsapporo.so emulated_interfaces
+all: libsapporo2.a libsapporo2.so emulated_interfaces
 
 
 # Detect CUDA
@@ -156,10 +156,10 @@ src/sapporohostclass.o: $(KERNELS)
 %.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
-libsapporo.a: $(OBJS)
+libsapporo2.a: $(OBJS)
 	ar qv $@ $^
 
-libsapporo.so: $(OBJS)
+libsapporo2.so: $(OBJS)
 	$(CXX) -o $@ -shared $^ $(LDFLAGS)
 
 
@@ -171,20 +171,20 @@ EMU_SHARED_LIBS := $(EMU_SRC:src/interfaces/%lib.cpp=lib%.so)
 .PHONY: emulated_interfaces
 emulated_interfaces: $(EMU_STATIC_LIBS) $(EMU_SHARED_LIBS)
 
-$(EMU_STATIC_LIBS): libsapporo.a
+$(EMU_STATIC_LIBS): libsapporo2.a
 
-$(EMU_SHARED_LIBS): libsapporo.so
+$(EMU_SHARED_LIBS): libsapporo2.so
 
 
 lib%.a: src/interfaces/%lib.o
 	ar qv $@ $^
 
 lib%.so: src/interfaces/%lib.o
-	$(CXX) -o $@ -shared $^ -L. -lsapporo $(LDFLAGS)
+	$(CXX) -o $@ -shared $^ -L. -lsapporo2 $(LDFLAGS)
 
 
 # Installation
-INSTALLED_LIBS := $(PREFIX)/lib/libsapporo.a $(PREFIX)/lib/libsapporo.so
+INSTALLED_LIBS := $(PREFIX)/lib/libsapporo2.a $(PREFIX)/lib/libsapporo2.so
 INSTALLED_LIBS += $(EMU_STATIC_LIBS:%.a=$(PREFIX)/lib/%.a)
 INSTALLED_LIBS += $(EMU_SHARED_LIBS:%.so=$(PREFIX)/lib/%.so)
 

tests/Makefile

@@ -6,7 +6,7 @@ F90  ?= ifort
 .SUFFIXES: .o .cpp .ptx .cu
 
 SAPPOROPATH=..
-SAPLIB2 = sapporo
+SAPLIB2 = sapporo2
 SAPLIB = lib$(SAPLIB2).a
 SAPLIBG6 = sapporoG6