From b6805bf78d2bbbeeaea8909a05623587b42d58b3 Mon Sep 17 00:00:00 2001
From: Gordon Ross <gwr@nexenta.com>
Date: Fri, 23 Aug 2013 18:31:03 -0400
Subject: 4072 make clobber leaves trash Reviewed by: Albert Lee
 <trisk@nexenta.com> Reviewed by: Dan McDonald <danmcd@nexenta.com> Reviewed
 by: Marcel Telka <marcel.telka@nexenta.com> Reviewed by: Richard Lowe
 <richlowe@richlowe.net> Approved by: Garrett D'Amore <garrett@damore.org>

---
 usr/src/uts/intel/qlc/Makefile | 33 +++++++++------------------------
 1 file changed, 9 insertions(+), 24 deletions(-)

(limited to 'usr/src/uts/intel/qlc')

diff --git a/usr/src/uts/intel/qlc/Makefile b/usr/src/uts/intel/qlc/Makefile
index 4363c69dcd..c9071abe6a 100644
--- a/usr/src/uts/intel/qlc/Makefile
+++ b/usr/src/uts/intel/qlc/Makefile
@@ -67,7 +67,6 @@ LDFLAGS		+= -dy -Nmisc/fctl
 LINTTAGS	+= -erroff=E_BAD_PTR_CAST_ALIGN
 LINTTAGS	+= -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
 
-FWTABLE          = ql_fw_table.c
 FWIMAGES         = 2200
 FWIMAGES        += 2300
 FWIMAGES        += 2400
@@ -76,7 +75,7 @@ FWIMAGES        += 6322
 FWIMAGES        += 8100
 
 FWMODULES        = $(FWIMAGES:%=$(MODULE)_fw_%)
-FWMODULES_SRC    = $(FWIMAGES:%=$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_%.c)
+FWMODULES_SRC    = $(FWIMAGES:%=$(CONF_SRCDIR)/ql_fw_%.c)
 
 CERRWARN	+= -_gcc=-Wno-uninitialized
 CERRWARN	+= -_gcc=-Wno-type-limits
@@ -87,35 +86,21 @@ CERRWARN	+= -_gcc=-Wno-parentheses
 #
 .KEEP_STATE:
 
-all:		$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(ALL_DEPS)
+all:		$(ALL_DEPS)
 
-def:		$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(DEF_DEPS)
+def:		$(DEF_DEPS)
 
-clean:		$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(CLEAN_DEPS)
+clean:		$(CLEAN_DEPS)
 
-clobber:	$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(CLOBBER_DEPS)
+clobber:	$(CLOBBER_DEPS)
 
-lint:		$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(LINT_DEPS)
+lint:		$(LINT_DEPS)
 
-modlintlib:	$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(MODLINTLIB_DEPS)
+modlintlib:	$(MODLINTLIB_DEPS)
 
-clean.lint:	$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(CLEAN_LINT_DEPS)
+clean.lint:	$(CLEAN_LINT_DEPS)
 
-install:	$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c $(INSTALL_DEPS)
-
-$(SRC)/uts/common/io/fibre-channel/fca/qlc/ql_fw_table.c: $(FWMODULES_SRC)
-	/usr/bin/rm -f $@
-	echo '#include <ql_apps.h>'             >> $@
-	echo '#include <ql_api.h>'              >> $@
-	echo 'struct fw_table fw_table[] = {'   >> $@
-	grep FW_VERSION_STRING $(FWMODULES_SRC) |\
-	grep '#define'                          |\
-	sed 's/[0-9]"/& },/'                    |\
-	sed 's/.*ql_fw_/{ 0x/'                  |\
-	sed 's/.c:#define/,/'                   |\
-	sed 's/FW_VERSION_STRING//'             >> $@
-	echo '{ 0, NULL }'                      >> $@
-	echo '};'                               >> $@
+install:	$(INSTALL_DEPS)
 
 #
 #	Include common targets.
-- 
cgit v1.2.3