diff --git a/.github/workflows/doxygen-gh-pages.yml b/.github/workflows/doxygen-gh-pages.yml index f53f24e9..1b62364d 100644 --- a/.github/workflows/doxygen-gh-pages.yml +++ b/.github/workflows/doxygen-gh-pages.yml @@ -2,8 +2,6 @@ name: Doxygen GitHub Pages Deploy Action on: push: - branches: [ "*" ] - pull_request: branches: [ "main" ] jobs: diff --git a/Makefile b/Makefile index c07cf001..1d5d1368 100644 --- a/Makefile +++ b/Makefile @@ -22,10 +22,12 @@ endif PLATFORM:=$(shell uname) ifeq ($(PLATFORM),Darwin) -SHAREDSWITCH = -Qunused-arguments -shared -undefined dynamic_lookup -dynamiclib -Wl,-install_name,'@executable_path/../lib/'# NO ENDING SPACE +SHAREDSWITCH = -Qunused-arguments -shared -undefined dynamic_lookup -dynamiclib +SONAMESWITCH = -Wl,-install_name,'@executable_path/../lib/'# NO ENDING SPACE OSDEF = -DMACOSX else -SHAREDSWITCH = -shared -Wl,-soname,# NO ENDING SPACE +SHAREDSWITCH = -shared +SONAMESWITCH = -Wl,-soname,# NO ENDING SPACE OSDEF = -DLINUX LIBEXTRA = -lrt endif @@ -91,10 +93,10 @@ DEPENDENCIES = $(INC_DIR)/AutoCalibrator.hh \ $(INC_DIR)/TIssData.hh all: $(BIN_DIR)/iss_sort $(LIB_DIR)/libiss_sort.so - + $(LIB_DIR)/libiss_sort.so: iss_sort.o $(OBJECTS) iss_sortDict.o mkdir -p $(LIB_DIR) - $(LD) iss_sort.o $(OBJECTS) iss_sortDict.o $(SHAREDSWITCH)$@ $(LIBS) -o $@ + $(LD) iss_sort.o $(OBJECTS) iss_sortDict.o $(SHAREDSWITCH) $(SONAMESWITCH)$@ $(LIBS) -o $@ $(BIN_DIR)/iss_sort: iss_sort.o $(OBJECTS) iss_sortDict.o mkdir -p $(BIN_DIR) diff --git a/src/Calibration.cc b/src/Calibration.cc index 8bee5260..6e5c58ce 100644 --- a/src/Calibration.cc +++ b/src/Calibration.cc @@ -624,7 +624,7 @@ std::string ISSCalibration::CaenType( unsigned int mod, unsigned int chan ){ } - return 0; + return ""; } @@ -714,7 +714,7 @@ std::string ISSCalibration::MesytecType( unsigned int mod, unsigned int chan ){ } - return 0; + return ""; }