Changeset 2604

Show
Ignore:
Timestamp:
06/20/04 16:18:28 (4 years ago)
Author:
khali
Message:

Implement "make user_uninstall". Original patch contributed by

Rudolf Marek.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • lm-sensors/trunk/Makefile

    r2464 r2604  
    154154ifneq ($(MAKECMDGOALS),user) 
    155155ifneq ($(MAKECMDGOALS),user_install) 
     156ifneq ($(MAKECMDGOALS),user_uninstall) 
    156157SRCDIRS += mkpatch 
    157158SRCDIRS += kernel kernel/busses kernel/chips 
     159endif 
    158160endif 
    159161endif 
    …… 
    243245include $(patsubst %,%/Module.mk,$(SRCDIRS)) 
    244246ifneq ($(MAKECMDGOALS),clean) 
     247ifneq ($(MAKECMDGOALS),uninstall) 
     248ifneq ($(MAKECMDGOALS),user_uninstall) 
     249ifneq ($(MAKECMDGOALS),help) 
    245250include $(INCLUDEFILES) 
     251endif 
     252endif 
     253endif 
    246254endif 
    247255 
    …… 
    284292        $(RM) lm_sensors-* 
    285293 
     294user_uninstall:: 
     295         
     296uninstall :: user_uninstall 
     297        @echo "*** Note:" 
     298        @echo "***  * Kernel modules were not uninstalled." 
     299 
    286300# This is tricky, but it works like a charm. It needs lots of utilities 
    287301# though: cut, find, gzip, ln, tail and tar. 
    …… 
    312326        @echo '  user: build userspace programs' 
    313327        @echo '  user_install: install userspace programs' 
     328        @echo '  user_uninstall: remove userspace programs' 
    314329        @echo '  clean: cleanup' 
    315330        @echo '  package: create a distribution package' 

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

    r2189 r2604  
    3737INCLUDEFILES += $(MODULE_DIR)/sensors.hd 
    3838 
     39REMOVEKERNELINC := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(SYSINCLUDEDIR)/%,$(KERNELINCLUDEFILES)) 
     40 
    3941install-all-kernel-include: 
    4042        if [ -n "$(KERNELINCLUDEFILES)" ] ; then \ 
    …… 
    4547user_install :: install-all-kernel-include 
    4648 
     49user_uninstall:: 
     50        $(RM) $(REMOVEKERNELINC) 
     51 
    4752clean-all-kernel-include: 
    4853        $(RM) $(KERNELINCLUDEDIR)/*.h.install $(KERNELINCLUDEDIR)/sensors.h $(KERNELINCLUDEDIR)/sensors.hd 

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

    r2472 r2604  
    9393        $(CC) $(LIBCPPFLAGS) $(LIBCFLAGS) -Wno-unused -c $< -o $@ 
    9494 
     95REMOVELIBST := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(LIBDIR)/%,$(LIB_DIR)/$(LIBSTLIBNAME)) 
     96REMOVELIBSH := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(LIBDIR)/%,$(LIB_DIR)/$(LIBSHLIBNAME)) 
     97REMOVELNSO  := $(DESTDIR)$(LIBDIR)/$(LIBSHSONAME) 
     98REMOVELNBS  := $(DESTDIR)$(LIBDIR)/$(LIBSHBASENAME) 
     99REMOVELIBHF := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(LIBINCLUDEDIR)/%,$(LIBHEADERFILES)) 
     100REMOVEMAN3  := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(LIBMAN3DIR)/%,$(LIBMAN3FILES)) 
     101REMOVEMAN5  := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(LIBMAN5DIR)/%,$(LIBMAN5FILES)) 
     102 
    95103all-lib: $(LIBTARGETS) 
    96104user :: all-lib 
    …… 
    141149user_install :: install-lib 
    142150 
     151user_uninstall:: 
     152        $(RM) $(REMOVELIBST) $(REMOVELIBSH) $(REMOVELNSO) $(REMOVELNBS)  
     153        $(RM) $(REMOVELIBHF) $(REMOVEMAN3) $(REMOVEMAN5) 
     154 
    143155clean-lib: 
    144156        $(RM) $(LIB_DIR)/*.ld $(LIB_DIR)/*.ad 

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

    r2388 r2604  
    3636INCLUDEFILES += $(PROGDETECTSOURCES:.c=.rd) 
    3737 
     38REMOVEDETECTBIN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(SBINDIR)/%,$(PROGDETECTSBININSTALL)) 
     39REMOVEDETECTMAN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(PROGDETECTMAN8DIR)/%,$(PROGDETECTMAN8FILES)) 
     40 
    3841all-prog-detect: $(PROGDETECTTARGETS) 
    3942user :: all-prog-detect 
    …… 
    4851user_install :: install-prog-detect 
    4952 
     53user_uninstall:: 
     54        $(RM) $(REMOVEDETECTBIN) 
     55        $(RM) $(REMOVEDETECTMAN) 
     56 
    5057clean-prog-detect: 
    5158        $(RM) $(PROGDETECTDIR)/*.rd $(PROGDETECTDIR)/*.ro $(PROGDETECTTARGETS) 

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

    r2490 r2604  
    4444INCLUDEFILES += $(PROGDUMPSOURCES:.c=.rd) 
    4545 
     46REMOVEDUMPBIN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(SBINDIR)/%,$(PROGDUMPBININSTALL)) 
     47REMOVEDUMPMAN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(PROGDUMPMAN8DIR)/%,$(PROGDUMPMAN8FILES)) 
     48 
    4649all-prog-dump: $(PROGDUMPTARGETS) 
    4750user :: all-prog-dump 
    …… 
    5962user_install :: install-prog-dump 
    6063 
     64user_uninstall:: 
     65        $(RM) $(REMOVEDUMPBIN) 
     66        $(RM) $(REMOVEDUMPMAN) 
     67 
    6168clean-prog-dump: 
    6269        $(RM) $(PROGDUMPDIR)/*.rd $(PROGDUMPDIR)/*.ro $(PROGDUMPTARGETS) 

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

    r2189 r2604  
    2323                     $(MODULE_DIR)/decode-vaio.pl 
    2424 
     25REMOVEEEPROMBIN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(BINDIR)/%,$(PROGEEPROMTARGETS)) 
     26 
    2527install-prog-eeprom: $(PROGEEPROMTARGETS) 
    2628        $(MKDIR) $(DESTDIR)$(BINDIR) 
    …… 
    2931user_install :: install-prog-eeprom 
    3032 
     33user_uninstall:: 
     34        $(RM) $(REMOVEEEPROMBIN) 

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

    r2572 r2604  
    2323                  $(MODULE_DIR)/pwmconfig 
    2424 
     25REMOVEPWMBIN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(SBINDIR)/%,$(PROGPWMTARGETS)) 
     26 
    2527install-prog-pwm: $(PROGPWMTARGETS) 
    2628        $(MKDIR) $(DESTDIR)$(SBINDIR) 
    …… 
    2931user_install :: install-prog-pwm 
    3032 
     33user_uninstall:: 
     34        $(RM) $(REMOVEPWMBIN) 

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

    r2384 r2604  
    3838INCLUDEFILES += $(PROGSENSORDSOURCES:.c=.rd) 
    3939 
     40REMOVESENSORDBIN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(SBINDIR)/%,$(PROGSENSORDTARGETS)) 
     41REMOVESENSORDMAN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(PROGSENSORDMAN8DIR)/%,$(PROGSENSORDMAN8FILES)) 
     42 
    4043$(PROGSENSORDTARGETS): $(PROGSENSORDSOURCES:.c=.ro) lib/$(LIBSHBASENAME) 
    4144        $(CC) $(EXLDFLAGS) -o $@ $(PROGSENSORDSOURCES:.c=.ro) -Llib -lsensors -lrrd 
    …… 
    5053user_install :: install-prog-sensord 
    5154 
     55user_uninstall:: 
     56        $(RM) $(REMOVESENSORDBIN) 
     57        $(RM) $(REMOVESENSORDMAN) 
     58 
    5259clean-prog-sensord: 
    5360        $(RM) $(PROGSENSORDDIR)/*.rd $(PROGSENSORDDIR)/*.ro  

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

    r2394 r2604  
    3434INCLUDEFILES += $(PROGSENSORSSOURCES:.c=.rd) 
    3535 
     36REMOVESENSORSBIN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(BINDIR)/%,$(PROGSENSORSTARGETS)) 
     37REMOVESENSORSMAN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(PROGSENSORSMAN1DIR)/%,$(PROGSENSORSMAN1FILES)) 
     38 
    3639LIBICONV := $(shell if /sbin/ldconfig -p | grep -q libiconv\\.so ; then echo \-liconv; else echo; fi) 
    3740 
    …… 
    4851user_install :: install-prog-sensors 
    4952 
     53user_uninstall:: 
     54        $(RM) $(REMOVESENSORSBIN) 
     55        $(RM) $(REMOVESENSORSMAN) 
     56 
    5057clean-prog-sensors: 
    5158        $(RM) $(PROGSENSORSDIR)/*.rd $(PROGSENSORSDIR)/*.ro  

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

    r2189 r2604  
    2121PROGXEONTARGETS := $(MODULE_DIR)/decode-xeon.pl 
    2222 
     23REMOVEXEONBIN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(BINDIR)/%,$(PROGXEONTARGETS)) 
     24 
    2325install-prog-xeon: $(PROGXEONTARGETS) 
    2426        $(MKDIR) $(DESTDIR)$(BINDIR) 
    …… 
    2729user_install :: install-prog-xeon 
    2830 
     31user_uninstall:: 
     32        $(RM) $(REMOVEXEONBIN)