Changeset 4458

Show
Ignore:
Timestamp:
06/25/07 10:18:47 (7 years ago)
Author:
khali
Message:

Always build libsensors with sysfs support.

Location:
lm-sensors/branches/lm-sensors-3.0.0
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • lm-sensors/branches/lm-sensors-3.0.0/CHANGES

    r4443 r4458  
    1414           Add dme1737 support 
    1515           Delete support of non-sensor drivers (ddcmon, eeprom) 
     16           Always build with sysfs support 
    1617  Man page sensors.conf.5: Update the chip statement section 
    1718  Programs i2cdump, i2cget, i2cset: Do not force the slave address by default 
  • lm-sensors/branches/lm-sensors-3.0.0/Makefile

    r4397 r4458  
    4949CC := gcc 
    5050 
    51 # Build with sysfs support 
    52 SYSFS_SUPPORT := 1 
    53  
    5451# This is the directory where sensors.conf will be installed, if no other 
    5552# configuration file is found 
     
    158155PROGCFLAGS := $(ALL_CFLAGS) 
    159156ARCPPFLAGS := $(ALL_CPPFLAGS) 
    160 ifdef SYSFS_SUPPORT 
    161 ARCPPFLAGS := $(ARCPPFLAGS) -DSYSFS_SUPPORT 
    162 endif 
    163157ARCFLAGS := $(ALL_CFLAGS) 
    164158LIBCPPFLAGS := $(ALL_CPPFLAGS) 
    165 ifdef SYSFS_SUPPORT 
    166 LIBCPPFLAGS := $(LIBCPPFLAGS) -DSYSFS_SUPPORT 
    167 endif 
    168159LIBCFLAGS := -fpic -D_REENTRANT $(ALL_CFLAGS) 
    169160 
  • lm-sensors/branches/lm-sensors-3.0.0/lib/Module.mk

    r4357 r4458  
    5050               $(MODULE_DIR)/error.c $(MODULE_DIR)/chips.c \ 
    5151               $(MODULE_DIR)/proc.c $(MODULE_DIR)/access.c \ 
    52                $(MODULE_DIR)/init.c 
    53 ifdef SYSFS_SUPPORT 
    54         LIBCSOURCES := $(LIBCSOURCES) $(MODULE_DIR)/sysfs.c 
    55 endif 
     52               $(MODULE_DIR)/init.c $(MODULE_DIR)/sysfs.c 
    5653 
    5754LIBOTHEROBJECTS := $(MODULE_DIR)/conf-parse.o $(MODULE_DIR)/conf-lex.o 
     
    6562 
    6663# How to create the shared library 
    67 ifdef SYSFS_SUPPORT 
    6864$(MODULE_DIR)/$(LIBSHLIBNAME): $(LIBSHOBJECTS) 
    6965        $(CC) -shared -Wl,-soname,$(LIBSHSONAME) -o $@ $^ -lc -lm -lsysfs 
    70 else 
    71 $(MODULE_DIR)/$(LIBSHLIBNAME): $(LIBSHOBJECTS) 
    72         $(CC) -shared -Wl,-soname,$(LIBSHSONAME) -o $@ $^ -lc -lm 
    73 endif 
    7466 
    7567$(MODULE_DIR)/$(LIBSHSONAME): $(MODULE_DIR)/$(LIBSHLIBNAME) 
  • lm-sensors/branches/lm-sensors-3.0.0/lib/sysfs.h

    r3098 r4458  
    2121#define SENSORS_LIB_SYSFS_H 
    2222 
    23 #ifdef SYSFS_SUPPORT 
    2423extern int sensors_found_sysfs; 
    2524 
     
    3231extern int sensors_read_sysfs_bus(void); 
    3332 
    34 #else 
    35  
    36 #define sensors_found_sysfs 0 
    37 #define sensors_init_sysfs() 0 
    38 #define sensors_read_sysfs_chips() (-1) 
    39 #define sensors_read_sysfs_bus() (-1) 
    40  
    41 #endif 
    42  
    4333#endif /* !SENSORS_LIB_SYSFS_H */