summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkhali <khali@7894878c-1315-0410-8ee3-d5d059ff63e0>2006-07-24 19:34:09 +0000
committerkhali <khali@7894878c-1315-0410-8ee3-d5d059ff63e0>2006-07-24 19:34:09 +0000
commit7a1cc87923f4373385f2d1f2bc44d2da1e55228e (patch)
tree88e599d53aaddd393373a535246d7d667649af89
parentaec939e051c07a65b2b63127861316143d45fa98 (diff)
downloadlm-sensors-7a1cc87923f4373385f2d1f2bc44d2da1e55228e.tar.gz
Makefile: Silent errors on missing dependency files.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4069 7894878c-1315-0410-8ee3-d5d059ff63e0
-rw-r--r--CHANGES3
-rw-r--r--Makefile10
-rw-r--r--doc/developers/makefiles4
-rw-r--r--kernel/chips/Module.mk3
4 files changed, 8 insertions, 12 deletions
diff --git a/CHANGES b/CHANGES
index 83d7a4e0..9079ec7c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,7 +11,8 @@ lm_sensors CHANGES file
Fix all memory leaks (yeah!)
Fix no sensors being reported as an error
Makefile: Don't grep autoconf.h on user-space targets
- Makefile: Fix depmod on non-running kernel version
+ Fix depmod on non-running kernel version
+ Silent errors on missing dependency files
Module i2c-ali1535: Drop redundant semaphore (2.6 backport)
Module i2c-amd756-s4882: Improve static semaphore initialization
(2.6 backport)
diff --git a/Makefile b/Makefile
index 42b25a9a..ab308e15 100644
--- a/Makefile
+++ b/Makefile
@@ -279,7 +279,7 @@ LIBCPPFLAGS := $(LIBCPPFLAGS) -DSYSFS_SUPPORT
endif
LIBCFLAGS := -fpic $(ALL_CFLAGS)
-.PHONY: all clean install version package dep
+.PHONY: all clean install version package
# Make all the default rule
all::
@@ -293,7 +293,7 @@ ifneq ($(MAKECMDGOALS),user_uninstall)
ifneq ($(MAKECMDGOALS),help)
ifneq ($(MAKECMDGOALS),package)
ifneq ($(MAKECMDGOALS),userpackage)
-include $(INCLUDEFILES)
+-include $(INCLUDEFILES)
endif
endif
endif
@@ -305,9 +305,6 @@ endif
MANPAGES := $(LIBMAN3FILES) $(LIBMAN5FILES) $(PROGDETECTMAN8FILES) $(PROGDUMPMAN8FILES) \
$(PROGSENSORSMAN1FILES) $(PROGPWMMAN8FILES) prog/sensord/sensord.8
-# Making the dependency files - done automatically!
-dep :
-
user ::
user_install::
@echo "*** Important note:"
@@ -395,7 +392,6 @@ help:
@echo ' user_uninstall: remove userspace programs'
@echo ' clean: cleanup'
@echo ' package: create a distribution package'
- @echo 'Note: make dep is automatic'
$(LINUX)/.config:
@echo
@@ -429,7 +425,7 @@ manhtml:
.SUFFIXES:
-# We need to create dependency files. Tricky. We sed rule puts dir/file.d and
+# We need to create dependency files. Tricky. The sed rule puts dir/file.d and
# dir/file.c in front of the dependency file rule.
# .o files are used for modules
diff --git a/doc/developers/makefiles b/doc/developers/makefiles
index 93bfd2f0..b94b50be 100644
--- a/doc/developers/makefiles
+++ b/doc/developers/makefiles
@@ -24,10 +24,6 @@ There are several interesting targets defined through this Makefile:
any other target).
* clean-i2c, clean-src, ...
Remove anything which can be regenerated from the designated directory.
- * dep
- Do nothing, but generate any missing .d files. The command
- 'make clean && make dep' canbe useful in this case ('make clean dep'
- will not work, due to technical reasons!).
* version
Regenerate version.h, using the current date for the date-stamp, and
a user-supplied version number.
diff --git a/kernel/chips/Module.mk b/kernel/chips/Module.mk
index f8a7485a..f84cad2f 100644
--- a/kernel/chips/Module.mk
+++ b/kernel/chips/Module.mk
@@ -176,6 +176,9 @@ endif
ifneq ($(shell if grep -q '^CONFIG_SENSORS_W83627HF=y' $(LINUX)/.config; then echo 1; fi),1)
KERNELCHIPSTARGETS += $(MODULE_DIR)/w83627hf.o
endif
+ifneq ($(shell if grep -q '^CONFIG_SENSORS_W83627EHF=y' $(LINUX)/.config; then echo 1; fi),1)
+KERNELCHIPSTARGETS += $(MODULE_DIR)/w83627ehf.o
+endif
ifneq ($(shell if grep -q '^CONFIG_SENSORS_W83L785TS=y' $(LINUX)/.config; then echo 1; fi),1)
KERNELCHIPSTARGETS += $(MODULE_DIR)/w83l785ts.o
endif