From af034588040118df467b07516522f2e446c24407 Mon Sep 17 00:00:00 2001 From: Thomas Roehl Date: Mon, 11 Nov 2024 14:18:49 +0100 Subject: [PATCH] Update Makefile for builds with external hwloc and/or lua --- Makefile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 3e2690421..960a2d9f9 100644 --- a/Makefile +++ b/Makefile @@ -52,13 +52,6 @@ include $(MAKE_DIR)/config_defines.mk INCLUDES += -I./src/includes -I$(LUA_INCLUDE_DIR) -I$(HWLOC_INCLUDE_DIR) -I$(BUILD_DIR) LIBS += -ldl -ifeq ($(LUA_INTERNAL),false) -LIBS += -l$(LUA_LIB_NAME) -endif -ifeq ($(USE_INTERNAL_HWLOC),false) -LIBS += -l$(HWLOC_LIB_NAME) -endif - #CONFIGURE BUILD SYSTEM BUILD_DIR = ./$(COMPILER) Q ?= @ @@ -277,7 +270,7 @@ $(STATIC_TARGET_LIB): $(BUILD_DIR) $(PERFMONHEADERS) $(OBJ) $(TARGET_HWLOC_LIB) $(DYNAMIC_TARGET_LIB): $(BUILD_DIR) $(PERFMONHEADERS) $(OBJ) $(TARGET_HWLOC_LIB) $(TARGET_LUA_LIB) @echo "===> CREATE SHARED LIB $(TARGET_LIB)" - $(Q)${CC} $(DEBUG_FLAGS) $(SHARED_LFLAGS) -Wl,-soname,$(TARGET_LIB).$(VERSION).$(RELEASE) $(SHARED_CFLAGS) -o $(DYNAMIC_TARGET_LIB) $(OBJ) $(LIBS) $(TARGET_HWLOC_LIB) $(TARGET_LUA_LIB) $(RPATHS) + $(CC) $(DEBUG_FLAGS) $(SHARED_LFLAGS) -Wl,-soname,$(TARGET_LIB).$(VERSION).$(RELEASE) $(SHARED_CFLAGS) -o $(DYNAMIC_TARGET_LIB) $(OBJ) $(LIBS) $(TARGET_HWLOC_LIB) $(TARGET_LUA_LIB) $(RPATHS) @ln -sf $(TARGET_LIB) $(TARGET_LIB).$(VERSION).$(RELEASE) @sed -e s#'@PREFIX@'#$(INSTALLED_PREFIX)#g \ -e s#'@NVIDIA_INTERFACE@'#$(NVIDIA_INTERFACE)#g \