From 69d5b979eb053fbe4b435a4a9db7b2cde0584623 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Tue, 18 Feb 2014 08:41:30 +0000
Subject: [PATCH] Makefiles: 'uninstall' target fixes

Some components don't have 'uninstall' targets although the top-level
Makefile references them. Some others don't remove the proper file.

Signed-off-by: Steven J. Magnani <steve@digidescorp.com>


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5290 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 ibmvstgt/Makefile   | 4 ++++
 iscsi-scst/Makefile | 9 +++++++++
 mvsas_tgt/Makefile  | 3 +--
 qla2x00t/Makefile   | 2 +-
 srpt/Makefile       | 4 ++++
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ibmvstgt/Makefile b/ibmvstgt/Makefile
index 6c109a972..daaf57f4e 100644
--- a/ibmvstgt/Makefile
+++ b/ibmvstgt/Makefile
@@ -40,6 +40,10 @@ all: src/$(MODULE_SYMVERS)
 install: all src/ibmvstgt.ko
 	$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/src modules_install
 
+uninstall:
+	rm -f $(INSTALL_DIR)/libsrp.ko $(INSTALL_DIR)/ibmvstgt.ko
+	-/sbin/depmod -b $(INSTALL_MOD_PATH)/ -a $(KVER)
+
 src/Module.symvers src/Modules.symvers: $(SCST_DIR)/$(MODULE_SYMVERS)
 	cp $< $@;
 
diff --git a/iscsi-scst/Makefile b/iscsi-scst/Makefile
index 9290e2f27..05cf4f692 100644
--- a/iscsi-scst/Makefile
+++ b/iscsi-scst/Makefile
@@ -72,6 +72,15 @@ install: all
 	$(MAKE) -C $(KDIR) SCST_INC_DIR=$(SCST_INC_DIR) SUBDIRS=$(KMOD) \
 	  modules_install
 
+uninstall:
+	rm -f $(DESTDIR)$(SBINDIR)/iscsi-scstd \
+		$(DESTDIR)$(MANDIR)/man5/iscsi-scstd.conf.5 \
+		$(DESTDIR)$(MANDIR)/man8/iscsi-scstd.8 \
+		$(DESTDIR)$(SBINDIR)/iscsi-scst-adm \
+		$(DESTDIR)$(MANDIR)/man8/iscsi-scst-adm.8 \
+		$(INSTALL_DIR)/iscsi-scst.ko
+	-/sbin/depmod -b $(INSTALL_MOD_PATH)/ -a $(KVER)
+
 SCST_MOD_VERS := $(shell ls $(SCST_DIR)/Modules.symvers 2>/dev/null)
 ifneq ($(SCST_MOD_VERS),)
 Modules.symvers: $(SCST_DIR)/Modules.symvers
diff --git a/mvsas_tgt/Makefile b/mvsas_tgt/Makefile
index 331210287..5b4db8d9c 100644
--- a/mvsas_tgt/Makefile
+++ b/mvsas_tgt/Makefile
@@ -61,7 +61,6 @@ SCST_DIR := $(shell pwd)/../scst/src
 EXTRA_CFLAGS += -I$(SCST_INC_DIR)
 
 EXTRA_CFLAGS +=  -DSUPPORT_TARGET
-MODULE_NAME = mvsas_tgt
 
 EXTRA_CFLAGS += -DMV_DEBUG
 
@@ -114,7 +113,7 @@ else
 endif
 
 uninstall:
-	rm -f $(INSTALL_DIR)/$(MODULE_NAME).ko
+	rm -f $(INSTALL_DIR)/mvsas.ko
 	-/sbin/depmod -b $(INSTALL_MOD_PATH)/ -a $(KVER)
 
 ########## END OUT-OF-TREE RULES ##########
diff --git a/qla2x00t/Makefile b/qla2x00t/Makefile
index 32e32fa6f..ac628ce9b 100644
--- a/qla2x00t/Makefile
+++ b/qla2x00t/Makefile
@@ -64,7 +64,7 @@ install: all
 		modules_install
 
 uninstall:
-	rm -f $(INSTALL_DIR)/qla2xxxt.ko
+	rm -f $(INSTALL_DIR)/qla2xxx_scst.ko
 	-/sbin/depmod -b $(INSTALL_MOD_PATH)/ -a $(KVER)
 
 ########## END OUT-OF-TREE RULES ##########
diff --git a/srpt/Makefile b/srpt/Makefile
index 381dd6890..3a5c1c8c7 100644
--- a/srpt/Makefile
+++ b/srpt/Makefile
@@ -75,6 +75,10 @@ install: all src/ib_srpt.ko
 	  PRE_CFLAGS="$(OFED_CFLAGS)" SCST_INC_DIR=$(SCST_INC_DIR) \
 	  modules_install
 
+uninstall:
+	rm -f $(INSTALL_DIR)/ib_srpt.ko
+	-/sbin/depmod -b $(INSTALL_MOD_PATH)/ -a $(KVER)
+
 src/Module.symvers src/Modules.symvers: $(SCST_SYMVERS_DIR)/$(MODULE_SYMVERS)
 	@if $(OFED_KERNEL_IB_RPM_INSTALLED); then                           \
 	  if ! $(OFED_KERNEL_IB_DEVEL_RPM_INSTALLED); then                  \