Changeset 4458

Timestamp:

06/25/07 10:18:47 (6 years ago)

Author:

khali

Message:

Always build libsensors with sysfs support.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

• CHANGES (modified) (1 diff)
• Makefile (modified) (2 diffs)
• lib/Module.mk (modified) (2 diffs)
• lib/sysfs.h (modified) (2 diffs)

lm-sensors/branches/lm-sensors-3.0.0/CHANGES

@@ -14 +14 @@
            Add dme1737 support
            Delete support of non-sensor drivers (ddcmon, eeprom)
+           Always build with sysfs support
   Man page sensors.conf.5: Update the chip statement section
   Programs i2cdump, i2cget, i2cset: Do not force the slave address by default

lm-sensors/branches/lm-sensors-3.0.0/Makefile

@@ -49 +49 @@
 CC := gcc
 
-# Build with sysfs support
-SYSFS_SUPPORT := 1
-
 # This is the directory where sensors.conf will be installed, if no other
 # configuration file is found
@@ -158 +155 @@
 PROGCFLAGS := $(ALL_CFLAGS)
 ARCPPFLAGS := $(ALL_CPPFLAGS)
-ifdef SYSFS_SUPPORT
-ARCPPFLAGS := $(ARCPPFLAGS) -DSYSFS_SUPPORT
-endif
 ARCFLAGS := $(ALL_CFLAGS)
 LIBCPPFLAGS := $(ALL_CPPFLAGS)
-ifdef SYSFS_SUPPORT
-LIBCPPFLAGS := $(LIBCPPFLAGS) -DSYSFS_SUPPORT
-endif
 LIBCFLAGS := -fpic -D_REENTRANT $(ALL_CFLAGS)
 

lm-sensors/branches/lm-sensors-3.0.0/lib/Module.mk

@@ -50 +50 @@
                $(MODULE_DIR)/error.c $(MODULE_DIR)/chips.c \
                $(MODULE_DIR)/proc.c $(MODULE_DIR)/access.c \
-               $(MODULE_DIR)/init.c
-ifdef SYSFS_SUPPORT
-        LIBCSOURCES := $(LIBCSOURCES) $(MODULE_DIR)/sysfs.c
-endif
+               $(MODULE_DIR)/init.c $(MODULE_DIR)/sysfs.c
 
 LIBOTHEROBJECTS := $(MODULE_DIR)/conf-parse.o $(MODULE_DIR)/conf-lex.o
@@ -65 +62 @@
 
 # How to create the shared library
-ifdef SYSFS_SUPPORT
 $(MODULE_DIR)/$(LIBSHLIBNAME): $(LIBSHOBJECTS)
         $(CC) -shared -Wl,-soname,$(LIBSHSONAME) -o $@ $^ -lc -lm -lsysfs
-else
-$(MODULE_DIR)/$(LIBSHLIBNAME): $(LIBSHOBJECTS)
-        $(CC) -shared -Wl,-soname,$(LIBSHSONAME) -o $@ $^ -lc -lm
-endif
 
 $(MODULE_DIR)/$(LIBSHSONAME): $(MODULE_DIR)/$(LIBSHLIBNAME)

lm-sensors/branches/lm-sensors-3.0.0/lib/sysfs.h

@@ -21 +21 @@
 #define SENSORS_LIB_SYSFS_H
 
-#ifdef SYSFS_SUPPORT
 extern int sensors_found_sysfs;
 
@@ -32 +31 @@
 extern int sensors_read_sysfs_bus(void);
 
-#else
-
-#define sensors_found_sysfs 0
-#define sensors_init_sysfs() 0
-#define sensors_read_sysfs_chips() (-1)
-#define sensors_read_sysfs_bus() (-1)
-
-#endif
-
 #endif /* !SENSORS_LIB_SYSFS_H */