Changeset 3327

Show
Ignore:
Timestamp:
07/19/99 13:21:35 (9 years ago)
Author:
frodo
Message:

'make install' now also installs the header files.

By default, they are installed in /usr/local/include/linux; that way,
'#include <linux/i2c.h>' will still work, but it won't overwrite your
kernel tree.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • i2c/trunk/Makefile

    r3315 r3327  
    5252MODDIR := /lib/modules/current/extra/misc 
    5353 
     54# This is the directory into which the header files will be installed. 
     55# If you want to make sure your current kernel tree is not overwritten, 
     56# the default should work. 
     57LINUX_INCLUDE_DIR := /usr/local/include/linux 
     58#LINUX_INCLUDE_DIR := $(LINUX_HEADERS) 
     59 
    5460# Uncomment the second line if you are a developer. This will enable many 
    5561# additional warnings at compile-time 
    …… 
    6773 
    6874install: 
    69         $(MAKE) -C kernel KERNEL_LOCATION=$(LINUX) MODULE_DIR=$(MODDIR) install 
     75        $(MAKE) -C kernel KERNEL_LOCATION=$(LINUX) MODULE_DIR=$(MODDIR) \ 
     76                I2CKERNELDIR=(LINUX_INCLUDE_DIR) install 
    7077 
    7178clean: 

  • i2c/trunk/kernel/Makefile

    r3314 r3327  
    33KERNEL_LOCATION=/usr/src/linux 
    44CURRENT=$(shell uname -r) 
     5I2CINCLUDES := i2c.h i2c-dev.h i2c-algo-bit.h i2c-algo-pcf.h \ 
     6               i2c-elektor.h i2c-pcf8584.h 
     7I2CKERNELDIR := /usr/include/linux 
    58 
    69################################################# 
    …… 
    1417EXTRA_CFLAGS = -Wno-unused 
    1518 
     19 
    1620here: 
    1721        DIR=`pwd`; (cd $(KERNEL_LOCATION); make SUBDIRS=$$DIR modules) 
    …… 
    1923install: 
    2024        su -c "cp -v $(M_OBJS) $(MX_OBJS) /lib/modules/$(CURRENT)/misc" 
     25        su -c "cp -v $(I2CINCLUDES) $(I2CKERNELDIR)" 
    2126 
    2227clean: 

  • i2c/trunk/kernel/Module.mk

    r3315 r3327  
    2424# defined value verbatim into the command-list of rules... 
    2525KERNELTARGETS := $(MODULE_DIR)/i2c-core.o \ 
     26                 $(MODULE_DIR)/i2c-dev.o \ 
    2627                 $(MODULE_DIR)/i2c-algo-bit.o \ 
    27                  $(MODULE_DIR)/i2c-dev.o \ 
    2828                 $(MODULE_DIR)/i2c-algo-pcf.o \ 
    2929                 $(MODULE_DIR)/i2c-elv.o \ 
    …… 
    3131                 $(MODULE_DIR)/i2c-velleman.o \ 
    3232                 $(MODULE_DIR)/i2c-elektor.o  
     33 
     34KERNELINCLUDES := $(MODULE_DIR)/i2c.h $(MODULE_DIR)/i2c-dev.h \ 
     35                  $(MODULE_DIR)/i2c-algo-bit.h $(MODULE_DIR)/i2c-algo-pcf.h \ 
     36                  $(MODULE_DIR)/i2c-elektor.h $(MODULE_DIR)/i2c-pcf8584.h 
    3337            
    34  
    3538# Include all dependency files 
    3639INCLUDEFILES += $(KERNELTARGETS:.o=.d) 
    …… 
    4043 
    4144install-kernel: all-kernel 
    42         $(MKDIR) $(MODDIR) 
     45        $(MKDIR) $(MODDIR) $(LINUX_INCLUDE_DIR) 
    4346        $(INSTALL) -o root -g root -m 644 $(KERNELTARGETS) $(MODDIR) 
     47        $(INSTALL) -o root -g root -m 644 $(KERNELINCLUDES) $(LINUX_INCLUDE_DIR) 
    4448install :: install-kernel 
    4549