From a5f164aca563fbf2a72cfa1410cb778f50f0f85e Mon Sep 17 00:00:00 2001
From: Frodo Looijaard <frodol@dds.nl>
Date: Wed, 13 Jan 1999 19:14:38 +0000
Subject: [PATCH] Made 'make install' first make everything; disabled the
 installation         of the old i2c i2c-dev now we have our own.

git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@161 7894878c-1315-0410-8ee3-d5d059ff63e0
---
 i2c/Module.mk          | 10 ++++++----
 kernel/Module.mk       |  2 +-
 lib/Module.mk          |  2 +-
 prog/sensors/Module.mk |  3 +--
 src/Module.mk          |  2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/i2c/Module.mk b/i2c/Module.mk
index cfdd450b..ad07a622 100644
--- a/i2c/Module.mk
+++ b/i2c/Module.mk
@@ -23,23 +23,25 @@ MODULE_DIR := i2c
 # Regrettably, even 'simply expanded variables' will not put their currently
 # defined value verbatim into the command-list of rules...
 I2CTARGETS := $(MODULE_DIR)/i2c-core.o  $(MODULE_DIR)/algo-bit.o \
-              $(MODULE_DIR)/i2c-dev.o   $(MODULE_DIR)/bit-lp.o \
+              $(MODULE_DIR)/bit-lp.o \
               $(MODULE_DIR)/bit-velle.o $(MODULE_DIR)/bit-mb.o
+I2CADDTARGETS := $(MODULE_DIR)/i2c-dev.o
 
 I2CHEADERFILES := $(MODULE_DIR)/i2c.h
 
 # Include all dependency files
 INCLUDEFILES += $(I2CTARGETS:.o=.d)
 
-all-i2c: $(I2CTARGETS)
+all-i2c: $(I2CTARGETS) $(I2CADDTARGETS)
 all :: all-i2c
 
-install-i2c:
+install-i2c: all-i2c
 	$(MKDIR) $(MODDIR) $(SYSINCLUDEDIR)
 	$(INSTALL) -o root -g root -m 644 $(I2CTARGETS) $(MODDIR)
 	$(INSTALL) -o root -g root -m 644 $(I2CHEADERFILES) $(SYSINCLUDEDIR)
 install :: install-i2c
 
 clean-i2c:
-	$(RM) $(I2CTARGETS) $(I2CTARGETS:.o=.d)
+	$(RM) $(I2CTARGETS) $(I2CTARGETS:.o=.d) $(I2CADDTARGETS) \
+              $(I2CADDTARGETS:.o=.d)
 clean :: clean-i2c
diff --git a/kernel/Module.mk b/kernel/Module.mk
index 8a9e609c..c03259b9 100644
--- a/kernel/Module.mk
+++ b/kernel/Module.mk
@@ -40,7 +40,7 @@ INCLUDEFILES += $(SRCTARGETS:.o=.d)
 all-src: $(SRCTARGETS)
 all :: all-src
 
-install-src:
+install-src: all-src
 	$(MKDIR) $(MODDIR) $(SYSINCLUDEDIR)
 	$(INSTALL) -o root -g root -m 644 $(SRCTARGETS) $(MODDIR)
 	$(INSTALL) -o root -g root -m 644 $(SRCHEADERFILES) $(SYSINCLUDEDIR)
diff --git a/lib/Module.mk b/lib/Module.mk
index 463126b0..c0463c9a 100644
--- a/lib/Module.mk
+++ b/lib/Module.mk
@@ -76,7 +76,7 @@ INCLUDEFILES += $(LIBCSOURCES:.c=.ld) $(LIBCSOURCES:.c=.ad)
 all-lib: $(LIBTARGETS)
 all :: all-lib
 
-install-lib:
+install-lib: all-lib
 	$(MKDIR) $(LIBDIR) $(LIBINCLUDEDIR)
 	$(INSTALL) -o root -g root -m 644 $(LIBTARGETS) $(LIBDIR)
 	$(LN) $(LIBSHLIBNAME) $(LIBDIR)/$(LIBSHSONAME)
diff --git a/prog/sensors/Module.mk b/prog/sensors/Module.mk
index a45d81ef..90b311b3 100644
--- a/prog/sensors/Module.mk
+++ b/prog/sensors/Module.mk
@@ -35,8 +35,7 @@ $(PROGSENSORSTARGETS): $(PROGSENSORSSOURCES:.c=.ro) lib/$(LIBSHBASENAME)
 all-prog-sensors: $(PROGSENSORSTARGETS)
 all :: all-prog-sensors
 
-# No install rule
-install-prog-sensors:
+install-prog-sensors: all-prog-sensors
 	mkdir -p $(BINDIR)
 	$(INSTALL) -o root -g root -m 755 $(PROGSENSORSTARGETS) $(BINDIR)
 install :: install-prog-sensors
diff --git a/src/Module.mk b/src/Module.mk
index 8a9e609c..c03259b9 100644
--- a/src/Module.mk
+++ b/src/Module.mk
@@ -40,7 +40,7 @@ INCLUDEFILES += $(SRCTARGETS:.o=.d)
 all-src: $(SRCTARGETS)
 all :: all-src
 
-install-src:
+install-src: all-src
 	$(MKDIR) $(MODDIR) $(SYSINCLUDEDIR)
 	$(INSTALL) -o root -g root -m 644 $(SRCTARGETS) $(MODDIR)
 	$(INSTALL) -o root -g root -m 644 $(SRCHEADERFILES) $(SYSINCLUDEDIR)