mirror of
https://github.com/lm-sensors/lm-sensors.git
synced 2026-11-03 13:38:25 +00:00
Fix build with extra libraries
Fixes: c829b4c7 ("Add LDFLAGS handling similar to CFLAGS")
This commit is contained in:
1 parent
51f74751ae
commit
1c757b34a7
5 files changed
+6
-6
No files matched your search
+1
-1
@@ -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 $(ALL_LDFLAGS) -Wl,--version-script=$(LIB_DIR)/libsensors.map -Wl,-soname,$(LIBSHSONAME) -o $@ $(LIBSHOBJECTS) -lc -lm
|
||||
$(CC) -shared -Wl,--version-script=$(LIB_DIR)/libsensors.map -Wl,-soname,$(LIBSHSONAME) -o $@ $(LIBSHOBJECTS) $(ALL_LDFLAGS) -lc -lm
|
||||
|
||||
$(MODULE_DIR)/$(LIBSHSONAME): $(MODULE_DIR)/$(LIBSHLIBNAME)
|
||||
$(RM) $@
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@ LIB_TEST_SCANNER_OBJS := \
|
||||
INCLUDEFILES += $(LIB_TEST_SOURCES:.c=.rd)
|
||||
|
||||
$(LIB_TEST_DIR)/test-scanner: $(LIB_TEST_SCANNER_OBJS)
|
||||
$(CC) $(EXLDFLAGS) -o $@ $(LIB_TEST_SCANNER_OBJS) -Llib
|
||||
$(CC) -o $@ $(LIB_TEST_SCANNER_OBJS) -Llib $(EXLDFLAGS)
|
||||
|
||||
all-lib-test: $(LIB_TEST_TARGETS)
|
||||
user :: all-lib-test
|
||||
|
||||
+2
-2
@@ -43,10 +43,10 @@ all-prog-dump: $(PROGDUMPTARGETS)
|
||||
user :: all-prog-dump
|
||||
|
||||
$(MODULE_DIR)/isadump: $(MODULE_DIR)/isadump.ro $(MODULE_DIR)/superio.ro $(MODULE_DIR)/util.ro
|
||||
$(CC) $(EXLDFLAGS) -o $@ $^
|
||||
$(CC) -o $@ $^ $(EXLDFLAGS)
|
||||
|
||||
$(MODULE_DIR)/isaset: $(MODULE_DIR)/isaset.ro $(MODULE_DIR)/util.ro
|
||||
$(CC) $(EXLDFLAGS) -o $@ $^
|
||||
$(CC) -o $@ $^ $(EXLDFLAGS)
|
||||
|
||||
install-prog-dump: all-prog-dump
|
||||
$(MKDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(PROGDUMPMAN8DIR)
|
||||
|
||||
@@ -42,7 +42,7 @@ REMOVESENSORDBIN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(SBINDIR)/%,$(PROGSENS
|
||||
REMOVESENSORDMAN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(PROGSENSORDMAN8DIR)/%,$(PROGSENSORDMAN8FILES))
|
||||
|
||||
$(PROGSENSORDTARGETS): $(PROGSENSORDSOURCES:.c=.ro) lib/$(LIBDEP_FOR_PROGS)
|
||||
$(CC) $(EXLDFLAGS) -o $@ $(PROGSENSORDSOURCES:.c=.ro) -Llib -lsensors -lrrd
|
||||
$(CC) -o $@ $(PROGSENSORDSOURCES:.c=.ro) $(EXLDFLAGS) -Llib -lsensors -lrrd
|
||||
|
||||
all-prog-sensord: $(PROGSENSORDTARGETS)
|
||||
user :: all-prog-sensord
|
||||
|
||||
@@ -42,7 +42,7 @@ REMOVESENSORSZSH := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(ZSHCOMPDIR)/%,$(PROGS
|
||||
LIBICONV := $(shell if /sbin/ldconfig -p | grep -q '/libiconv\.so$$' ; then echo \-liconv; else echo; fi)
|
||||
|
||||
$(PROGSENSORSTARGETS): $(PROGSENSORSSOURCES:.c=.ro) lib/$(LIBDEP_FOR_PROGS)
|
||||
$(CC) $(EXLDFLAGS) -o $@ $(PROGSENSORSSOURCES:.c=.ro) $(LIBICONV) -Llib -lsensors -lm
|
||||
$(CC) -o $@ $(PROGSENSORSSOURCES:.c=.ro) $(LIBICONV) $(EXLDFLAGS) -Llib -lsensors -lm
|
||||
|
||||
all-prog-sensors: $(PROGSENSORSTARGETS)
|
||||
user :: all-prog-sensors
|
||||
|
||||
Reference in new issue
Block a user