From a97c705f4c2482449f4cc15198561d6db53da261 Mon Sep 17 00:00:00 2001 From: Holger Obermaier Date: Mon, 21 Feb 2022 20:53:55 +0100 Subject: [PATCH] Do not create link to libganglia.so. libganglia.so is now loaded during runtime by dlopen and no longer required during link time --- Makefile | 9 +++++++-- sinks/Makefile | 12 ------------ 2 files changed, 7 insertions(+), 14 deletions(-) delete mode 100644 sinks/Makefile diff --git a/Makefile b/Makefile index 33fd515..b32fb6b 100644 --- a/Makefile +++ b/Makefile @@ -21,13 +21,18 @@ all: $(APP) $(APP): $(GOSRC) make -C collectors - make -C sinks go get go build -o $(APP) $(GOSRC_APP) .PHONY: clean +.ONESHELL: clean: - @for COMP in $(COMPONENT_DIRS); do if [ -e $$COMP/Makefile ]; then make -C $$COMP clean; fi; done + @for COMP in $(COMPONENT_DIRS) + do + if [[ -e $$COMP/Makefile ]]; then + make -C $$COMP clean + fi + done rm -f $(APP) .PHONY: fmt diff --git a/sinks/Makefile b/sinks/Makefile deleted file mode 100644 index 5cc3e84..0000000 --- a/sinks/Makefile +++ /dev/null @@ -1,12 +0,0 @@ - -all: libganglia.so - -libganglia.so: - @find /usr ! -readable -prune -o -type d ! -executable -prune -o -name "$@*" -print0 | \ - xargs --null --no-run-if-empty --replace \ - ln --symbolic --verbose --force '{}' "$@" - -clean: - rm -f libganglia.so - -.PHONY: clean