Changeset 581

Show
Ignore:
Timestamp:
09/27/99 12:52:50 (9 years ago)
Author:
frodo
Message:

Surer `make clean' implementation

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • lm-sensors/trunk/Makefile

    r575 r581  
    130130 
    131131# The subdirectories we need to build things in  
    132 SRCDIRS :=  
     132SRCDIRS := mkpatch 
    133133ifeq ($(COMPILE_KERNEL),1) 
    134134SRCDIRS += kernel kernel/busses kernel/chips kernel/include 

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

    r575 r581  
    2020# verbatim in the rules, until it is redefined.  
    2121MODULE_DIR := kernel 
     22KERNELDIR := $(MODULE_DIR) 
    2223 
    2324# Regrettably, even 'simply expanded variables' will not put their currently 
    …… 
    4041 
    4142clean-kernel: 
    42         $(RM) $(KERNELTARGETS) $(KERNELTARGETS:.o=.d) 
     43        $(RM) $(KERNELDIR)/*.o $(KERNELDIR)/*.d 
    4344clean :: clean-kernel 

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

    r575 r581  
    2020# verbatim in the rules, until it is redefined.  
    2121MODULE_DIR := kernel/busses 
     22KERNELBUSSESDIR := $(MODULE_DIR) 
    2223 
    2324# Regrettably, even 'simply expanded variables' will not put their currently 
    …… 
    5455 
    5556clean-kernel-busses: 
    56         $(RM) $(KERNELBUSSESTARGETS) $(KERNELBUSSESTARGETS:.o=.d) 
     57        $(RM) $(KERNELBUSSESDIR)/*.o $(KERNELBUSSESDIR)/*.d 
    5758clean :: clean-kernel-busses 

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

    r575 r581  
    2020# verbatim in the rules, until it is redefined.  
    2121MODULE_DIR := kernel/chips 
     22KERNELCHIPSDIR := $(MODULE_DIR) 
    2223 
    2324# Regrettably, even 'simply expanded variables' will not put their currently 
    …… 
    6970 
    7071clean-kernel-chips: 
    71         $(RM) $(KERNELCHIPSTARGETS) $(KERNELCHIPSTARGETS:.o=.d) 
     72        $(RM) $(KERNELCHIPSDIR)/*.o $(KERNELCHIPSDIR)/*.d 
    7273clean :: clean-kernel-chips 

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

    r575 r581  
    2020# verbatim in the rules, until it is redefined.  
    2121MODULE_DIR := kernel/include 
     22KERNELINCLUDEDIR := $(MODULE_DIR) 
    2223 
    2324KERNELINCLUDEFILES :=  
    …… 
    3637 
    3738clean-all-kernel-include: 
    38         $(RM) $(KERNELINCLUDEFILES:.h=.h.install) 
     39        $(RM) $(KERNELINCLUDEDIR)/*.h.install 
    3940 
    4041clean :: clean-all-kernel-include 

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

    r212 r581  
    2020# verbatim in the rules, until it is redefined.  
    2121MODULE_DIR := lib 
     22LIBDIR := $(MODULE_DIR) 
    2223 
    2324# The manual dirs and files 
    …… 
    4950LIBSHOBJECTS := $(LIBCSOURCES:.c=.lo) $(LIBOTHEROBJECTS:.o=.lo) 
    5051LIBSTOBJECTS := $(LIBCSOURCES:.c=.ao) $(LIBOTHEROBJECTS:.o=.ao) 
    51 LIBEXTRACLEAN := $(MODULE_DIR)/conf-parse.h $(MODULE_DIR)/libsensors.so* 
     52LIBEXTRACLEAN := $(MODULE_DIR)/conf-parse.h $(MODULE_DIR)/conf-parse.c \ 
     53                 $(MODULE_DIR)/conf-lex.c 
    5254 
    5355LIBHEADERFILES := $(MODULE_DIR)/error.h $(MODULE_DIR)/sensors.h \ 
    …… 
    9698 
    9799clean-lib: 
    98         $(RM) $(LIBTARGETS) $(LIBSHOBJECTS) $(LIBSTOBJECTS) 
    99         $(RM) $(LIBSHOBJECTS:.lo=.ld) $(LIBSTOBJECTS:.ao=.ad) 
    100         $(RM) $(LIBOTHEROBJECTS:.o=.c) $(LIBEXTRACLEAN) 
     100        $(RM) $(LIBDIR)/*.ld $(LIBDIR)/*.ad 
     101        $(RM) $(LIBDIR)/*.lo $(LIBDIR)/*.ao 
     102        $(RM) $(LIBTARGETS) $(LIBEXTRACLEAN) 
    101103clean :: clean-lib 

  • lm-sensors/trunk/prog/detect/Module.mk

    r323 r581  
    2020# verbatim in the rules, until it is redefined.  
    2121MODULE_DIR := prog/detect 
     22PROGDETECTDIR := $(MODULE_DIR) 
    2223 
    2324# Regrettably, even 'simply expanded variables' will not put their currently 
    …… 
    4041 
    4142clean-prog-detect: 
    42         $(RM) $(PROGDETECTSOURCES:.c=.rd) $(PROGDETECTSOURCES:.c=.ro) \ 
    43               $(PROGDETECTTARGETS) 
     43        $(RM) $(PROGDETECTDIR)/*.rd $(PROGDETECTDIR)/*.ro $(PROGDETECTTARGETS) 
    4444clean :: clean-prog-detect 

  • lm-sensors/trunk/prog/dump/Module.mk

    r207 r581  
    2020# verbatim in the rules, until it is redefined.  
    2121MODULE_DIR := prog/dump 
     22PROGDUMPDIR := $(MODULE_DIR) 
    2223 
    2324# Regrettably, even 'simply expanded variables' will not put their currently 
    …… 
    3435 
    3536clean-prog-dump: 
    36         $(RM) $(PROGDUMPSOURCES:.c=.rd) $(PROGDUMPSOURCES:.c=.ro) \ 
    37               $(PROGDUMPTARGETS) 
     37        $(RM) $(PROGDUMPDIR)/*.rd $(PROGDUMPDIR)/*.ro $(PROGDUMPTARGETS) 
    3838clean :: clean-prog-dump 

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

    r207 r581  
    2020# verbatim in the rules, until it is redefined.  
    2121MODULE_DIR := prog/sensors 
     22PROGSENSORSDIR := $(MODULE_DIR) 
    2223 
    2324PROGSENSORSMAN1DIR := $(MANDIR)/man1 
    …… 
    4647 
    4748clean-prog-sensors: 
    48         $(RM) $(PROGSENSORSSOURCES:.c=.rd) $(PROGSENSORSSOURCES:.c=.ro) \ 
    49               $(PROGSENSORSTARGETS) 
     49        $(RM) $(PROGSENSORSDIR)/*.rd $(PROGSENSORSDIR)/*.ro  
     50        $(RM) $(PROGSENSORSTARGETS) 
    5051clean :: clean-prog-sensors