Changeset 179

Show
Ignore:
Timestamp:
01/28/99 15:45:20 (14 years ago)
Author:
frodo
Message:

Makefile tweaks for the new kernel directory structure

Location:
lm-sensors/trunk
Files:
1 added
4 modified

Legend:

Unmodified
Added
Removed

  • lm-sensors/trunk/Makefile

    r176 r179  
    4040# smbus/sensor module versions, you will get into severe problems. 
    4141# If you want to use a self-compiled version of the i2c modules, make 
    42 # sure <linux/i2c.h> contains the *correct* i2c header file! 
     42# sure <linux/i2c.h> contains the *correct* i2c header file! The stock 
     43# Linux 2.1.xxx and 2.2.x modules are *not* good enough; you really need 
     44# Simon Vogl's version! 
    4345I2C := 1 
    4446#I2C := 0 
    … …  
    103105 
    104106# The subdirectories we need to build things in  
    105 SRCDIRS := kernel lib prog/sensors prog/dump etc 
     107SRCDIRS := kernel kernel/busses kernel/chips kernel/include lib prog/sensors \ 
     108           prog/dump etc 
    106109ifeq ($(I2C),1) 
    107110SRCDIRS += i2c i2c/detect i2c/drivers i2c/eeprom 

  • lm-sensors/trunk/kernel/Module.mk

    r177 r179  
    2121MODULE_DIR := kernel 
    2222 
    23 SRCDIRS := kernel/busses kernel/chips 
    24  
    2523# Regrettably, even 'simply expanded variables' will not put their currently 
    2624# defined value verbatim into the command-list of rules... 
    27 SRCTARGETS := $(MODULE_DIR)/smbus.o \ 
    28               $(MODULE_DIR)/i2c-proc.o \ 
    29               $(MODULE_DIR)/i2c-dev.o $(MODULE_DIR)/sensors.o 
    30  
    31 SRCHEADERFILES := $(MODULE_DIR)/include/sensors.h $(MODULE_DIR)/include/isa.h \ 
    32                   $(MODULE_DIR)/include/smbus.h $(MODULE_DIR)/include/i2c-dev.h 
     25KERNELTARGETS := $(MODULE_DIR)/smbus.o \ 
     26                 $(MODULE_DIR)/i2c-proc.o \ 
     27                 $(MODULE_DIR)/i2c-dev.o $(MODULE_DIR)/sensors.o 
    3328 
    3429# Include all dependency files 
    35 INCLUDEFILES += $(SRCTARGETS:.o=.d) 
     30INCLUDEFILES += $(KERNELTARGETS:.o=.d) 
    3631 
    37 all-src: $(SRCTARGETS) 
    38 all :: all-src 
     32all-kernel: $(KERNELTARGETS) 
     33all :: all-kernel 
    3934 
    40 # Include all makefiles for sub-modules 
    41 INCLUDEFILES :=  
    42 include $(patsubst %,%/Module.mk,$(SRCDIRS)) 
    43 ifneq ($(MAKECMDGOALS),clean) 
    44 include $(INCLUDEFILES) 
    45 endif 
     35install-kernel: all-kernel 
     36        $(MKDIR) $(MODDIR) 
     37        $(INSTALL) -o root -g root -m 644 $(KERNELTARGETS) $(MODDIR) 
     38install :: install-kernel 
    4639 
    47  
    48 install-src: all-src 
    49         $(MKDIR) $(MODDIR) $(SYSINCLUDEDIR) 
    50         $(INSTALL) -o root -g root -m 644 $(SRCTARGETS) $(MODDIR) 
    51         $(INSTALL) -o root -g root -m 644 $(SRCHEADERFILES) $(SYSINCLUDEDIR) 
    52 install :: install-src 
    53  
    54 clean-src: 
    55         $(RM) $(SRCTARGETS) $(SRCTARGETS:.o=.d) 
    56 clean :: clean-src 
     40clean-kernel: 
     41        $(RM) $(KERNELTARGETS) $(KERNELTARGETS:.o=.d) 
     42clean :: clean-kernel 

  • lm-sensors/trunk/kernel/busses/Module.mk

    r176 r179  
    2323# Regrettably, even 'simply expanded variables' will not put their currently 
    2424# defined value verbatim into the command-list of rules... 
    25 SRCTARGETS := $(MODULE_DIR)/i2c-piix4.o $(MODULE_DIR)/i2c-isa.o 
    26  
    27 SRCHEADERFILES := $(MODULE_DIR)/../include/sensors.h $(MODULE_DIR)/../include/isa.h \ 
    28                   $(MODULE_DIR)/../include/smbus.h $(MODULE_DIR)/../include/i2c-dev.h 
     25KERNELBUSSESTARGETS := $(MODULE_DIR)/i2c-piix4.o $(MODULE_DIR)/i2c-isa.o 
    2926 
    3027# Include all dependency files 
    31 INCLUDEFILES += $(SRCTARGETS:.o=.d) 
     28INCLUDEFILES += $(KERNELBUSSESTARGETS:.o=.d) 
    3229 
    33 all-src: $(SRCTARGETS) 
    34 all :: all-src 
     30all-kernel-busses: $(KERNELBUSSESTARGETS) 
     31all :: all-kernel-busses 
    3532 
    36 install-src-busses: all-src 
    37         $(MKDIR) $(MODDIR) $(SYSINCLUDEDIR) 
    38         $(INSTALL) -o root -g root -m 644 $(SRCTARGETS) $(MODDIR) 
    39         $(INSTALL) -o root -g root -m 644 $(SRCHEADERFILES) $(SYSINCLUDEDIR) 
    40 install :: install-src-busses 
     33install-kernel-busses: all-kernel-busses 
     34        $(MKDIR) $(MODDIR)  
     35        $(INSTALL) -o root -g root -m 644 $(KERNELBUSSESTARGETS) $(MODDIR) 
     36install :: install-kernel-busses 
    4137 
    42 clean-src-busses: 
    43         $(RM) $(SRCTARGETS) $(SRCTARGETS:.o=.d) 
    44 clean :: clean-src-busses 
     38clean-kernel-busses: 
     39        $(RM) $(KERNELBUSSESTARGETS) $(KERNELBUSSESTARGETS:.o=.d) 
     40clean :: clean-kernel-busses 

  • lm-sensors/trunk/kernel/chips/Module.mk

    r176 r179  
    2323# Regrettably, even 'simply expanded variables' will not put their currently 
    2424# defined value verbatim into the command-list of rules... 
    25 SRCTARGETS := $(MODULE_DIR)/adm1021.o $(MODULE_DIR)/adm9240.o \ 
    26               $(MODULE_DIR)/eeprom.o $(MODULE_DIR)/gl518sm.o \ 
    27               $(MODULE_DIR)/lm75.o $(MODULE_DIR)/lm78.o \ 
    28               $(MODULE_DIR)/lm80.o $(MODULE_DIR)/ltc1710.o \ 
    29               $(MODULE_DIR)/w83781d.o 
    30  
    31 SRCHEADERFILES := $(MODULE_DIR)/../include/sensors.h $(MODULE_DIR)/../include/isa.h \ 
    32                   $(MODULE_DIR)/../include/smbus.h $(MODULE_DIR)/../include/i2c-dev.h 
     25KERNELCHIPSTARGETS := $(MODULE_DIR)/adm1021.o $(MODULE_DIR)/adm9240.o \ 
     26                      $(MODULE_DIR)/eeprom.o $(MODULE_DIR)/gl518sm.o \ 
     27                      $(MODULE_DIR)/lm75.o $(MODULE_DIR)/lm78.o \ 
     28                      $(MODULE_DIR)/lm80.o $(MODULE_DIR)/ltc1710.o \ 
     29                      $(MODULE_DIR)/w83781d.o 
    3330 
    3431# Include all dependency files 
    35 INCLUDEFILES += $(SRCTARGETS:.o=.d) 
     32INCLUDEFILES += $(KERNELCHIPSTARGETS:.o=.d) 
    3633 
    37 all-src: $(SRCTARGETS) 
    38 all :: all-src 
     34all-kernel-chips: $(KERNELCHIPSTARGETS) 
     35all :: all-kernel-chips 
    3936 
    40 install-src-chips: all-src 
    41         $(MKDIR) $(MODDIR) $(SYSINCLUDEDIR) 
    42         $(INSTALL) -o root -g root -m 644 $(SRCTARGETS) $(MODDIR) 
    43         $(INSTALL) -o root -g root -m 644 $(SRCHEADERFILES) $(SYSINCLUDEDIR) 
    44 install :: install-src-chips 
     37install-kernel-chips: all-kernel-chips 
     38        $(MKDIR) $(MODDIR)  
     39        $(INSTALL) -o root -g root -m 644 $(KERNELCHIPSTARGETS) $(MODDIR) 
     40install :: install-kernel-chips 
    4541 
    46 clean-src-chips: 
    47         $(RM) $(SRCTARGETS) $(SRCTARGETS:.o=.d) 
    48 clean :: clean-src-chips 
     42clean-kernel-chips: 
     43        $(RM) $(KERNELCHIPSTARGETS) $(KERNELCHIPSTARGETS:.o=.d) 
     44clean :: clean-kernel-chips