Changeset 2893
- Timestamp:
- 02/07/05 20:58:57 (4 years ago)
- Files:
-
- lm-sensors/trunk/Makefile (modified) (4 diffs)
- lm-sensors/trunk/kernel/Module.mk (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
lm-sensors/trunk/Makefile
r2880 r2893 34 34 # and other things. 35 35 #LINUX := /usr/src/linux 36 LINUX := $(shell if [ -L /lib/modules/$(KERNELVERSION)/build] ; \36 LINUX := $(shell if [ -L "/lib/modules/$(KERNELVERSION)/build" ] ; \ 37 37 then echo "/lib/modules/$(KERNELVERSION)/build" ; \ 38 38 else echo "/usr/src/linux" ; fi) … … 48 48 #I2C_HEADERS := $(LINUX_HEADERS) 49 49 50 # Uncomment the third line on SMP systems if the magic invocation fails. It 51 # is a bit complicated because SMP configuration changed around kernel 2.1.130 52 SMP := $(shell if grep -q '^SMP[[:space:]]*=' $(LINUX)/Makefile || \ 53 grep -q '^[[:space:]]*\#define[[:space:]]*CONFIG_SMP[[:space:]]*1' $(LINUX_HEADERS)/linux/autoconf.h ; \ 50 # Uncomment the third line on SMP systems if the magic invocation fails. 51 SMP := $(shell if grep -q '^[[:space:]]*\#define[[:space:]]*CONFIG_SMP[[:space:]]*1' $(LINUX_HEADERS)/linux/autoconf.h ; \ 54 52 then echo 1; else echo 0; fi) 55 53 #SMP := 0 … … 58 56 # Uncomment the second or third line if the magic invocation fails. 59 57 # We need to know whether CONFIG_MODVERSIONS is defined. 60 MODVER := $(shell if cat $(LINUX_HEADERS)/linux/config.h $(LINUX_HEADERS)/linux/autoconf.h 2>/dev/null | grep -q '^[[:space:]]*\#define[[:space:]]*CONFIG_MODVERSIONS[[:space:]]*1'; then echo 1; else echo 0; fi) 58 MODVER := $(shell if grep -q '^[[:space:]]*\#define[[:space:]]*CONFIG_MODVERSIONS[[:space:]]*1' $(LINUX_HEADERS)/linux/autoconf.h ; \ 59 then echo 1; else echo 0; fi) 61 60 #MODVER := 0 62 61 #MODVER := 1 … … 85 84 # This is the main modules directory into which the modules will be installed. 86 85 # The magic invocation will return something like this: 87 # /lib/modules/2.2.15-ac9 88 #MODDIR := /lib/modules/`grep UTS_RELEASE $(LINUX_HEADERS)/linux/version.h|cut -f 2 -d'"'`/misc 89 #MODPREF := /lib/modules/$(KERNELVERSION) 90 #MODPREF := /lib/modules/`grep UTS_RELEASE $(LINUX_HEADERS)/linux/version.h|cut -f 2 -d'"'` 86 # /lib/modules/2.4.29 91 87 MODPREF := /lib/modules/$(shell $(CC) -I$(LINUX_HEADERS) -E etc/config.c | grep uts_release |cut -f 2 -d'"') 92 88 lm-sensors/trunk/kernel/Module.mk
r1747 r2893 25 25 # defined value verbatim into the command-list of rules... 26 26 KERNELTARGETS := 27 ifneq ($(shell if grep -q '^CONFIG_SENSORS=y' $(LINUX)/.config; then echo 1; fi),1)28 # sensors.c moved to i2c-proc.c in i2c package29 #KERNELTARGETS += $(MODULE_DIR)/sensors.o30 endif31 27 32 28 # Include all dependency files … … 38 34 # Remove sensors.o possibly left from old versions 39 35 install-kernel: all-kernel 40 # if [ -n "$(KERNELTARGETS)" ] ; then \41 # $(MKDIR) $(DESTDIR)$(MODDIR) ; \42 # $(INSTALL) -o root -g root -m 644 $(KERNELTARGETS) $(DESTDIR)$(MODDIR) ;\43 # fi44 36 $(RM) $(DESTDIR)$(MODPREF)/misc/sensors.o 45 37
