Changeset 3802

Timestamp:

06/14/03 21:13:28 (10 years ago)

Author:

mds

Message:

Copy over -nostdinc include method from sensors;

Remove pre-2.4 method of installing in misc;
Remove old gzipped modules;
rmdir misc directory if present and empty

Location:

i2c/branches/lk2-4

Files:

• Makefile (modified) (4 diffs)
• kernel/Module.mk (modified) (1 diff)

i2c/branches/lk2-4/Makefile

@@ -106 +106 @@
 # Some often-used commands with default options
 MKDIR := mkdir -p
+RMDIR := rmdir
 RM := rm -f
 CC := gcc
@@ -118 +119 @@
 # MODCFLAGS is to create in-kernel object files (modules)
 
-CFLAGS := -I$(LINUX_HEADERS) -O2 -DLM_SENSORS
+CPPFLAGS := -I$(LINUX_HEADERS)
+CFLAGS := -O2 -DLM_SENSORS
 
 ifeq ($(WARN),1)
@@ -140 +142 @@
 
 ifeq ($(SMP),1)
-MODCFLAGS += -D__SMP__
+MODCPPFLAGS += -D__SMP__
 endif
 
 ifeq ($(MODVER),1)
-MODCFLAGS += -DMODVERSIONS -include $(LINUX_HEADERS)/linux/modversions.h
+MODCPPFLAGS += -DMODVERSIONS -include $(LINUX_HEADERS)/linux/modversions.h
 endif
+
+# This magic is from the kernel Makefile.
+# Extra cflags for kbuild 2.4.  The default is to forbid includes by kernel code
+# from user space headers.
+kbuild_2_4_nostdinc := -nostdinc $(shell $(CC) -print-search-dirs | sed -ne 's/install: \(.*\)/-I \1include/gp')
+MODCPPFLAGS += $(CPPFLAGS) $(kbuild_2_4_nostdinc)
 
 .PHONY: dep
@@ -181 +189 @@
 # .o files are used for modules
 %.o: %.c
-        $(CC) $(MODCFLAGS) -c $< -o $@
+        $(CC) $(MODCPPFLAGS) $(MODCFLAGS) -c $< -o $@
 
 %.d: %.c
-        $(CC) -M -MG $(MODCFLAGS) $< | \
+        $(CC) -M -MG $(MODCPPFLAGS) $(MODCFLAGS) $< | \
         sed -e 's@^\(.*\)\.o:@$*.d $*.o: Makefile '`dirname $*.d`/Module.mk' @' > $@
 

i2c/branches/lk2-4/kernel/Module.mk

@@ -100 +100 @@
 install-kernel: all-kernel
         if [ -n "$(KERNELTARGETS)" ] ; then \
-          if [ -d "$(DESTDIR)$(MODPREF)/kernel" ] ; then \
-            $(MKDIR) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c ; \
-            $(INSTALL) -o root -g root -m 644 $(KERNELTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c ; \
-            for i in $(KERNELTARGETS) ; do \
-              $(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` ; \
-            done \
-          else \
-            $(MKDIR) $(DESTDIR)$(MODPREF)/misc ; \
-            $(INSTALL) -o root -g root -m 644 $(KERNELTARGETS) $(DESTDIR)$(MODPREF)/misc ; \
-          fi \
+          $(MKDIR) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c ; \
+          $(INSTALL) -o root -g root -m 644 $(KERNELTARGETS) $(DESTDIR)$(MODPREF)/kernel/drivers/i2c ; \
+          for i in $(KERNELTARGETS) ; do \
+            $(RM) $(DESTDIR)$(MODPREF)/misc/`basename $$i` $(DESTDIR)$(MODPREF)/kernel/drivers/i2c/`basename $$i`.gz ; \
+          done ; \
+          $(RMDIR) $(DESTDIR)$(MODPREF)/misc 2> /dev/null || true ; \
         fi
         if [ -n "$(KERNELINCLUDES)" ] ; then \