diff --git a/Makefile b/Makefile index ababa7b0..5343a501 100644 --- a/Makefile +++ b/Makefile @@ -63,8 +63,6 @@ DATADIR := $(PREFIX)/share # ZSH completion files will be installed. ZSHCOMPDIR := $(DATADIR)/zsh/site-functions -EXLDFLAGS := -Wl,-rpath,$(LIBDIR) - # You should not need to change this. It is the directory into which the # executable program files will be installed. BINDIR for programs that are # also useful for normal users, SBINDIR for programs that can only be run @@ -171,6 +169,10 @@ ARCFLAGS := $(ALL_CFLAGS) LIBCPPFLAGS := -DETCDIR="\"$(ETCDIR)\"" $(ALL_CPPFLAGS) LIBCFLAGS := -fpic -D_REENTRANT $(ALL_CFLAGS) +ALL_LDFLAGS := $(LDFLAGS) + +EXLDFLAGS := -Wl,-rpath,$(LIBDIR) $(ALL_LDFLAGS) + .PHONY: all user clean install user_install uninstall user_uninstall # Make all the default rule diff --git a/lib/Module.mk b/lib/Module.mk index f30e4e58..bcfbda75 100644 --- a/lib/Module.mk +++ b/lib/Module.mk @@ -69,7 +69,7 @@ LIBHEADERFILES := $(MODULE_DIR)/error.h $(MODULE_DIR)/sensors.h # How to create the shared library $(MODULE_DIR)/$(LIBSHLIBNAME): $(LIBSHOBJECTS) $(LIB_DIR)/libsensors.map - $(CC) -shared $(LDFLAGS) -Wl,--version-script=$(LIB_DIR)/libsensors.map -Wl,-soname,$(LIBSHSONAME) -o $@ $(LIBSHOBJECTS) -lc -lm + $(CC) -shared $(ALL_LDFLAGS) -Wl,--version-script=$(LIB_DIR)/libsensors.map -Wl,-soname,$(LIBSHSONAME) -o $@ $(LIBSHOBJECTS) -lc -lm $(MODULE_DIR)/$(LIBSHSONAME): $(MODULE_DIR)/$(LIBSHLIBNAME) $(RM) $@