diff options
| author | Yuri Pankov <yuri.pankov@nexenta.com> | 2017-06-11 14:41:06 +0300 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2017-06-19 13:08:57 -0400 |
| commit | 5c25b6f10367f6cb7b3d8b8bc7e374712eb977c2 (patch) | |
| tree | 7cb7ebf21b71e454d7cf797f93245fb71a6f6fb9 | |
| parent | eb28af623974cfc31cb4545d2965bbaca3fb6888 (diff) | |
| download | illumos-joyent-5c25b6f10367f6cb7b3d8b8bc7e374712eb977c2.tar.gz | |
8367 remove warlock leftovers from usr/src/uts Makefiles
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
139 files changed, 170 insertions, 5707 deletions
diff --git a/usr/src/uts/i86pc/i86hvm/hvm_sd/Makefile b/usr/src/uts/i86pc/i86hvm/hvm_sd/Makefile index f5dc7a922a..5123e0bd3a 100644 --- a/usr/src/uts/i86pc/i86hvm/hvm_sd/Makefile +++ b/usr/src/uts/i86pc/i86hvm/hvm_sd/Makefile @@ -37,8 +37,8 @@ UTSBASE = ../../.. # # Define the module and object file sets. # -# Normally when compiling sd there are .conf file definitions and -# definitions for warlock, but we don't bother with those here. +# Normally when compiling sd there are .conf file definitions, +# but we don't bother with those here. # MODULE = hvm_sd OBJECTS = $(HVM_SD_OBJS:%=$(OBJS_DIR)/%) diff --git a/usr/src/uts/intel/aac/Makefile b/usr/src/uts/intel/aac/Makefile index 15e6b33d1a..d619d9fece 100644 --- a/usr/src/uts/intel/aac/Makefile +++ b/usr/src/uts/intel/aac/Makefile @@ -43,9 +43,6 @@ OBJECTS = $(AAC_OBJS:%=$(OBJS_DIR)/%) LINTS = $(AAC_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/aac -WARLOCK_OUT = $(AAC_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -99,37 +96,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -SCSI_FILES = $(SCSI_OBJS:%.o= -l $(UTSBASE)/intel/scsi/%.ll) - -%.wlcmd: - cd $(WLCMD_DIR); $(TEST) -f $@ || $(SCCS) get $@ - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files scsi.files aac.wlcmd - $(WARLOCK) -c $(WLCMD_DIR)/aac.wlcmd $(WARLOCK_OUT) \ - $(SCSI_FILES) \ - $(UTSBASE)/intel/warlock/scsi.ll \ - -l $(UTSBASE)/intel/warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/aac/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd $(UTSBASE)/intel/warlock; pwd; $(MAKE) warlock - -scsi.files: - @cd $(UTSBASE)/intel/scsi; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/ac97/Makefile b/usr/src/uts/intel/ac97/Makefile index 1161de1ade..2905c1a6ad 100644 --- a/usr/src/uts/intel/ac97/Makefile +++ b/usr/src/uts/intel/ac97/Makefile @@ -39,9 +39,6 @@ MODULE = ac97 OBJECTS = $(AC97_OBJS:%=$(OBJS_DIR)/%) LINTS = $(AC97_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) -WARLOCK_OUT = $(AC97_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -67,10 +64,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) diff --git a/usr/src/uts/intel/ahci/Makefile b/usr/src/uts/intel/ahci/Makefile index f5a003fab5..be7d89e485 100644 --- a/usr/src/uts/intel/ahci/Makefile +++ b/usr/src/uts/intel/ahci/Makefile @@ -25,7 +25,7 @@ # # -# This makefile drives the production of the +# This makefile drives the production of the # "/kernel/drv/ahci" kernel module. # # intel architecture dependent @@ -38,15 +38,12 @@ UTSBASE = ../.. # # Define the module and object file sets. -# -MODULE = ahci + +MODULE = ahci OBJECTS = $(AHCI_OBJS:%=$(OBJS_DIR)/%) LINTS = $(AHCI_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/sata/adapters/ahci -WARLOCK_OUT = $(AHCI_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -68,7 +65,7 @@ DEBUG_DEFS += $(DEBUG_FLGS) # # lint pass one enforcement -# +# CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-parentheses @@ -96,10 +93,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -113,48 +108,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -AHCI_FILES = $(MODULE).ll -SD_FILES = $(SD_OBJS:%.o=../sd/%.ll) -SATA_FILES = $(SATA_OBJS:%.o=-l ../sata/%.ll) -SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll) -CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll) - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WLCMD_DIR)/ahci.wlcmd $(WARLOCK_OUT) warlock_ddi.files \ - sata.files scsi.files sd.files cmlb.files - $(WARLOCK) -c $(WLCMD_DIR)/ahci.wlcmd $(WARLOCK_OUT) \ - $(SD_FILES) \ - $(SCSI_FILES) \ - $(CMLB_FILES) \ - $(SATA_FILES) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/sata/adapters/ahci/%.c - $(WLCC) $(CPPFLAGS) -D DEBUG -o $@ $< - -sata.files: - @cd ../sata; pwd; $(MAKE) warlock - -scsi.files: - @cd ../scsi; pwd; $(MAKE) warlock - -sd.files: - @cd ../sd; pwd; $(MAKE) warlock_alone - -cmlb.files: - @cd ../cmlb; pwd; $(MAKE) warlock - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/audiohd/Makefile b/usr/src/uts/intel/audiohd/Makefile index 2ccf42e4f2..11b5ae03fb 100644 --- a/usr/src/uts/intel/audiohd/Makefile +++ b/usr/src/uts/intel/audiohd/Makefile @@ -39,18 +39,15 @@ OBJECTS = $(AUDIOHD_OBJS:%=$(OBJS_DIR)/%) LINTS = $(AUDIOHD_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/audio/drv/audiohd -WARLOCK_OUT = $(AUDIOHD_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. # include $(UTSBASE)/intel/Makefile.intel -# -# Overrides, lint pass one enforcement -# +# +# Overrides, lint pass one enforcement +# CFLAGS += $(CCVERBOSE) DEBUG_FLGS = $(NOT_RELEASE_BUILD)DEBUG_DEFS += $(DEBUG_FLGS) @@ -86,10 +83,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -103,30 +98,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -AUDIOHD_FILES = $(AUDIOHD_OBJS:%.o=../audiohd/%.ll) - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/audiohd.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/audiohd.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/audio/drv/audiohd/audiohd.c \ - $(UTSBASE)/common/io/audio/drv/audiohd/audiohd.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/av1394/Makefile b/usr/src/uts/intel/av1394/Makefile index fc112dc4c4..9ccf35ed33 100644 --- a/usr/src/uts/intel/av1394/Makefile +++ b/usr/src/uts/intel/av1394/Makefile @@ -35,9 +35,6 @@ MODULE = av1394 OBJECTS = $(AV1394_OBJS:%=$(OBJS_DIR)/%) LINTS = $(AV1394_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WARLOCK_OUT = $(AV1394_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -90,10 +87,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -107,27 +102,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# Warlock targets -# -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files $(WLCMD_DIR)/av1394.wlcmd - $(WARLOCK) -c $(WLCMD_DIR)/av1394.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/1394/targets/av1394/%.c - $(WLCC) $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/cmlb/Makefile b/usr/src/uts/intel/cmlb/Makefile index 199d487524..45158fec56 100644 --- a/usr/src/uts/intel/cmlb/Makefile +++ b/usr/src/uts/intel/cmlb/Makefile @@ -40,8 +40,6 @@ UTSBASE = ../.. MODULE = cmlb OBJECTS = $(CMLB_OBJS:%=$(OBJS_DIR)/%) LINTS = $(CMLB_OBJS:%.o=$(LINTS_DIR)/%.ln) -WARLOCK_OUT = $(CMLB_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) # @@ -92,10 +90,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -109,21 +105,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock - -# -# Warlock targets -# -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< diff --git a/usr/src/uts/intel/daplt/Makefile b/usr/src/uts/intel/daplt/Makefile index edc6de73ab..3dcf2d7e07 100644 --- a/usr/src/uts/intel/daplt/Makefile +++ b/usr/src/uts/intel/daplt/Makefile @@ -38,9 +38,7 @@ LINTS = $(DAPLT_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/ib/clients/daplt LDFLAGS += -dy -Nmisc/ibtl -Nmisc/ibcm -WARLOCK_OUT = $(DAPLT_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock + # # Include common rules. # @@ -86,10 +84,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -103,26 +99,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/daplt.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/daplt.wlcmd $(WARLOCK_OUT) \ - -l $(UTSBASE)/intel/warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/clients/daplt/%.c \ - $(UTSBASE)/common/sys/ib/clients/daplt/daplt.h \ - $(UTSBASE)/common/sys/ib/clients/daplt/daplt_if.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd $(UTSBASE)/intel/warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/ecpp/Makefile b/usr/src/uts/intel/ecpp/Makefile index ad00fbee41..9352ae18bf 100644 --- a/usr/src/uts/intel/ecpp/Makefile +++ b/usr/src/uts/intel/ecpp/Makefile @@ -26,7 +26,7 @@ # # This Makefile drives the production of ecpp # kernel module. -# +# # # @@ -42,9 +42,6 @@ OBJECTS = $(ECPP_OBJS:%=$(OBJS_DIR)/%) LINTS = $(ECPP_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io -WARLOCK_OUT = $(ECPP_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -83,10 +80,8 @@ all: $(ALL_DEPS) clean: $(CLEAN_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) modlintlib: $(MODLINTLIB_DEPS) @@ -98,28 +93,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/ecpp.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/ecpp.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/%.c $(UTSBASE)/common/sys/ecppvar.h \ - $(UTSBASE)/common/sys/ecppio.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/ehci/Makefile b/usr/src/uts/intel/ehci/Makefile index 84340ab114..59ca760453 100644 --- a/usr/src/uts/intel/ehci/Makefile +++ b/usr/src/uts/intel/ehci/Makefile @@ -39,9 +39,6 @@ OBJECTS = $(EHCI_OBJS:%=$(OBJS_DIR)/%) LINTS = $(EHCI_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/usb/hcd/ehci -WARLOCK_OUT = $(EHCI_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -74,10 +71,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -91,34 +86,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -USBA_FILES = $(USBA_OBJS:%.o= -l ../usba/%.ll) - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/ehci.wlcmd warlock_ddi.files \ - usba.files - $(WARLOCK) -c $(WLCMD_DIR)/ehci.wlcmd $(WARLOCK_OUT) \ - $(USBA_FILES) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/hcd/ehci/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock - -usba.files: - @cd ../usba; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/eibnx/Makefile b/usr/src/uts/intel/eibnx/Makefile index 790d52d56e..dfcbf6bdc7 100644 --- a/usr/src/uts/intel/eibnx/Makefile +++ b/usr/src/uts/intel/eibnx/Makefile @@ -42,9 +42,6 @@ OBJECTS = $(EIBNX_OBJS:%=$(OBJS_DIR)/%) LINTS = $(EIBNX_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/ib/clients/eoib -WARLOCK_OUT = $(EIBNX_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules @@ -62,9 +59,9 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) # CPPFLAGS += -DENX_DEBUG -# -# Lint pass one enforcement -# +# +# Lint pass one enforcement +# CFLAGS += $(CCVERBOSE) # @@ -90,10 +87,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -107,34 +102,3 @@ install: $(INSTALL_DEPS) # Include common targets # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/eibnx.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/eibnx.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/clients/eoib/enx_main.c \ - $(UTSBASE)/common/io/ib/clients/eoib/enx_hdlrs.c \ - $(UTSBASE)/common/io/ib/clients/eoib/enx_ibt.c \ - $(UTSBASE)/common/io/ib/clients/eoib/enx_log.c \ - $(UTSBASE)/common/io/ib/clients/eoib/enx_fip.c \ - $(UTSBASE)/common/io/ib/clients/eoib/enx_misc.c \ - $(UTSBASE)/common/io/ib/clients/eoib/enx_q.c \ - $(UTSBASE)/common/io/ib/clients/eoib/enx_ctl.c \ - $(UTSBASE)/common/sys/ib/clients/eoib/fip.h \ - $(UTSBASE)/common/sys/ib/clients/eoib/eib.h \ - $(UTSBASE)/common/sys/ib/clients/eoib/enx_impl.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/eoib/Makefile b/usr/src/uts/intel/eoib/Makefile index 0be7ddc774..f650f1eeac 100644 --- a/usr/src/uts/intel/eoib/Makefile +++ b/usr/src/uts/intel/eoib/Makefile @@ -41,9 +41,6 @@ MODULE = eoib OBJECTS = $(EOIB_OBJS:%=$(OBJS_DIR)/%) LINTS = $(EOIB_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WARLOCK_OUT = $(EOIB_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules @@ -61,9 +58,9 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # CPPFLAGS += -DEIB_DEBUG -# -# Lint pass one enforcement -# +# +# Lint pass one enforcement +# CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-switch @@ -84,10 +81,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -101,39 +96,3 @@ install: $(INSTALL_DEPS) # Include common targets # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/eoib.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/eoib.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/clients/eoib/eib_adm.c \ - $(UTSBASE)/common/io/ib/clients/eoib/eib_chan.c \ - $(UTSBASE)/common/io/ib/clients/eoib/eib_cmn.c \ - $(UTSBASE)/common/io/ib/clients/eoib/eib_ctl.c \ - $(UTSBASE)/common/io/ib/clients/eoib/eib_data.c \ - $(UTSBASE)/common/io/ib/clients/eoib/eib_fip.c \ - $(UTSBASE)/common/io/ib/clients/eoib/eib_ibt.c \ - $(UTSBASE)/common/io/ib/clients/eoib/eib_log.c \ - $(UTSBASE)/common/io/ib/clients/eoib/eib_mac.c \ - $(UTSBASE)/common/io/ib/clients/eoib/eib_main.c \ - $(UTSBASE)/common/io/ib/clients/eoib/eib_rsrc.c \ - $(UTSBASE)/common/io/ib/clients/eoib/eib_svc.c \ - $(UTSBASE)/common/io/ib/clients/eoib/eib_vnic.c \ - $(UTSBASE)/common/sys/ib/clients/eoib/fip.h \ - $(UTSBASE)/common/sys/ib/clients/eoib/eib.h \ - $(UTSBASE)/common/sys/ib/clients/eoib/eib_impl.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/fcip/Makefile b/usr/src/uts/intel/fcip/Makefile index 0af2d29b95..f7187b5c4d 100644 --- a/usr/src/uts/intel/fcip/Makefile +++ b/usr/src/uts/intel/fcip/Makefile @@ -89,9 +89,6 @@ clobber: $(CLOBBER_DEPS) lint: $(LINT_DEPS) -warlock: - @echo warlock is not supported - modlintlib: $(MODLINTLIB_DEPS) clean.lint: $(CLEAN_LINT_DEPS) diff --git a/usr/src/uts/intel/fcsm/Makefile b/usr/src/uts/intel/fcsm/Makefile index c181fc205c..042e429b0b 100644 --- a/usr/src/uts/intel/fcsm/Makefile +++ b/usr/src/uts/intel/fcsm/Makefile @@ -88,9 +88,6 @@ clobber: $(CLOBBER_DEPS) lint: $(LINT_DEPS) -warlock: - @echo warlock is not supported - modlintlib: $(MODLINTLIB_DEPS) clean.lint: $(CLEAN_LINT_DEPS) diff --git a/usr/src/uts/intel/hci1394/Makefile b/usr/src/uts/intel/hci1394/Makefile index 324bfaad1e..18c4f5ed6b 100644 --- a/usr/src/uts/intel/hci1394/Makefile +++ b/usr/src/uts/intel/hci1394/Makefile @@ -45,9 +45,6 @@ LINTS = $(HCI1394_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/1394/adapters LDFLAGS += -dy -Nmisc/s1394 -WARLOCK_OUT = $(HCI1394_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -96,10 +93,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -113,34 +108,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# Warlock targets -# -S1394_FILES = $(S1394_OBJS:%.o= -l ../s1394/%.ll) - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) s1394.files warlock_ddi.files \ - $(WLCMD_DIR)/hci1394.wlcmd - $(WARLOCK) -c $(WLCMD_DIR)/hci1394.wlcmd $(WARLOCK_OUT) $(S1394_FILES) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/1394/adapters/%.c - $(WLCC) $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock - -s1394.files: - @cd ../s1394; pwd; $(MAKE) warlock - diff --git a/usr/src/uts/intel/hermon/Makefile b/usr/src/uts/intel/hermon/Makefile index df654582e9..1949d8f6ec 100644 --- a/usr/src/uts/intel/hermon/Makefile +++ b/usr/src/uts/intel/hermon/Makefile @@ -44,9 +44,6 @@ LINTS = $(HERMON_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/ib/adapters/hermon LDFLAGS += -dy -Ndrv/ib -Nmisc/ibtl -Nmisc/ibmf -WARLOCK_OUT = $(HERMON_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -106,25 +103,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files $(WLCMD_DIR)/hermon.wlcmd - $(WARLOCK) -c $(WLCMD_DIR)/hermon.wlcmd $(WARLOCK_OUT) -l \ - $(UTSBASE)/intel/warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/adapters/hermon/%.c - $(WLCC) $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd $(UTSBASE)/intel/warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/hid/Makefile b/usr/src/uts/intel/hid/Makefile index ad070dfb6d..a8b0e576d4 100644 --- a/usr/src/uts/intel/hid/Makefile +++ b/usr/src/uts/intel/hid/Makefile @@ -40,9 +40,6 @@ MODULE = hid OBJECTS = $(HID_OBJS:%=$(OBJS_DIR)/%) LINTS = $(HID_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WARLOCK_OUT = $(HID_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -86,10 +83,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -103,55 +98,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) - -warlock: $(WARLOCK_OK) warlock_with_usba - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/hid.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/hid.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/clients/hid/%.c \ - $(UTSBASE)/common/sys/usb/clients/hid/hidvar.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_with_usba: $(WLCMD_DIR)/hid_with_usba.wlcmd $(WARLOCK_OUT) usba_files \ - ohci_files ehci_files uhci_files warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/hid_with_usba.wlcmd \ - $(USBA_FILES) \ - $(UHCI_FILES) $(OHCI_FILES) $(EHCI_FILES) \ - $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - -usba_files: - @cd ../usba;pwd; $(MAKE) warlock - -ohci_files: - @cd ../ohci;pwd; $(MAKE) warlock - -uhci_files: - @cd ../uhci;pwd; $(MAKE) warlock - -ehci_files: - @cd ../ehci;pwd; $(MAKE) warlock - - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock - diff --git a/usr/src/uts/intel/ib/Makefile b/usr/src/uts/intel/ib/Makefile index b66a6ca45a..48b58d2c5f 100644 --- a/usr/src/uts/intel/ib/Makefile +++ b/usr/src/uts/intel/ib/Makefile @@ -42,9 +42,6 @@ OBJECTS = $(IB_OBJS:%=$(OBJS_DIR)/%) LINTS = $(IB_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/ib/ibnex -WARLOCK_OUT = $(IB_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -64,9 +61,9 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) CERRWARN += -_gcc=-Wno-uninitialized -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) # @@ -94,10 +91,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -111,31 +106,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -IBDM_FILES = $(IBDM_OBJS:%.o=../ibdm/%.ll) - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/ib.wlcmd ibdm_files - $(WARLOCK) -c $(WLCMD_DIR)/ib.wlcmd $(WARLOCK_OUT) \ - -l $(IBDM_FILES) -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/ibnex/%.c \ - $(UTSBASE)/common/sys/ib/ibnex/ibnex.h \ - $(UTSBASE)/common/sys/ib/ibnex/ibnex_devctl.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -ibdm_files : - @cd ../ibdm; pwd; $(MAKE) warlock - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/ibcm/Makefile b/usr/src/uts/intel/ibcm/Makefile index a3e573b057..16799ca83f 100644 --- a/usr/src/uts/intel/ibcm/Makefile +++ b/usr/src/uts/intel/ibcm/Makefile @@ -40,9 +40,6 @@ MODULE = ibcm OBJECTS = $(IBCM_OBJS:%=$(OBJS_DIR)/%) LINTS = $(IBCM_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) -WARLOCK_OUT = $(IBCM_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -60,9 +57,9 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # Overrides. # -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-switch @@ -99,10 +96,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -116,24 +111,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/ibcm.wlcmd - $(WARLOCK) -c $(WLCMD_DIR)/ibcm.wlcmd $(WARLOCK_OUT) - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/mgt/ibcm/%.c \ - $(UTSBASE)/common/sys/ib/mgt/ibcm/ibcm_impl.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/ibdm/Makefile b/usr/src/uts/intel/ibdm/Makefile index c957274d71..0dca661c45 100644 --- a/usr/src/uts/intel/ibdm/Makefile +++ b/usr/src/uts/intel/ibdm/Makefile @@ -40,8 +40,6 @@ MODULE = ibdm OBJECTS = $(IBDM_OBJS:%=$(OBJS_DIR)/%) LINTS = $(IBDM_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) -WARLOCK_OUT = $(IBDM_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok # # Include common rules. @@ -59,9 +57,9 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # Overrides. # -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) # @@ -89,10 +87,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -106,23 +102,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -warlock: $(WARLOCK_OK) - - -$(WARLOCK_OK): $(WARLOCK_OUT) - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/mgt/ibdm/%.c \ - $(UTSBASE)/common/sys/ib/mgt/ibdm/ibdm_impl.h \ - $(UTSBASE)/common/sys/ib/mgt/ibdm/ibdm_ibnex.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< diff --git a/usr/src/uts/intel/ibdma/Makefile b/usr/src/uts/intel/ibdma/Makefile index 0450822478..8b5cb96982 100644 --- a/usr/src/uts/intel/ibdma/Makefile +++ b/usr/src/uts/intel/ibdma/Makefile @@ -40,8 +40,6 @@ MODULE = ibdma OBJECTS = $(IBDMA_OBJS:%=$(OBJS_DIR)/%) LINTS = $(IBDMA_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) -WARLOCK_OUT = $(IBDMA_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok # # Include common rules. @@ -59,9 +57,9 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) # Overrides. # -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) # @@ -87,10 +85,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -104,23 +100,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -warlock: $(WARLOCK_OK) - - -$(WARLOCK_OK): $(WARLOCK_OUT) - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/mgt/ibdma/%.c \ - $(UTSBASE)/common/sys/ib/mgt/ibdma/ibdma_impl.h \ - $(UTSBASE)/common/sys/ib/mgt/ibdma/ibdma.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< diff --git a/usr/src/uts/intel/ibmf/Makefile b/usr/src/uts/intel/ibmf/Makefile index ddb162da36..6a8efa3937 100644 --- a/usr/src/uts/intel/ibmf/Makefile +++ b/usr/src/uts/intel/ibmf/Makefile @@ -41,9 +41,7 @@ OBJECTS = $(IBMF_OBJS:%=$(OBJS_DIR)/%) LINTS = $(IBMF_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) LDFLAGS += -dy -Nmisc/ibtl -WARLOCK_OUT = $(IBMF_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock + # # Include common rules. # @@ -62,9 +60,9 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) #DEBUG_DEFS_DBG32 += -DTNF_DEBUG -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) # @@ -87,10 +85,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -104,27 +100,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock -TEST = test - -# -# Warlock targets -# -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files $(WLCMD_DIR)/ibmf.wlcmd - $(WARLOCK) -c $(WLCMD_DIR)/ibmf.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/mgt/ibmf/%.c - $(WLCC) $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/ibp/Makefile b/usr/src/uts/intel/ibp/Makefile index 7496199be8..f9525a17d2 100644 --- a/usr/src/uts/intel/ibp/Makefile +++ b/usr/src/uts/intel/ibp/Makefile @@ -38,9 +38,7 @@ ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/ib/clients/ibd LDFLAGS += -dy -Nmisc/mac -Nmisc/ibtl -Nmisc/ibcm -Nmisc/ibmf -Ndrv/ip \ -Nmisc/dls -Ndrv/dld -WARLOCK_OUT = $(IBD_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock + # # Include common rules. # @@ -74,10 +72,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -91,25 +87,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/ibd.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/ibd.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/clients/ibd/%.c \ - $(UTSBASE)/common/sys/ib/clients/ibd/ibd.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/ibtl/Makefile b/usr/src/uts/intel/ibtl/Makefile index 26cbb7ee6d..ecf5bdd849 100644 --- a/usr/src/uts/intel/ibtl/Makefile +++ b/usr/src/uts/intel/ibtl/Makefile @@ -41,9 +41,6 @@ MODULE = ibtl OBJECTS = $(IBTL_OBJS:%=$(OBJS_DIR)/%) LINTS = $(IBTL_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) -WARLOCK_OUT = $(IBTL_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -93,10 +90,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -110,24 +105,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files $(WLCMD_DIR)/ibtl.wlcmd - $(WARLOCK) -c $(WLCMD_DIR)/ibtl.wlcmd $(WARLOCK_OUT) -l \ - ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/ibtl/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/mii/Makefile b/usr/src/uts/intel/mii/Makefile index 49071a070e..7f2167f18c 100644 --- a/usr/src/uts/intel/mii/Makefile +++ b/usr/src/uts/intel/mii/Makefile @@ -39,9 +39,6 @@ MODULE = mii OBJECTS = $(MII_OBJS:%=$(OBJS_DIR)/%) LINTS = $(MII_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) -WARLOCK_OUT = $(MII_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -70,10 +67,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) diff --git a/usr/src/uts/intel/mpt_sas/Makefile b/usr/src/uts/intel/mpt_sas/Makefile index 01dd2e2da4..d0d809c3b5 100644 --- a/usr/src/uts/intel/mpt_sas/Makefile +++ b/usr/src/uts/intel/mpt_sas/Makefile @@ -39,9 +39,6 @@ OBJECTS = $(MPTSAS_OBJS:%=$(OBJS_DIR)/%) LINTS = $(MPTSAS_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/scsi/adapters/mpt_sas/ -WARLOCK_OUT = $(MPTSAS_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Kernel Module Dependencies @@ -74,10 +71,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -91,36 +86,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -SCSI_FILES = $(SCSI_OBJS:%.o= -l $(UTSBASE)/intel/scsi/%.ll) - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files scsi.files \ - $(WLCMD_DIR)/mptsas.wlcmd - $(WARLOCK) -c $(WLCMD_DIR)/mptsas.wlcmd $(WARLOCK_OUT) \ - $(SCSI_FILES) \ - $(UTSBASE)/intel/warlock/scsi.ll \ - -l $(UTSBASE)/intel/warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/scsi/adapters/mpt_sas/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd $(UTSBASE)/intel/warlock; pwd; $(MAKE) warlock - -scsi.files: - @cd $(UTSBASE)/intel/scsi; pwd; $(MAKE) warlock - diff --git a/usr/src/uts/intel/nulldriver/Makefile b/usr/src/uts/intel/nulldriver/Makefile index 96ca163261..1f2891ea3d 100644 --- a/usr/src/uts/intel/nulldriver/Makefile +++ b/usr/src/uts/intel/nulldriver/Makefile @@ -79,9 +79,6 @@ clobber: $(CLOBBER_DEPS) lint: $(LINT_DEPS) -warlock: - @echo warlock is not supported - modlintlib: $(MODLINTLIB_DEPS) clean.lint: $(CLEAN_LINT_DEPS) diff --git a/usr/src/uts/intel/nv_sata/Makefile b/usr/src/uts/intel/nv_sata/Makefile index 17f12c4fcd..9723cca3cc 100644 --- a/usr/src/uts/intel/nv_sata/Makefile +++ b/usr/src/uts/intel/nv_sata/Makefile @@ -36,9 +36,6 @@ OBJECTS = $(NV_SATA_OBJS:%=$(OBJS_DIR)/%) LINTS = $(NV_SATA_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/sata/adapters/nv_sata -WARLOCK_OUT = $(NV_SATA_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -61,7 +58,7 @@ CPPFLAGS += -DSGPIO_SUPPORT # # lint pass one enforcement -# +# CFLAGS += $(CCVERBOSE) # @@ -74,7 +71,7 @@ LDFLAGS += -dy -N misc/sata # to investigate and remove these for maximum lint coverage. # Please do not carry these forward to new Makefiles. # -LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN +LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN CERRWARN += -_gcc=-Wno-uninitialized @@ -88,10 +85,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -105,49 +100,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -NV_SATA_FILES = $(MODULE).ll -SD_FILES = $(SD_OBJS:%.o=../sd/%.ll) -SATA_FILES = $(SATA_OBJS:%.o=-l ../sata/%.ll) -SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll) -CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll) - -warlock: $(WARLOCK_OK) - - -$(WARLOCK_OK): $(WLCMD_DIR)/nv_sata.wlcmd $(WARLOCK_OUT) warlock_ddi.files \ - sata.files scsi.files sd.files cmlb.files - $(WARLOCK) -c $(WLCMD_DIR)/nv_sata.wlcmd $(WARLOCK_OUT) \ - $(SD_FILES) \ - $(SCSI_FILES) \ - $(CMLB_FILES) \ - $(SATA_FILES) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/sata/adapters/nv_sata/%.c - $(WLCC) $(CPPFLAGS) -D DEBUG -o $@ $< - -sata.files: - @cd ../sata; pwd; $(MAKE) warlock - -scsi.files: - @cd ../scsi; pwd; $(MAKE) warlock - -sd.files: - @cd ../sd; pwd; $(MAKE) warlock_alone - -cmlb.files: - @cd ../cmlb; pwd; $(MAKE) warlock - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/ohci/Makefile b/usr/src/uts/intel/ohci/Makefile index afd68d8540..39068183bc 100644 --- a/usr/src/uts/intel/ohci/Makefile +++ b/usr/src/uts/intel/ohci/Makefile @@ -37,11 +37,8 @@ UTSBASE = ../.. MODULE = ohci OBJECTS = $(OHCI_OBJS:%=$(OBJS_DIR)/%) LINTS = $(OHCI_OBJS:%.o=$(LINTS_DIR)/%.ln) -WARLOCK_OUT = $(OHCI_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/usb/hcd/openhci -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -79,10 +76,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -96,33 +91,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -USBA_FILES = $(USBA_OBJS:%.o= -l ../usba/%.ll) - -warlock: $(WARLOCK_OK) - -ohci.ok: $(WARLOCK_OUT) $(WLCMD_DIR)/ohci.wlcmd warlock_ddi.files usba.files - $(WARLOCK) -c $(WLCMD_DIR)/ohci.wlcmd $(WARLOCK_OUT) \ - $(USBA_FILES) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/hcd/openhci/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock - -usba.files: - @cd ../usba; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/pmcs/Makefile b/usr/src/uts/intel/pmcs/Makefile index 31500be02f..3bc177d9cf 100644 --- a/usr/src/uts/intel/pmcs/Makefile +++ b/usr/src/uts/intel/pmcs/Makefile @@ -39,9 +39,6 @@ OBJECTS = $(PMCS_OBJS:%=$(OBJS_DIR)/%) LINTS = $(PMCS_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/scsi/adapters/pmcs -WARLOCK_OUT = $(PMCS_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Kernel Module Dependencies diff --git a/usr/src/uts/intel/s1394/Makefile b/usr/src/uts/intel/s1394/Makefile index 0efc9bdc25..aa1961414b 100644 --- a/usr/src/uts/intel/s1394/Makefile +++ b/usr/src/uts/intel/s1394/Makefile @@ -43,9 +43,6 @@ MODULE = s1394 OBJECTS = $(S1394_OBJS:%=$(OBJS_DIR)/%) LINTS = $(S1394_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) -WARLOCK_OUT = $(S1394_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/sparc/$(MODULE) # # Include common rules. @@ -96,10 +93,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -113,23 +108,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch - -# -# Warlock targets -# -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/1394/%.c - $(WLCC) $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/sata/Makefile b/usr/src/uts/intel/sata/Makefile index c9f86f8c11..9d4e9bb2fc 100644 --- a/usr/src/uts/intel/sata/Makefile +++ b/usr/src/uts/intel/sata/Makefile @@ -45,8 +45,6 @@ MODULE = sata OBJECTS = $(SATA_OBJS:%=$(OBJS_DIR)/%) LINTS = $(SATA_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) -WARLOCK_OUT = $(SATA_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok # # Include common rules. @@ -103,10 +101,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -120,21 +116,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock - -# -# Warlock targets -# -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/sata/impl/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< diff --git a/usr/src/uts/intel/sbp2/Makefile b/usr/src/uts/intel/sbp2/Makefile index 58f728a1d1..26d2f46fb9 100644 --- a/usr/src/uts/intel/sbp2/Makefile +++ b/usr/src/uts/intel/sbp2/Makefile @@ -39,9 +39,6 @@ MODULE = sbp2 OBJECTS = $(SBP2_OBJS:%=$(OBJS_DIR)/%) LINTS = $(SBP2_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) -WARLOCK_OUT = $(SBP2_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -74,10 +71,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -91,25 +86,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock - -# -# Warlock -# -WARLOCK_CMD = $(WLCMD_DIR)/$(MODULE).wlcmd - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WARLOCK_CMD) - $(WARLOCK) -c $(WARLOCK_CMD) $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/sbp2/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< diff --git a/usr/src/uts/intel/scsa1394/Makefile b/usr/src/uts/intel/scsa1394/Makefile index 18555118ca..8e07952219 100644 --- a/usr/src/uts/intel/scsa1394/Makefile +++ b/usr/src/uts/intel/scsa1394/Makefile @@ -35,9 +35,6 @@ MODULE = scsa1394 OBJECTS = $(SCSA1394_OBJS:%=$(OBJS_DIR)/%) LINTS = $(SCSA1394_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WARLOCK_OUT = $(SCSA1394_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -77,10 +74,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -94,49 +89,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# Warlock targets -# -SBP2_FILES = $(SBP2_OBJS:%.o= -l ../sbp2/%.ll) -SD_FILES = $(SD_OBJS:%.o=../sd/%.ll) -SCSI_FILES = $(SCSI_OBJS:%.o= -l ../scsi/%.ll) -CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll) - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) sbp2.files warlock_ddi.files \ - $(WLCMD_DIR)/scsa1394.wlcmd sd.files scsi.files cmlb.files - $(WARLOCK) -c $(WLCMD_DIR)/scsa1394.wlcmd $(WARLOCK_OUT) $(SD_FILES) \ - $(SCSI_FILES) \ - $(CMLB_FILES) \ - $(SBP2_FILES) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/1394/targets/scsa1394/%.c - $(WLCC) $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $< - -sbp2.files: - @cd ../sbp2; pwd; $(MAKE) warlock - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock - -sd.files: - @cd ../sd; pwd; $(MAKE) warlock_alone - -scsi.files: - @cd ../scsi; pwd; $(MAKE) warlock - -cmlb.files: - @cd ../cmlb; pwd; $(MAKE) warlock - diff --git a/usr/src/uts/intel/scsa2usb/Makefile b/usr/src/uts/intel/scsa2usb/Makefile index 8562d9231e..61acb5215e 100644 --- a/usr/src/uts/intel/scsa2usb/Makefile +++ b/usr/src/uts/intel/scsa2usb/Makefile @@ -42,9 +42,6 @@ OBJECTS = $(SCSA2USB_OBJS:%=$(OBJS_DIR)/%) LINTS = $(SCSA2USB_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/usb/scsa2usb -WARLOCK_OUT = $(SCSA2USB_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -89,10 +86,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -106,79 +101,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll) -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) -SD_FILES = $(SD_OBJS:%.o=../sd/%.ll) -ST_FILES = $(ST_OBJS:%.o=../st/%.ll) -SCSI_FILES = $(SCSI_OBJS:%.o= -l ../scsi/%.ll) -CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll) - -warlock: $(WARLOCK_OK) warlock_with_usba - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/scsa2usb.wlcmd warlock_ddi.files \ - scsi.files - $(WARLOCK) -c $(WLCMD_DIR)/scsa2usb.wlcmd $(WARLOCK_OUT) \ - ../warlock/scsi.ll \ - $(SCSI_FILES) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/scsa2usb/%.c \ - $(UTSBASE)/common/sys/usb/clients/mass_storage/usb_bulkonly.h \ - $(UTSBASE)/common/sys/usb/clients/mass_storage/usb_cbi.h \ - $(UTSBASE)/common/sys/usb/scsa2usb/scsa2usb.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_with_usba: $(WLCMD_DIR)/scsa2usb_with_usba.wlcmd \ - $(WARLOCK_OUT) usba_files \ - ohci_files ehci_files uhci_files warlock_ddi.files sd.files st.files \ - cmlb.files scsi.files - $(WARLOCK) -c $(WLCMD_DIR)/scsa2usb_with_usba.wlcmd \ - $(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \ - $(SD_FILES) \ - $(ST_FILES) \ - $(CMLB_FILES) \ - $(SCSI_FILES) \ - $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - -usba_files: - @cd ../usba;pwd; $(MAKE) warlock - -uhci_files: - @cd ../uhci;pwd; $(MAKE) warlock - -ohci_files: - @cd ../ohci;pwd; $(MAKE) warlock - -ehci_files: - @cd ../ehci;pwd; $(MAKE) warlock - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock - -scsi.files: - @cd ../scsi; pwd; $(MAKE) warlock - -sd.files: - @cd ../sd; pwd; $(MAKE) warlock_alone - -st.files: - @cd ../st; pwd; $(MAKE) warlock_alone - -cmlb.files: - @cd ../cmlb; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/scsi/Makefile b/usr/src/uts/intel/scsi/Makefile index f4b8ec262c..5aeaf4c0f1 100644 --- a/usr/src/uts/intel/scsi/Makefile +++ b/usr/src/uts/intel/scsi/Makefile @@ -43,9 +43,6 @@ MODULE = scsi OBJECTS = $(SCSI_OBJS:%=$(OBJS_DIR)/%) LINTS = $(SCSI_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) -WARLOCK_OUT = $(SCSI_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/sparc/$(MODULE) # # Include common rules. @@ -88,10 +85,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -105,23 +100,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch - -# -# Warlock targets -# -warlock: $(MODULE).ok - -%.ok: $(WARLOCK_OUT) - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/scsi/impl/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -%.ll: $(UTSBASE)/common/io/scsi/conf/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< diff --git a/usr/src/uts/intel/sd/Makefile b/usr/src/uts/intel/sd/Makefile index 90e10840c1..cfa86ca4e5 100644 --- a/usr/src/uts/intel/sd/Makefile +++ b/usr/src/uts/intel/sd/Makefile @@ -42,9 +42,6 @@ OBJECTS = $(SD_OBJS:%=$(OBJS_DIR)/%) LINTS = $(SD_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/intel/io/scsi/targets -WARLOCK_OUT = $(SD_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -92,10 +89,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -109,48 +104,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# Warlock targets -# -# Note that in warlock_with_{esp,isp} it is important to load sd.ll -# before {isp,esp}.ll; the reason is that both have _init/_info/_fini -# and warlock can only handle one extern function by a given name; -# any loaded after the first are ignored. - -SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll) -CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll) - -WARLOCK_TARGETS = warlock_alone - -warlock: $(WARLOCK_TARGETS) - -warlock_alone: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WLCMD_DIR)/sd.wlcmd $(WARLOCK_OUT) scsi_files \ - warlock_ddi.files cmlb_files - $(WARLOCK) -c $(WLCMD_DIR)/sd.wlcmd $(WARLOCK_OUT) $(SCSI_FILES) \ - $(CMLB_FILES) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/scsi/targets/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -cmlb_files: - @cd ../cmlb; pwd; $(MAKE) warlock - -scsi_files: - @cd ../scsi; pwd; $(MAKE) warlock - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/ses/Makefile b/usr/src/uts/intel/ses/Makefile index f1b4243862..a0e45fb059 100644 --- a/usr/src/uts/intel/ses/Makefile +++ b/usr/src/uts/intel/ses/Makefile @@ -44,9 +44,6 @@ OBJECTS = $(SES_OBJS:%=$(OBJS_DIR)/%) LINTS = $(SES_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/intel/io/scsi/targets -WARLOCK_OUT = $(SES_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -59,7 +56,6 @@ include $(UTSBASE)/intel/Makefile.intel ALL_TARGET = $(BINARY) $(SRC_CONFILE) LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) -CLEANFILES += $(WARLOCK_TARGETS) # # For now, disable these lint checks; maintainers should endeavor @@ -84,10 +80,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -101,40 +95,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# Warlock targets -# -SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll) - -WARLOCK_TARGETS = $(WARLOCK_OK) - -warlock: $(WARLOCK_TARGETS) - -# XXX FIX ME: why only ses.ll? - -$(WARLOCK_OK): $(WLCMD_DIR)/$(MODULE).wlcmd $(WARLOCK_OUT) - @cd ../warlock; $(MAKE) warlock - @cd ../scsi; $(MAKE) warlock - $(WARLOCK) -c $(WLCMD_DIR)/$(MODULE).wlcmd ses.ll \ - ../warlock/scsi.ll \ - -l ../warlock/ddi_dki_impl.ll \ - $(SCSI_FILES) - @ $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/scsi/targets/%.c - $(WLCC) $(CPPFLAGS) -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock - - diff --git a/usr/src/uts/intel/si3124/Makefile b/usr/src/uts/intel/si3124/Makefile index 813a7b9011..b778602e28 100644 --- a/usr/src/uts/intel/si3124/Makefile +++ b/usr/src/uts/intel/si3124/Makefile @@ -26,7 +26,7 @@ # # -# This makefile drives the production of the +# This makefile drives the production of the # "platform/i86pc/kernel/drv/si3124" kernel module. # # intel architecture dependent @@ -45,9 +45,6 @@ OBJECTS = $(SI3124_OBJS:%=$(OBJS_DIR)/%) LINTS = $(SI3124_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/sata/adapters/si3124 -WARLOCK_OUT = $(SI3124_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -71,7 +68,7 @@ CERRWARN += -_gcc=-Wno-uninitialized # # lint pass one enforcement -# +# CFLAGS += $(CCVERBOSE) # @@ -89,10 +86,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -106,48 +101,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -SI3124_FILES = $(MODULE).ll -SD_FILES = $(SD_OBJS:%.o=../sd/%.ll) -SATA_FILES = $(SATA_OBJS:%.o=-l ../sata/%.ll) -SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll) -CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll) - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WLCMD_DIR)/si3124.wlcmd $(WARLOCK_OUT) warlock_ddi.files \ - sata.files scsi.files sd.files cmlb.files - $(WARLOCK) -c $(WLCMD_DIR)/si3124.wlcmd $(WARLOCK_OUT) \ - $(SD_FILES) \ - $(SCSI_FILES) \ - $(CMLB_FILES) \ - $(SATA_FILES) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/sata/adapters/si3124/%.c - $(WLCC) $(CPPFLAGS) -D DEBUG -o $@ $< - -sata.files: - @cd ../sata; pwd; $(MAKE) warlock - -scsi.files: - @cd ../scsi; pwd; $(MAKE) warlock - -sd.files: - @cd ../sd; pwd; $(MAKE) warlock_alone - -cmlb.files: - @cd ../cmlb; pwd; $(MAKE) warlock - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/sol_ofs/Makefile b/usr/src/uts/intel/sol_ofs/Makefile index e83b128b6e..8f1e756ee3 100644 --- a/usr/src/uts/intel/sol_ofs/Makefile +++ b/usr/src/uts/intel/sol_ofs/Makefile @@ -36,9 +36,7 @@ OBJECTS = $(SOL_OFS_OBJS:%=$(OBJS_DIR)/%) LINTS = $(SOL_OFS_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) LDFLAGS += -dy -Nmisc/ibtl -Nmisc/ibcm -WARLOCK_OUT = $(SOL_OFS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock + # # Include common rules. # @@ -76,10 +74,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -93,25 +89,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/sol_ofs.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/sol_ofs.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/clients/of/sol_ofs/%.c \ - $(UTSBASE)/common/sys/ib/clients/of/sol_ofs/sol_uverbs.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/sol_ucma/Makefile b/usr/src/uts/intel/sol_ucma/Makefile index 6bdde86210..4b51aae13c 100644 --- a/usr/src/uts/intel/sol_ucma/Makefile +++ b/usr/src/uts/intel/sol_ucma/Makefile @@ -37,9 +37,7 @@ LINTS = $(SOL_UCMA_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) LDFLAGS += -dy -Nmisc/sol_ofs CONF_SRCDIR = $(UTSBASE)/common/io/ib/clients/of/sol_ucma -WARLOCK_OUT = $(SOL_UCMA:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock + # # Include common rules. # @@ -76,10 +74,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -93,25 +89,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/sol_ucma.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/sol_ucma.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/clients/of/sol_ucma/%.c \ - $(UTSBASE)/common/sys/ib/clients/of/sol_ucma/sol_ucma.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/sol_uverbs/Makefile b/usr/src/uts/intel/sol_uverbs/Makefile index 0e913dd524..548d80aad3 100644 --- a/usr/src/uts/intel/sol_uverbs/Makefile +++ b/usr/src/uts/intel/sol_uverbs/Makefile @@ -37,9 +37,7 @@ LINTS = $(SOL_UVERBS_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) LDFLAGS += -dy -Nmisc/ibtl -Nmisc/sol_ofs CONF_SRCDIR = $(UTSBASE)/common/io/ib/clients/of/sol_uverbs -WARLOCK_OUT = $(SOL_UVERBS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock + # # Include common rules. # @@ -76,10 +74,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -93,25 +89,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/sol_uverbs.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/sol_uverbs.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/clients/of/sol_uverbs/%.c \ - $(UTSBASE)/common/sys/ib/clients/of/sol_uverbs/sol_uverbs.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/st/Makefile b/usr/src/uts/intel/st/Makefile index 078d5a3796..96ec74eb2f 100644 --- a/usr/src/uts/intel/st/Makefile +++ b/usr/src/uts/intel/st/Makefile @@ -43,9 +43,6 @@ OBJECTS = $(ST_OBJS:%=$(OBJS_DIR)/%) LINTS = $(ST_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/intel/io/scsi/targets -WARLOCK_OUT = $(ST_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -93,10 +90,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -110,41 +105,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# Warlock targets -# - -SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll) - -WARLOCK_TARGETS = warlock_alone - -warlock: $(WARLOCK_TARGETS) - -warlock_alone: $(WARLOCK_OK) - -scsi_files: - @cd ../scsi; pwd; $(MAKE) warlock - -$(WARLOCK_OK): $(WLCMD_DIR)/st.wlcmd $(WARLOCK_OUT) scsi_files \ - warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/st.wlcmd $(WARLOCK_OUT) $(SCSI_FILES) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/scsi/targets/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock - -scsi.files: - @cd ../scsi; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/tavor/Makefile b/usr/src/uts/intel/tavor/Makefile index bf51bf8a59..fd0923b3c8 100644 --- a/usr/src/uts/intel/tavor/Makefile +++ b/usr/src/uts/intel/tavor/Makefile @@ -44,9 +44,6 @@ LINTS = $(TAVOR_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/ib/adapters/tavor LDFLAGS += -dy -Ndrv/ib -Nmisc/ibtl -Nmisc/ibmf -WARLOCK_OUT = $(TAVOR_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -99,10 +96,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -116,25 +111,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files $(WLCMD_DIR)/tavor.wlcmd - $(WARLOCK) -c $(WLCMD_DIR)/tavor.wlcmd $(WARLOCK_OUT) -l \ - $(UTSBASE)/intel/warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/adapters/tavor/%.c - $(WLCC) $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd $(UTSBASE)/intel/warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/tem/Makefile b/usr/src/uts/intel/tem/Makefile index 1d877e2259..bfeecb298b 100644 --- a/usr/src/uts/intel/tem/Makefile +++ b/usr/src/uts/intel/tem/Makefile @@ -40,9 +40,6 @@ MODULE = tem OBJECTS = $(TEM_OBJS:%=$(OBJS_DIR)/%) LINTS = $(TEM_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) -WARLOCK_OUT = $(TEM_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -93,26 +90,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands -# -TEST = test -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock - -# -# warlock targets -# - -warlock: $(WARLOCK_OUT) warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/tem.wlcmd $(WARLOCK_OUT) \ - -l ../../intel/warlock/ddi_dki_impl.ll - $(TOUCH) $(WARLOCK_OK) - -%.ll: $(UTSBASE)/common/io/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../../intel/warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/ugen/Makefile b/usr/src/uts/intel/ugen/Makefile index a56d9c759e..9c910827f1 100644 --- a/usr/src/uts/intel/ugen/Makefile +++ b/usr/src/uts/intel/ugen/Makefile @@ -41,9 +41,6 @@ MODULE = ugen OBJECTS = $(UGEN_OBJS:%=$(OBJS_DIR)/%) LINTS = $(UGEN_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WARLOCK_OUT = $(UGEN_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -74,10 +71,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -91,52 +86,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll) -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) - -warlock: $(WARLOCK_OK) warlock_with_usba - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/ugen.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/ugen.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/clients/ugen/%.c \ - $(UTSBASE)/common/sys/usb/clients/ugen/ugend.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_with_usba: $(WLCMD_DIR)/ugen_with_usba.wlcmd $(WARLOCK_OUT) usba_files \ - ohci_files ehci_files uhci_files warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/ugen_with_usba.wlcmd \ - $(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \ - $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - -usba_files: - @cd ../usba;pwd; $(MAKE) warlock - -uhci_files: - @cd ../uhci;pwd; $(MAKE) warlock - -ohci_files: - @cd ../ohci;pwd; $(MAKE) warlock - -ehci_files: - @cd ../ehci;pwd; $(MAKE) warlock - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/uhci/Makefile b/usr/src/uts/intel/uhci/Makefile index 7b61ccf155..c8b5992927 100644 --- a/usr/src/uts/intel/uhci/Makefile +++ b/usr/src/uts/intel/uhci/Makefile @@ -40,9 +40,6 @@ OBJECTS = $(UHCI_OBJS:%=$(OBJS_DIR)/%) LINTS = $(UHCI_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/usb/hcd/uhci -WARLOCK_OUT = $(UHCI_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -86,10 +83,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -103,34 +98,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -USBA_FILES = $(USBA_OBJS:%.o= -l ../usba/%.ll) - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/uhci.wlcmd warlock_ddi.files \ - usba.files - $(WARLOCK) -c $(WLCMD_DIR)/uhci.wlcmd $(WARLOCK_OUT) \ - $(USBA_FILES) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/hcd/uhci/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock - -usba.files: - @cd ../usba; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/usb_ac/Makefile b/usr/src/uts/intel/usb_ac/Makefile index c35c2daa99..f2852a17c0 100644 --- a/usr/src/uts/intel/usb_ac/Makefile +++ b/usr/src/uts/intel/usb_ac/Makefile @@ -44,9 +44,6 @@ OBJECTS = $(USB_AC_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USB_AC_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/usb/clients/audio/usb_ac -WARLOCK_OUT = $(USB_AC_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -86,10 +83,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -103,58 +98,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll) -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) - - -# -# Warlock targets -# -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files \ - warlock_standalone warlock_usba.files warlock_with_usba - $(TOUCH) $(WARLOCK_OK) - -warlock_with_usba: $(WLCMD_DIR)/usb_ac_with_usba.wlcmd $(WARLOCK_OUT) \ - warlock_ddi.files warlock_usba.files warlock_ohci.files \ - warlock_ehci.files warlock_uhci.files - $(WARLOCK) -c $(WLCMD_DIR)/usb_ac_with_usba.wlcmd \ - $(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \ - $(WARLOCK_OUT) -l ../warlock/ddi_dki_impl.ll - -warlock_standalone: $(WARLOCK_OUT) warlock_ddi.files $(WLCMD_DIR)/usb_ac.wlcmd - $(WARLOCK) -c $(WLCMD_DIR)/usb_ac.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - -%.ll: $(UTSBASE)/common/io/usb/clients/audio/usb_ac/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_usba.files: - @cd ../usba;pwd; $(MAKE) warlock - -warlock_ohci.files: - @cd ../ohci;pwd; $(MAKE) warlock - -warlock_uhci.files: - @cd ../uhci;pwd; $(MAKE) warlock - -warlock_ehci.files: - @cd ../ehci;pwd; $(MAKE) warlock - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/usb_ah/Makefile b/usr/src/uts/intel/usb_ah/Makefile index 6a3e43f1cf..a9984f9399 100644 --- a/usr/src/uts/intel/usb_ah/Makefile +++ b/usr/src/uts/intel/usb_ah/Makefile @@ -41,9 +41,6 @@ MODULE = usb_ah OBJECTS = $(USB_AH_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USB_AH_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_STRMOD_DIR)/$(MODULE) -WARLOCK_OUT = $(USB_AH_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -87,10 +84,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -104,28 +99,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/usb_ah.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usb_ah.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/clients/audio/usb_ah/%.c \ - $(UTSBASE)/common/sys/usb/clients/audio/usb_ah/usb_ah.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/usb_as/Makefile b/usr/src/uts/intel/usb_as/Makefile index 3973a5b4df..a2b03b11e7 100644 --- a/usr/src/uts/intel/usb_as/Makefile +++ b/usr/src/uts/intel/usb_as/Makefile @@ -43,9 +43,6 @@ MODULE = usb_as OBJECTS = $(USB_AS_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USB_AS_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WARLOCK_OUT = $(USB_AS_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -86,10 +83,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -103,58 +98,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -USB_AS_FILES = $(MODULE).ll -USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll) -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) - -# Warlock targets -# -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files \ - warlock_standalone warlock_usba.files warlock_with_usba - $(TOUCH) $(WARLOCK_OK) - - -warlock_with_usba: $(WLCMD_DIR)/usb_as_with_usba.wlcmd $(WARLOCK_OUT) \ - warlock_ddi.files warlock_ohci.files warlock_usba.files \ - warlock_ehci.files warlock_uhci.files - $(WARLOCK) -c $(WLCMD_DIR)/usb_as_with_usba.wlcmd \ - $(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \ - $(WARLOCK_OUT) -l ../warlock/ddi_dki_impl.ll - -warlock_standalone: $(WARLOCK_OUT) warlock_ddi.files $(WLCMD_DIR)/usb_as.wlcmd - $(WARLOCK) -c $(WLCMD_DIR)/usb_as.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - -%.ll: $(UTSBASE)/common/io/usb/clients/audio/usb_as/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_usba.files: - @cd ../usba;pwd; $(MAKE) warlock - -warlock_ohci.files: - @cd ../ohci;pwd; $(MAKE) warlock - -warlock_uhci.files: - @cd ../uhci;pwd; $(MAKE) warlock - -warlock_ehci.files: - @cd ../ehci;pwd; $(MAKE) warlock - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/usb_ia/Makefile b/usr/src/uts/intel/usb_ia/Makefile index 97c37f7e3e..5cb2c86e7a 100644 --- a/usr/src/uts/intel/usb_ia/Makefile +++ b/usr/src/uts/intel/usb_ia/Makefile @@ -40,9 +40,6 @@ MODULE = usb_ia OBJECTS = $(USB_IA_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USB_IA_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WARLOCK_OUT = $(USB_IA_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -77,10 +74,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -94,52 +89,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll) -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) - -warlock: $(WARLOCK_OK) warlock_with_usba - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/usb_ia.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usb_ia.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/usb_ia/%.c \ - $(UTSBASE)/common/sys/usb/usb_ia/usb_iavar.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_with_usba: $(WLCMD_DIR)/usb_ia_with_usba.wlcmd $(WARLOCK_OUT) \ - usba_files ohci_files ehci_files uhci_files warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usb_ia_with_usba.wlcmd \ - $(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \ - $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - -usba_files: - @cd ../usba;pwd; $(MAKE) warlock - -uhci_files: - @cd ../uhci;pwd; $(MAKE) warlock - -ohci_files: - @cd ../ohci;pwd; $(MAKE) warlock - -ehci_files: - @cd ../ehci;pwd; $(MAKE) warlock - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/usb_mid/Makefile b/usr/src/uts/intel/usb_mid/Makefile index ff5fe23bab..67e5a49dd0 100644 --- a/usr/src/uts/intel/usb_mid/Makefile +++ b/usr/src/uts/intel/usb_mid/Makefile @@ -40,9 +40,6 @@ MODULE = usb_mid OBJECTS = $(USB_MID_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USB_MID_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WARLOCK_OUT = $(USB_MID_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -77,10 +74,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -94,52 +89,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll) -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) - -warlock: $(WARLOCK_OK) warlock_with_usba - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/usb_mid.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usb_mid.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/usb_mid/%.c \ - $(UTSBASE)/common/sys/usb/usb_mid/usb_midvar.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_with_usba: $(WLCMD_DIR)/usb_mid_with_usba.wlcmd $(WARLOCK_OUT) \ - usba_files ohci_files ehci_files uhci_files warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usb_mid_with_usba.wlcmd \ - $(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \ - $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - -usba_files: - @cd ../usba;pwd; $(MAKE) warlock - -uhci_files: - @cd ../uhci;pwd; $(MAKE) warlock - -ohci_files: - @cd ../ohci;pwd; $(MAKE) warlock - -ehci_files: - @cd ../ehci;pwd; $(MAKE) warlock - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/usba/Makefile b/usr/src/uts/intel/usba/Makefile index 0b11d372fc..fbd834917a 100644 --- a/usr/src/uts/intel/usba/Makefile +++ b/usr/src/uts/intel/usba/Makefile @@ -39,8 +39,6 @@ MODULE = usba OBJECTS = $(USBA_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USBA_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) -WARLOCK_OUT = $(USBA_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok # # Include common rules. @@ -71,10 +69,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -88,21 +84,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock - -# -# Warlock targets -# -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/usba/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< diff --git a/usr/src/uts/intel/usbecm/Makefile b/usr/src/uts/intel/usbecm/Makefile index b1f761dfa6..3ee8f01ef6 100644 --- a/usr/src/uts/intel/usbecm/Makefile +++ b/usr/src/uts/intel/usbecm/Makefile @@ -39,9 +39,6 @@ MODULE = usbecm OBJECTS = $(USBECM_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USBECM_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WARLOCK_OUT = $(USBECM_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -64,10 +61,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -81,53 +76,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock -TEST = test - -# -# warlock -# -WARLOCK_CMD = $(WLCMD_DIR)/$(MODULE).wlcmd - -USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll) -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) - -warlock: $(WARLOCK_OK) warlock_with_usba - -%.ll: $(UTSBASE)/common/io/usb/clients/usbecm/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/usbecm.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usbecm.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -warlock_with_usba: $(WLCMD_DIR)/usbecm_with_usba.wlcmd $(WARLOCK_OUT) \ - usba_files ohci_files uhci_files ehci_files \ - warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usbecm_with_usba.wlcmd \ - $(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \ - $(WARLOCK_OUT) -l ../warlock/ddi_dki_impl.ll - -usba_files: - @cd ../usba;pwd; $(MAKE) warlock - -uhci_files: - @cd ../uhci;pwd; $(MAKE) warlock - -ohci_files: - @cd ../ohci;pwd; $(MAKE) warlock - -ehci_files: - @cd ../ehci;pwd; $(MAKE) warlock - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/usbftdi/Makefile b/usr/src/uts/intel/usbftdi/Makefile index c4521f48f4..4f9da61490 100644 --- a/usr/src/uts/intel/usbftdi/Makefile +++ b/usr/src/uts/intel/usbftdi/Makefile @@ -38,11 +38,8 @@ UTSBASE = ../.. MODULE = usbftdi OBJECTS = $(USBFTDI_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USBFTDI_OBJS:%.o=$(LINTS_DIR)/%.ln) -WARLOCK_OUT = $(USBFTDI_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/usb/clients/usbser/usbftdi -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -67,10 +64,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -84,60 +79,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock -TEST = test - -# -# warlock -# -WARLOCK_CMD = $(WLCMD_DIR)/$(MODULE).wlcmd -USBSER_FILES = $(USBSER_OBJS:%.o=../usbser/%.ll) -USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll) -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): warlock_with_usba warlock_with_usbser - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/clients/usbser/usbftdi/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_with_usbser: $(WARLOCK_OUT) usbser_files warlock_ddi.files \ - $(WARLOCK_CMD) - $(WARLOCK) -c $(WARLOCK_CMD) $(WARLOCK_OUT) \ - $(USBSER_FILES) -l ../warlock/ddi_dki_impl.ll - -warlock_with_usba: $(WARLOCK_OUT) usbser_files \ - $(WLCMD_DIR)/usbftdi_with_usba.wlcmd usba_files ohci_files uhci_files \ - ehci_files warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usbftdi_with_usba.wlcmd \ - $(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \ - $(USBSER_FILES) \ - $(WARLOCK_OUT) -l ../warlock/ddi_dki_impl.ll - -usbser_files: - @cd ../usbser; pwd; $(MAKE) warlock - -usba_files: - @cd ../usba;pwd; $(MAKE) warlock - -uhci_files: - @cd ../uhci;pwd; $(MAKE) warlock - -ohci_files: - @cd ../ohci;pwd; $(MAKE) warlock - -ehci_files: - @cd ../ehci;pwd; $(MAKE) warlock - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/usbprn/Makefile b/usr/src/uts/intel/usbprn/Makefile index dd4bdc7ede..d01d9c2106 100644 --- a/usr/src/uts/intel/usbprn/Makefile +++ b/usr/src/uts/intel/usbprn/Makefile @@ -40,9 +40,6 @@ MODULE = usbprn OBJECTS = $(USBPRN_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USBPRN_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WARLOCK_OUT = $(USBPRN_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -77,10 +74,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -94,52 +89,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll) -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) - -warlock: $(WARLOCK_OK) warlock_with_usba - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/usbprn.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usbprn.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/clients/printer/%.c \ - $(UTSBASE)/common/sys/usb/clients/printer/usbprn.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_with_usba: $(WLCMD_DIR)/usbprn_with_usba.wlcmd $(WARLOCK_OUT) \ - usba_files ohci_files ehci_files uhci_files warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usbprn_with_usba.wlcmd \ - $(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \ - $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - -usba_files: - @cd ../usba;pwd; $(MAKE) warlock - -ohci_files: - @cd ../ohci;pwd; $(MAKE) warlock - -uhci_files: - @cd ../uhci;pwd; $(MAKE) warlock - -ehci_files: - @cd ../ehci;pwd; $(MAKE) warlock - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/usbsacm/Makefile b/usr/src/uts/intel/usbsacm/Makefile index 390c663a59..23da8c76d0 100644 --- a/usr/src/uts/intel/usbsacm/Makefile +++ b/usr/src/uts/intel/usbsacm/Makefile @@ -38,9 +38,6 @@ MODULE = usbsacm OBJECTS = $(USBSACM_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USBSACM_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WARLOCK_OUT = $(USBSACM_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -65,10 +62,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -82,61 +77,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock -TEST = test - -# -# warlock -# -WARLOCK_CMD = $(WLCMD_DIR)/$(MODULE).wlcmd - -USBSER_FILES = $(USBSER_OBJS:%.o=../usbser/%.ll) -USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll) -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): warlock_with_usbser warlock_with_usba - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/clients/usbser/usbsacm/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_with_usbser: $(WARLOCK_OUT) usbser_files warlock_ddi.files \ - $(WARLOCK_CMD) - $(WARLOCK) -c $(WARLOCK_CMD) $(WARLOCK_OUT) \ - $(USBSER_FILES) -l ../warlock/ddi_dki_impl.ll - -warlock_with_usba: $(WLCMD_DIR)/usbsacm_with_usba.wlcmd $(WARLOCK_OUT) \ - usbser_files usba_files ohci_files uhci_files ehci_files \ - warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usbsacm_with_usba.wlcmd \ - $(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \ - $(USBSER_FILES) \ - $(WARLOCK_OUT) -l ../warlock/ddi_dki_impl.ll - -usbser_files: - @cd ../usbser; pwd; $(MAKE) warlock - -usba_files: - @cd ../usba;pwd; $(MAKE) warlock - -uhci_files: - @cd ../uhci;pwd; $(MAKE) warlock - -ohci_files: - @cd ../ohci;pwd; $(MAKE) warlock - -ehci_files: - @cd ../ehci;pwd; $(MAKE) warlock - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/usbser/Makefile b/usr/src/uts/intel/usbser/Makefile index a4aa5057fe..9022579ae6 100644 --- a/usr/src/uts/intel/usbser/Makefile +++ b/usr/src/uts/intel/usbser/Makefile @@ -40,9 +40,6 @@ MODULE = usbser OBJECTS = $(USBSER_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USBSER_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) -WARLOCK_OUT = $(USBSER_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -75,10 +72,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -92,29 +87,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock -TEST = test - -# -# Warlock -# -WARLOCK_CMD = $(WLCMD_DIR)/$(MODULE).wlcmd - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WARLOCK_CMD) warlock_ddi.files - $(WARLOCK) -c $(WARLOCK_CMD) $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/clients/usbser/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/usbskel/Makefile b/usr/src/uts/intel/usbskel/Makefile index f020121884..af92d96c7d 100644 --- a/usr/src/uts/intel/usbskel/Makefile +++ b/usr/src/uts/intel/usbskel/Makefile @@ -41,9 +41,6 @@ OBJECTS = $(USBSKEL_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USBSKEL_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/usb/clients/usbskel -WARLOCK_OUT = $(USBSKEL_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -78,10 +75,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -95,53 +90,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll) -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) - -warlock: $(WARLOCK_OK) warlock_with_usba - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/usbskel.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usbskel.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/clients/usbskel/%.c \ - $(UTSBASE)/common/sys/usb/clients/usbskel/usbskel.h - $(WLCC) $(CPPFLAGS) -DDEBUG -DUSBSKEL_PM -DUSBSKEL_CPR -o $@ $< - -warlock_with_usba: $(WLCMD_DIR)/usbskel_with_usba.wlcmd $(WARLOCK_OUT) \ - usba_files ohci_files ehci_files uhci_files warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usbskel_with_usba.wlcmd \ - $(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \ - $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - -usba_files: - @cd ../usba;pwd; $(MAKE) warlock - -uhci_files: - @cd ../uhci;pwd; $(MAKE) warlock - -ohci_files: - @cd ../ohci;pwd; $(MAKE) warlock - -ehci_files: - @cd ../ehci;pwd; $(MAKE) warlock - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock - diff --git a/usr/src/uts/intel/usbsksp/Makefile b/usr/src/uts/intel/usbsksp/Makefile index 9fce0550b4..695d340f46 100644 --- a/usr/src/uts/intel/usbsksp/Makefile +++ b/usr/src/uts/intel/usbsksp/Makefile @@ -42,9 +42,6 @@ MODULE = usbsksp OBJECTS = $(USBSER_KEYSPAN_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USBSER_KEYSPAN_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WARLOCK_OUT = $(USBSER_KEYSPAN_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -67,10 +64,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -86,61 +81,3 @@ install: $(INSTALL_DEPS) include $(UTSBASE)/intel/Makefile.targ CERRWARN += -_gcc=-Wno-uninitialized - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock -TEST = test - -# -# warlock -# -WARLOCK_CMD = $(WLCMD_DIR)/usbser_keyspan.wlcmd - -USBSER_FILES = $(USBSER_OBJS:%.o=../usbser/%.ll) -USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll) -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): warlock_with_usba warlock_with_usbser - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/clients/usbser/usbser_keyspan/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_with_usbser: $(WARLOCK_OUT) usbser_files warlock_ddi.files \ - $(WARLOCK_CMD) - $(WARLOCK) -c $(WARLOCK_CMD) $(WARLOCK_OUT) \ - $(USBSER_FILES) -l ../warlock/ddi_dki_impl.ll - -warlock_with_usba: $(WARLOCK_OUT) usbser_files \ - $(WLCMD_DIR)/usbser_keyspan_with_usba.wlcmd \ - usba_files ohci_files uhci_files ehci_files warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usbser_keyspan_with_usba.wlcmd \ - $(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \ - $(USBSER_FILES) \ - $(WARLOCK_OUT) -l ../warlock/ddi_dki_impl.ll - -usbser_files: - @cd ../usbser; pwd; $(MAKE) warlock - -usba_files: - @cd ../usba;pwd; $(MAKE) warlock - -uhci_files: - @cd ../uhci;pwd; $(MAKE) warlock - -ohci_files: - @cd ../ohci;pwd; $(MAKE) warlock - -ehci_files: - @cd ../ehci;pwd; $(MAKE) warlock - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/usbsprl/Makefile b/usr/src/uts/intel/usbsprl/Makefile index 3a896a7a4e..a2fe99fea9 100644 --- a/usr/src/uts/intel/usbsprl/Makefile +++ b/usr/src/uts/intel/usbsprl/Makefile @@ -38,10 +38,7 @@ UTSBASE = ../.. MODULE = usbsprl OBJECTS = $(USBSPRL_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USBSPRL_OBJS:%.o=$(LINTS_DIR)/%.ln) -WARLOCK_OUT = $(USBSPRL_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -66,10 +63,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -83,60 +78,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock -TEST = test - -# -# warlock -# -WARLOCK_CMD = $(WLCMD_DIR)/$(MODULE).wlcmd -USBSER_FILES = $(USBSER_OBJS:%.o=../usbser/%.ll) -USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll) -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): warlock_with_usba warlock_with_usbser - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/clients/usbser/usbsprl/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_with_usbser: $(WARLOCK_OUT) usbser_files warlock_ddi.files \ - $(WARLOCK_CMD) - $(WARLOCK) -c $(WARLOCK_CMD) $(WARLOCK_OUT) \ - $(USBSER_FILES) -l ../warlock/ddi_dki_impl.ll - -warlock_with_usba: $(WARLOCK_OUT) usbser_files \ - $(WLCMD_DIR)/usbsprl_with_usba.wlcmd usba_files ohci_files uhci_files \ - ehci_files warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usbsprl_with_usba.wlcmd \ - $(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \ - $(USBSER_FILES) \ - $(WARLOCK_OUT) -l ../warlock/ddi_dki_impl.ll - -usbser_files: - @cd ../usbser; pwd; $(MAKE) warlock - -usba_files: - @cd ../usba;pwd; $(MAKE) warlock - -uhci_files: - @cd ../uhci;pwd; $(MAKE) warlock - -ohci_files: - @cd ../ohci;pwd; $(MAKE) warlock - -ehci_files: - @cd ../ehci;pwd; $(MAKE) warlock - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/usbvc/Makefile b/usr/src/uts/intel/usbvc/Makefile index a447b0f875..303a025e1e 100644 --- a/usr/src/uts/intel/usbvc/Makefile +++ b/usr/src/uts/intel/usbvc/Makefile @@ -42,9 +42,6 @@ MODULE = usbvc OBJECTS = $(USBVC_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USBVC_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WARLOCK_OUT = $(USBVC_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -87,10 +84,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -104,52 +99,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll) -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) - -warlock: $(WARLOCK_OK) warlock_with_usba - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/usbvc.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usbvc.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/clients/video/usbvc/%.c \ - $(UTSBASE)/common/sys/usb/clients/video/usbvc/usbvc_var.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_with_usba: $(WLCMD_DIR)/usbvc_with_usba.wlcmd $(WARLOCK_OUT) \ - usba_files ohci_files ehci_files uhci_files warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usbvc_with_usba.wlcmd \ - $(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \ - $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - -usba_files: - @cd ../usba;pwd; $(MAKE) warlock - -ohci_files: - @cd ../ohci;pwd; $(MAKE) warlock - -uhci_files: - @cd ../uhci;pwd; $(MAKE) warlock - -ehci_files: - @cd ../ehci;pwd; $(MAKE) warlock - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/intel/warlock/Makefile b/usr/src/uts/intel/warlock/Makefile deleted file mode 100644 index b109499204..0000000000 --- a/usr/src/uts/intel/warlock/Makefile +++ /dev/null @@ -1,116 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. -# -# uts/intel/warlock/Makefile -# -# Path to the base of the uts directory tree (usually /usr/src/uts). -# -UTSBASE = ../.. - -# -# Define the module and object file sets. -# -MODULE = warlock -ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) - -.KEEP_STATE: - -CFLAGS += -I../../common/sys -I../../sun/sys/scsi -D_KERNEL -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -include $(UTSBASE)/intel/Makefile.intel - -# -# lock_lint rules -# -all: warlock warlock.1394 warlock.ecpp warlock.scsi \ - warlock.usb warlock.ib warlock.sata warlock.wc \ - warlock.audiohd - -warlock: $(MODULE).ok - -warlock.ok: ddi_dki_impl.ll scsi.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/warlock/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock.usb: - @cd ../usba; $(MAKE) clean; $(MAKE) warlock - @cd ../ohci; $(MAKE) clean; $(MAKE) warlock - @cd ../uhci; $(MAKE) clean; $(MAKE) warlock - @cd ../ehci; $(MAKE) clean; $(MAKE) warlock - @cd ../hid; $(MAKE) clean; $(MAKE) warlock - @cd ../scsa2usb; $(MAKE) clean; $(MAKE) warlock - @cd ../usb_ac; $(MAKE) clean; $(MAKE) warlock - @cd ../usb_as; $(MAKE) clean; $(MAKE) warlock - @cd ../usb_ah; $(MAKE) clean; $(MAKE) warlock - @cd ../ugen; $(MAKE) clean; $(MAKE) warlock - @cd ../usb_mid; $(MAKE) clean; $(MAKE) warlock - @cd ../usbprn; $(MAKE) clean; $(MAKE) warlock - @cd ../usbser; $(MAKE) clean; $(MAKE) warlock - @cd ../usbsksp; $(MAKE) clean; $(MAKE) warlock - @cd ../usbsprl; $(MAKE) clean; $(MAKE) warlock - @cd ../usbsacm; $(MAKE) clean; $(MAKE) warlock - @cd ../usbecm; $(MAKE) clean; $(MAKE) warlock - @cd ../usbskel; $(MAKE) clean; $(MAKE) warlock - -warlock.scsi: - @cd ../sd; $(MAKE) clean; $(MAKE) warlock - @cd ../ses; $(MAKE) clean; $(MAKE) warlock - @cd ../st; $(MAKE) clean; $(MAKE) warlock - -warlock.1394: - @cd ../s1394; $(MAKE) clean; $(MAKE) warlock - @cd ../hci1394; $(MAKE) clean; $(MAKE) warlock - @cd ../scsa1394; $(MAKE) clean; $(MAKE) warlock - @cd ../av1394; $(MAKE) clean; $(MAKE) warlock - -warlock.ecpp: - @cd ../ecpp; $(MAKE) clean; $(MAKE) warlock - -warlock.ib: - @cd ../ibmf; $(MAKE) clean; $(MAKE) warlock - @cd ../ib; $(MAKE) clean; $(MAKE) warlock - @cd ../ibtl; $(MAKE) clean; $(MAKE) warlock - @cd ../ibcm; $(MAKE) clean; $(MAKE) warlock - @cd ../ibd; $(MAKE) clean; $(MAKE) warlock - -warlock.sata: - @cd ../sata; $(MAKE) clean; $(MAKE) warlock - @cd ../si3124; $(MAKE) clean; $(MAKE) warlock - @cd ../nv_sata; $(MAKE) clean; $(MAKE) warlock - @cd ../ahci; $(MAKE) clean; $(MAKE) warlock - -warlock.wc: - @cd ../wc; $(MAKE) clean; $(MAKE) warlock - -warlock.audiohd: - @cd ../audiohd; $(MAKE) clean; $(MAKE) warlock diff --git a/usr/src/uts/intel/wc/Makefile b/usr/src/uts/intel/wc/Makefile index 29f823b998..d84d5a4faa 100644 --- a/usr/src/uts/intel/wc/Makefile +++ b/usr/src/uts/intel/wc/Makefile @@ -24,7 +24,7 @@ # Use is subject to license terms. # # -# This makefile drives the production of the wc driver +# This makefile drives the production of the wc driver # kernel module. # # intel implementation architecture independent @@ -43,9 +43,6 @@ OBJECTS = $(WC_OBJS:%=$(OBJS_DIR)/%) LINTS = $(WC_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io -WARLOCK_OUT = $(WC_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -91,37 +88,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/intel/Makefile.targ - -# -# Defines for local commands -# -TEST = test -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock - -# -# warlock targets -# - -# -# vcons_conf.c is compile to genunix, add it to WARLOCK_OUT -# -WARLOCK_OUT += vcons_conf.ll - -warlock: $(WARLOCK_OUT) sdev_vtops.file warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/wc.wlcmd $(WARLOCK_OUT) \ - -l ../../intel/warlock/ddi_dki_impl.ll - $(WARLOCK) -c $(WLCMD_DIR)/wc_devfs.wlcmd sdev_vtops.ll vcons_conf.ll \ - -l ../../intel/warlock/ddi_dki_impl.ll - $(TOUCH) $(WARLOCK_OK) - -%.ll: $(UTSBASE)/common/io/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -sdev_vtops.file: - $(WLCC) $(CPPFLAGS) -DDEBUG -o sdev_vtops.ll -c \ - ../../common/fs/dev/sdev_vtops.c - -warlock_ddi.files: - @cd ../../intel/warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/aac/Makefile b/usr/src/uts/sparc/aac/Makefile index c5b5079f59..53ee28aeba 100644 --- a/usr/src/uts/sparc/aac/Makefile +++ b/usr/src/uts/sparc/aac/Makefile @@ -43,9 +43,6 @@ OBJECTS = $(AAC_OBJS:%=$(OBJS_DIR)/%) LINTS = $(AAC_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/aac -WARLOCK_OUT = $(AAC_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -59,9 +56,9 @@ ALL_TARGET = $(BINARY) $(CONFMOD) LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) # @@ -104,37 +101,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -SCSI_FILES = $(SCSI_OBJS:%.o= -l $(UTSBASE)/sparc/scsi/%.ll) - -%.wlcmd: - cd $(WLCMD_DIR); $(TEST) -f $@ || $(SCCS) get $@ - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files scsi.files aac.wlcmd - $(WARLOCK) -c $(WLCMD_DIR)/aac.wlcmd $(WARLOCK_OUT) \ - $(SCSI_FILES) \ - $(UTSBASE)/sparc/warlock/scsi.ll \ - -l $(UTSBASE)/sparc/warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/aac/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd $(UTSBASE)/sparc/warlock; pwd; $(MAKE) warlock - -scsi.files: - @cd $(UTSBASE)/sparc/scsi; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/ac97/Makefile b/usr/src/uts/sparc/ac97/Makefile index 84b7c69ea7..1abee91426 100644 --- a/usr/src/uts/sparc/ac97/Makefile +++ b/usr/src/uts/sparc/ac97/Makefile @@ -39,9 +39,6 @@ MODULE = ac97 OBJECTS = $(AC97_OBJS:%=$(OBJS_DIR)/%) LINTS = $(AC97_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) -WARLOCK_OUT = $(AC97_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -67,10 +64,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) diff --git a/usr/src/uts/sparc/ahci/Makefile b/usr/src/uts/sparc/ahci/Makefile deleted file mode 100644 index a80a11100e..0000000000 --- a/usr/src/uts/sparc/ahci/Makefile +++ /dev/null @@ -1,150 +0,0 @@ -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -# -# uts/sparc/ahci/Makefile -# -# This makefile drives the production of the -# "/kernel/drv/ahci" kernel module. -# -# sparc architecture dependent -# - -# -# Path to the base of the uts directory tree (usually /usr/src/uts). -# -UTSBASE = ../.. - -# -# Define the module and object file sets. -# -MODULE = ahci -OBJECTS = $(AHCI_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(AHCI_OBJS:%.o=$(LINTS_DIR)/%.ln) -WARLOCK_OUT = $(AHCI_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -CONF_SRCDIR = $(UTSBASE)/common/io/sata/adapters/ahci -WLCMD_DIR = $(UTSBASE)/common/io/warlock - -# -# Include common rules. -# -include $(UTSBASE)/sparc/Makefile.sparc - -# -# Define targets -# -ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint -INSTALL_TARGET = $(BINARY) $(ROOTMODULE) - -# -# Overrides. -# -DEBUG_FLGS = -DEBUG_DEFS += $(DEBUG_FLGS) - -# -# lint pass one enforcement -# -CFLAGS += $(CCVERBOSE) - -CERRWARN += -_gcc=-Wno-parentheses -CERRWARN += -_gcc=-Wno-unused-label -CERRWARN += -_gcc=-Wno-uninitialized - -# -# Default build targets. -# -.KEEP_STATE: - -def: $(DEF_DEPS) - -all: $(ALL_DEPS) - -clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) - -clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) - -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - -install: $(INSTALL_DEPS) - -# -# Include common targets. -# -include $(UTSBASE)/sparc/Makefile.targ - - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -SD_FILES = $(SD_OBJS:%.o=../sd/%.ll) -SATA_FILES = $(SATA_OBJS:%.o=-l ../sata/%.ll) -SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll) -CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll) - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WLCMD_DIR)/ahci.wlcmd $(WARLOCK_OUT) warlock_ddi.files \ - sata.files scsi.files sd.files cmlb.files - $(WARLOCK) -c $(WLCMD_DIR)/ahci.wlcmd $(WARLOCK_OUT) \ - $(SD_FILES) \ - $(SCSI_FILES) \ - $(CMLB_FILES) \ - $(SATA_FILES) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/sata/adapters/ahci/%.c - $(WLCC) $(CPPFLAGS) -D DEBUG -D __sparcv9 -o $@ $< - -sata.files: - @cd ../sata; pwd; $(MAKE) warlock - -scsi.files: - @cd ../scsi; pwd; $(MAKE) warlock - -sd.files: - @cd ../sd; pwd; $(MAKE) warlock_alone - -cmlb.files: - @cd ../cmlb; pwd; $(MAKE) warlock - - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/av1394/Makefile b/usr/src/uts/sparc/av1394/Makefile index 3b610a5ea4..8699d8b0ee 100644 --- a/usr/src/uts/sparc/av1394/Makefile +++ b/usr/src/uts/sparc/av1394/Makefile @@ -35,9 +35,6 @@ MODULE = av1394 OBJECTS = $(AV1394_OBJS:%=$(OBJS_DIR)/%) LINTS = $(AV1394_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WARLOCK_OUT = $(AV1394_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -95,10 +92,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -112,27 +107,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# Warlock targets -# -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files $(WLCMD_DIR)/av1394.wlcmd - $(WARLOCK) -c $(WLCMD_DIR)/av1394.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/1394/targets/av1394/%.c - $(WLCC) $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/cmlb/Makefile b/usr/src/uts/sparc/cmlb/Makefile index b21cbbfdcb..d66ea89566 100644 --- a/usr/src/uts/sparc/cmlb/Makefile +++ b/usr/src/uts/sparc/cmlb/Makefile @@ -39,9 +39,6 @@ UTSBASE = ../.. MODULE = cmlb OBJECTS = $(CMLB_OBJS:%=$(OBJS_DIR)/%) LINTS = $(CMLB_OBJS:%.o=$(LINTS_DIR)/%.ln) -WARLOCK_OUT = $(CMLB_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) # # Include common rules. @@ -91,10 +88,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -108,21 +103,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock - -# -# Warlock targets -# -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< diff --git a/usr/src/uts/sparc/dad/Makefile b/usr/src/uts/sparc/dad/Makefile index bccba311ff..fe137a836d 100644 --- a/usr/src/uts/sparc/dad/Makefile +++ b/usr/src/uts/sparc/dad/Makefile @@ -43,9 +43,6 @@ OBJECTS = $(DAD_OBJS:%=$(OBJS_DIR)/%) LINTS = $(DAD_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/sun/io/dada/targets -WARLOCK_OUT = $(DAD_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -94,10 +91,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -111,46 +106,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# Warlock targets -# -# Note that in warlock_with_{esp,isp} it is important to load sd.ll -# before {isp,esp}.ll; the reason is that both have _init/_info/_fini -# and warlock can only handle one extern function by a given name; -# any loaded after the first are ignored. - -DADA_FILES = $(DADA_OBJS:%.o=-l $(UTSBASE)/sparc/dada/%.ll) -CMLB_FILES = $(CMLB_OBJS:%.o=-l $(UTSBASE)/sparc/cmlb/%.ll) - -warlock: warlock_alone - -warlock_alone: $(WARLOCK_OK) - -dada_files: - @cd $(UTSBASE)/sparc/dada; pwd; $(MAKE) warlock - -cmlb_files: - @cd $(UTSBASE)/sparc/cmlb; pwd; $(MAKE) warlock - -$(WARLOCK_OK): $(WLCMD_DIR)/dad.wlcmd $(WARLOCK_OUT) dada_files \ - warlock_ddi.files cmlb_files - $(WARLOCK) -c $(WLCMD_DIR)/dad.wlcmd $(WARLOCK_OUT) -l $(DADA_FILES) \ - -l $(CMLB_FILES) \ - -l $(UTSBASE)/sparc/warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/sun/io/dada/targets/%.c - $(WLCC) $(CPPFLAGS) -o $@ $< - -warlock_ddi.files: - @cd $(UTSBASE)/sparc/warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/dada/Makefile b/usr/src/uts/sparc/dada/Makefile index e445533524..692b84c327 100644 --- a/usr/src/uts/sparc/dada/Makefile +++ b/usr/src/uts/sparc/dada/Makefile @@ -25,8 +25,6 @@ # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" - # # Path to the base of the uts directory tree (usually /usr/src/uts). # @@ -39,8 +37,6 @@ MODULE = dada OBJECTS = $(DADA_OBJS:%=$(OBJS_DIR)/%) LINTS = $(DADA_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) -WARLOCK_OUT = $(DADA_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok # # Include common rules. @@ -77,10 +73,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) modlintlib: $(MODLINTLIB_DEPS) lint64 @@ -92,23 +86,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch - -# -# Warlock targets -# -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) - $(TOUCH) $@ - -%.ll: $(UTSBASE)/sun/io/dada/impl/%.c - $(WLCC) $(CPPFLAGS) -o $@ $< - -%.ll: $(UTSBASE)/sun/io/dada/conf/%.c - $(WLCC) $(CPPFLAGS) -o $@ $< diff --git a/usr/src/uts/sparc/daplt/Makefile b/usr/src/uts/sparc/daplt/Makefile index ba5e0800a0..8000f5772c 100644 --- a/usr/src/uts/sparc/daplt/Makefile +++ b/usr/src/uts/sparc/daplt/Makefile @@ -39,9 +39,6 @@ LINTS = $(DAPLT_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/ib/clients/daplt LDFLAGS += -dy -Nmisc/ibtl -Nmisc/ibcm -WARLOCK_OUT = $(DAPLT_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -60,9 +57,9 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) # INCLUDE_PATH += -I$(UTSBASE)/common/sys/ib/clients/daplt -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) # @@ -95,10 +92,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -112,28 +107,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -DAPL_FILES = $(DAPL_OBJS:%.o= -l ../daplt/%.ll) - -warlock: $(WARLOCK_OK) $(WARLOCK_OUT) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/daplt.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/daplt.wlcmd $(WARLOCK_OUT) \ - -l $(UTSBASE)/sparc/warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/clients/daplt/%.c \ - $(UTSBASE)/common/sys/ib/clients/daplt/daplt.h \ - $(UTSBASE)/common/sys/ib/clients/daplt/daplt_if.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd $(UTSBASE)/sparc/warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/ecpp/Makefile b/usr/src/uts/sparc/ecpp/Makefile index be88954984..677fce57ee 100644 --- a/usr/src/uts/sparc/ecpp/Makefile +++ b/usr/src/uts/sparc/ecpp/Makefile @@ -27,7 +27,7 @@ # # This Makefile drives the production of ecpp # kernel module. -# +# # # @@ -43,9 +43,6 @@ OBJECTS = $(ECPP_OBJS:%=$(OBJS_DIR)/%) LINTS = $(ECPP_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io -WARLOCK_OUT = $(ECPP_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -89,10 +86,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) modlintlib: $(MODLINTLIB_DEPS) lint64 @@ -104,29 +99,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/ecpp.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/ecpp.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - - -%.ll: $(UTSBASE)/common/io/%.c $(UTSBASE)/common/sys/ecppvar.h \ - $(UTSBASE)/common/sys/ecppio.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/ehci/Makefile b/usr/src/uts/sparc/ehci/Makefile index 33d39ca0cb..65fcbe5430 100644 --- a/usr/src/uts/sparc/ehci/Makefile +++ b/usr/src/uts/sparc/ehci/Makefile @@ -38,14 +38,11 @@ UTSBASE = ../.. # # Define the module and object file sets. # -MODULE = ehci +MODULE = ehci OBJECTS = $(EHCI_OBJS:%=$(OBJS_DIR)/%) LINTS = $(EHCI_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/usb/hcd/ehci -WARLOCK_OUT = $(EHCI_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -78,10 +75,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -95,34 +90,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -USBA_FILES = $(USBA_OBJS:%.o= -l ../usba/%.ll) - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/ehci.wlcmd warlock_ddi.files \ - usba.files - $(WARLOCK) -c $(WLCMD_DIR)/ehci.wlcmd $(WARLOCK_OUT) \ - $(USBA_FILES) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/hcd/ehci/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock - -usba.files: - @cd ../usba; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/eibnx/Makefile b/usr/src/uts/sparc/eibnx/Makefile index c3264d57cb..7380f424ab 100644 --- a/usr/src/uts/sparc/eibnx/Makefile +++ b/usr/src/uts/sparc/eibnx/Makefile @@ -42,9 +42,6 @@ OBJECTS = $(EIBNX_OBJS:%=$(OBJS_DIR)/%) LINTS = $(EIBNX_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/ib/clients/eoib -WARLOCK_OUT = $(EIBNX_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules @@ -68,9 +65,9 @@ DEF_BUILDS = $(DEF_BUILDSONLY64) # CPPFLAGS += -DENX_DEBUG -# -# Lint pass one enforcement -# +# +# Lint pass one enforcement +# CFLAGS += $(CCVERBOSE) # @@ -96,10 +93,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -113,34 +108,3 @@ install: $(INSTALL_DEPS) # Include common targets # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/eibnx.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/eibnx.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/clients/eoib/enx_main.c \ - $(UTSBASE)/common/io/ib/clients/eoib/enx_hdlrs.c \ - $(UTSBASE)/common/io/ib/clients/eoib/enx_ibt.c \ - $(UTSBASE)/common/io/ib/clients/eoib/enx_log.c \ - $(UTSBASE)/common/io/ib/clients/eoib/enx_fip.c \ - $(UTSBASE)/common/io/ib/clients/eoib/enx_misc.c \ - $(UTSBASE)/common/io/ib/clients/eoib/enx_q.c \ - $(UTSBASE)/common/io/ib/clients/eoib/enx_ctl.c \ - $(UTSBASE)/common/sys/ib/clients/eoib/fip.h \ - $(UTSBASE)/common/sys/ib/clients/eoib/eib.h \ - $(UTSBASE)/common/sys/ib/clients/eoib/enx_impl.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/eoib/Makefile b/usr/src/uts/sparc/eoib/Makefile index 93dacb1a88..01a11078fc 100644 --- a/usr/src/uts/sparc/eoib/Makefile +++ b/usr/src/uts/sparc/eoib/Makefile @@ -41,9 +41,6 @@ MODULE = eoib OBJECTS = $(EOIB_OBJS:%=$(OBJS_DIR)/%) LINTS = $(EOIB_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WARLOCK_OUT = $(EOIB_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules @@ -67,9 +64,9 @@ DEF_BUILDS = $(DEF_BUILDSONLY64) # CPPFLAGS += -DEIB_DEBUG -# -# Lint pass one enforcement -# +# +# Lint pass one enforcement +# CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-switch @@ -90,10 +87,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -107,39 +102,3 @@ install: $(INSTALL_DEPS) # Include common targets # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/eoib.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/eoib.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/clients/eoib/eib_adm.c \ - $(UTSBASE)/common/io/ib/clients/eoib/eib_chan.c \ - $(UTSBASE)/common/io/ib/clients/eoib/eib_cmn.c \ - $(UTSBASE)/common/io/ib/clients/eoib/eib_ctl.c \ - $(UTSBASE)/common/io/ib/clients/eoib/eib_data.c \ - $(UTSBASE)/common/io/ib/clients/eoib/eib_fip.c \ - $(UTSBASE)/common/io/ib/clients/eoib/eib_ibt.c \ - $(UTSBASE)/common/io/ib/clients/eoib/eib_log.c \ - $(UTSBASE)/common/io/ib/clients/eoib/eib_mac.c \ - $(UTSBASE)/common/io/ib/clients/eoib/eib_main.c \ - $(UTSBASE)/common/io/ib/clients/eoib/eib_rsrc.c \ - $(UTSBASE)/common/io/ib/clients/eoib/eib_svc.c \ - $(UTSBASE)/common/io/ib/clients/eoib/eib_vnic.c \ - $(UTSBASE)/common/sys/ib/clients/eoib/fip.h \ - $(UTSBASE)/common/sys/ib/clients/eoib/eib.h \ - $(UTSBASE)/common/sys/ib/clients/eoib/eib_impl.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/fas/Makefile b/usr/src/uts/sparc/fas/Makefile index 8af59c8f2e..03dea3fc60 100644 --- a/usr/src/uts/sparc/fas/Makefile +++ b/usr/src/uts/sparc/fas/Makefile @@ -41,9 +41,6 @@ MODULE = fas OBJECTS = $(FAS_OBJS:%=$(OBJS_DIR)/%) LINTS = $(FAS_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WARLOCK_OUT = $(FAS_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -57,9 +54,9 @@ ALL_TARGET = $(BINARY) LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) # @@ -89,10 +86,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -106,35 +101,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -SCSI_FILES = $(SCSI_OBJS:%.o= -l ../scsi/%.ll) - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/fas.wlcmd warlock_ddi.files \ - scsi.files - $(WARLOCK) -c $(WLCMD_DIR)/fas.wlcmd $(WARLOCK_OUT) \ - ../warlock/scsi.ll \ - -l ../warlock/ddi_dki_impl.ll \ - $(SCSI_FILES) - $(TOUCH) $@ - -%.ll: $(UTSBASE)/sun/io/scsi/adapters/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock - -scsi.files: - @cd ../scsi; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/fcip/Makefile b/usr/src/uts/sparc/fcip/Makefile index af515c5d35..6e70560f9b 100644 --- a/usr/src/uts/sparc/fcip/Makefile +++ b/usr/src/uts/sparc/fcip/Makefile @@ -89,9 +89,6 @@ clobber: $(CLOBBER_DEPS) lint: $(LINT_DEPS) -warlock: - @echo warlock is not supported - modlintlib: $(MODLINTLIB_DEPS) clean.lint: $(CLEAN_LINT_DEPS) diff --git a/usr/src/uts/sparc/fcsm/Makefile b/usr/src/uts/sparc/fcsm/Makefile index ce564e5eff..faaa084924 100644 --- a/usr/src/uts/sparc/fcsm/Makefile +++ b/usr/src/uts/sparc/fcsm/Makefile @@ -85,9 +85,6 @@ clobber: $(CLOBBER_DEPS) lint: $(LINT_DEPS) -warlock: - @echo warlock is not supported - modlintlib: $(MODLINTLIB_DEPS) clean.lint: $(CLEAN_LINT_DEPS) diff --git a/usr/src/uts/sparc/hci1394/Makefile b/usr/src/uts/sparc/hci1394/Makefile index 068edbf679..5bdb63b1e0 100644 --- a/usr/src/uts/sparc/hci1394/Makefile +++ b/usr/src/uts/sparc/hci1394/Makefile @@ -45,9 +45,6 @@ LINTS = $(HCI1394_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/1394/adapters LDFLAGS += -dy -Nmisc/s1394 -WARLOCK_OUT = $(HCI1394_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -71,9 +68,9 @@ CLEANLINTFILES += $(LINT32_FILES) DEBUG_DEFS_DBG32 += -DTNF_DEBUG DEBUG_DEFS_DBG64 += -DTNF_DEBUG -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) # @@ -101,10 +98,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -118,35 +113,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# Warlock targets -# -S1394_FILES = $(S1394_OBJS:%.o= -l ../s1394/%.ll) - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) s1394.files warlock_ddi.files \ - $(WLCMD_DIR)/hci1394.wlcmd - $(WARLOCK) -c $(WLCMD_DIR)/hci1394.wlcmd \ - $(WARLOCK_OUT) $(S1394_FILES) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/1394/adapters/%.c - $(WLCC) $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock - -s1394.files: - @cd ../s1394; pwd; $(MAKE) warlock - diff --git a/usr/src/uts/sparc/hermon/Makefile b/usr/src/uts/sparc/hermon/Makefile index 0b302b9953..23ff5b1ecf 100644 --- a/usr/src/uts/sparc/hermon/Makefile +++ b/usr/src/uts/sparc/hermon/Makefile @@ -44,9 +44,6 @@ LINTS = $(HERMON_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/ib/adapters/hermon LDFLAGS += -dy -Ndrv/ib -Nmisc/ibtl -Nmisc/ibmf -WARLOCK_OUT = $(HERMON_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -106,25 +103,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files $(WLCMD_DIR)/hermon.wlcmd - $(WARLOCK) -c $(WLCMD_DIR)/hermon.wlcmd $(WARLOCK_OUT) -l \ - $(UTSBASE)/sparc/warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/adapters/hermon/%.c - $(WLCC) $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd $(UTSBASE)/sparc/warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/hid/Makefile b/usr/src/uts/sparc/hid/Makefile index c4295a87ce..85f360fd7d 100644 --- a/usr/src/uts/sparc/hid/Makefile +++ b/usr/src/uts/sparc/hid/Makefile @@ -43,18 +43,15 @@ MODULE = hid OBJECTS = $(HID_OBJS:%=$(OBJS_DIR)/%) LINTS = $(HID_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WARLOCK_OUT = $(HID_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. # include $(UTSBASE)/sparc/Makefile.sparc -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) # @@ -85,10 +82,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -102,54 +97,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) - -warlock: $(WARLOCK_OK) warlock_with_usba - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/hid.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/hid.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/clients/hid/%.c \ - $(UTSBASE)/common/sys/usb/clients/hid/hidvar.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_with_usba: $(WLCMD_DIR)/hid_with_usba.wlcmd $(WARLOCK_OUT) usba_files \ - ohci_files ehci_files uhci_files warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/hid_with_usba.wlcmd \ - $(USBA_FILES) \ - $(UHCI_FILES) $(OHCI_FILES) $(EHCI_FILES) \ - $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - -usba_files: - @cd ../usba;pwd; $(MAKE) warlock - -ohci_files: - @cd ../ohci;pwd; $(MAKE) warlock - -uhci_files: - @cd ../uhci;pwd; $(MAKE) warlock - -ehci_files: - @cd ../ehci;pwd; $(MAKE) warlock - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock - diff --git a/usr/src/uts/sparc/ib/Makefile b/usr/src/uts/sparc/ib/Makefile index 7702adf1a5..4432cce6a9 100644 --- a/usr/src/uts/sparc/ib/Makefile +++ b/usr/src/uts/sparc/ib/Makefile @@ -44,9 +44,6 @@ OBJECTS = $(IB_OBJS:%=$(OBJS_DIR)/%) LINTS = $(IB_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/ib/ibnex -WARLOCK_OUT = $(IB_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -100,10 +97,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -117,29 +112,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/ib.wlcmd ibdm_files warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/ib.wlcmd $(WARLOCK_OUT) \ - -l ../ibdm/ibdm.ll -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/ibnex/%.c \ - $(UTSBASE)/common/sys/ib/ibnex/ibnex.h \ - $(UTSBASE)/common/sys/ib/ibnex/ibnex_devctl.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -ibdm_files : - @cd ../ibdm; pwd; $(MAKE) warlock - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/ibcm/Makefile b/usr/src/uts/sparc/ibcm/Makefile index c4f9bd7924..8cd008039b 100644 --- a/usr/src/uts/sparc/ibcm/Makefile +++ b/usr/src/uts/sparc/ibcm/Makefile @@ -40,9 +40,6 @@ MODULE = ibcm OBJECTS = $(IBCM_OBJS:%=$(OBJS_DIR)/%) LINTS = $(IBCM_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) -WARLOCK_OUT = $(IBCM_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -100,10 +97,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -117,24 +112,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/ibcm.wlcmd - $(WARLOCK) -c $(WLCMD_DIR)/ibcm.wlcmd $(WARLOCK_OUT) - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/mgt/ibcm/%.c \ - $(UTSBASE)/common/sys/ib/mgt/ibcm/ibcm_impl.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/ibdm/Makefile b/usr/src/uts/sparc/ibdm/Makefile index a749558c65..e713659ab8 100644 --- a/usr/src/uts/sparc/ibdm/Makefile +++ b/usr/src/uts/sparc/ibdm/Makefile @@ -42,8 +42,6 @@ MODULE = ibdm OBJECTS = $(IBDM_OBJS:%=$(OBJS_DIR)/%) LINTS = $(IBDM_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) -WARLOCK_OUT = $(IBDM_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok # # Include common rules. @@ -63,9 +61,9 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) ALL_BUILDS = $(ALL_BUILDSONLY64) DEF_BUILDS = $(DEF_BUILDSONLY64) -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) # @@ -92,10 +90,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -109,22 +105,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -warlock: $(WARLOCK_OK) - - -$(WARLOCK_OK): $(WARLOCK_OUT) - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/mgt/ibdm/%.c \ - $(UTSBASE)/common/sys/ib/mgt/ibdm/ibdm_impl.h \ - $(UTSBASE)/common/sys/ib/mgt/ibdm/ibdm_ibnex.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< diff --git a/usr/src/uts/sparc/ibdma/Makefile b/usr/src/uts/sparc/ibdma/Makefile index ef3ee9c03e..cb60c81a3c 100644 --- a/usr/src/uts/sparc/ibdma/Makefile +++ b/usr/src/uts/sparc/ibdma/Makefile @@ -40,8 +40,6 @@ MODULE = ibdma OBJECTS = $(IBDMA_OBJS:%=$(OBJS_DIR)/%) LINTS = $(IBDMA_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) -WARLOCK_OUT = $(IBDMA_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok # # Include common rules. @@ -61,9 +59,9 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) ALL_BUILDS = $(ALL_BUILDSONLY64) DEF_BUILDS = $(DEF_BUILDSONLY64) -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) # @@ -88,10 +86,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -105,22 +101,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -warlock: $(WARLOCK_OK) - - -$(WARLOCK_OK): $(WARLOCK_OUT) - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/mgt/ibdma/%.c \ - $(UTSBASE)/common/sys/ib/mgt/ibdma/ibdma_impl.h \ - $(UTSBASE)/common/sys/ib/mgt/ibdma/ibdma.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< diff --git a/usr/src/uts/sparc/ibmf/Makefile b/usr/src/uts/sparc/ibmf/Makefile index b3c8dc854e..70413eda4f 100644 --- a/usr/src/uts/sparc/ibmf/Makefile +++ b/usr/src/uts/sparc/ibmf/Makefile @@ -42,9 +42,6 @@ OBJECTS = $(IBMF_OBJS:%=$(OBJS_DIR)/%) LINTS = $(IBMF_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) LDFLAGS += -dy -Nmisc/ibtl -WARLOCK_OUT = $(IBMF_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -66,9 +63,9 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) ALL_BUILDS = $(ALL_BUILDSONLY64) DEF_BUILDS = $(DEF_BUILDSONLY64) -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) # @@ -91,10 +88,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -108,27 +103,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock -TEST = test - -# -# Warlock targets -# -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files $(WLCMD_DIR)/ibmf.wlcmd - $(WARLOCK) -c $(WLCMD_DIR)/ibmf.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/mgt/ibmf/%.c - $(WLCC) $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/ibp/Makefile b/usr/src/uts/sparc/ibp/Makefile index 908fd36b5d..6017f36362 100644 --- a/usr/src/uts/sparc/ibp/Makefile +++ b/usr/src/uts/sparc/ibp/Makefile @@ -38,9 +38,7 @@ ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/ib/clients/ibd LDFLAGS += -dy -Nmisc/mac -Nmisc/ibtl -Nmisc/ibcm -Nmisc/ibmf -Ndrv/ip \ -Nmisc/dls -Ndrv/dld -WARLOCK_OUT = $(IBD_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock + # # Include common rules. # @@ -60,9 +58,9 @@ ALL_BUILDS = $(ALL_BUILDSONLY64) DEF_BUILDS = $(DEF_BUILDSONLY64) CLEANLINTFILES += $(LINT32_FILES) -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) # @@ -86,10 +84,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -103,25 +99,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -warlock: $(WARLOCK_OK) $(WARLOCK_OUT) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/ibd.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/ibd.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/clients/ibd/%.c \ - $(UTSBASE)/common/sys/ib/clients/ibd/ibd.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/ibtl/Makefile b/usr/src/uts/sparc/ibtl/Makefile index d096ba4aae..acbd0b110f 100644 --- a/usr/src/uts/sparc/ibtl/Makefile +++ b/usr/src/uts/sparc/ibtl/Makefile @@ -41,9 +41,6 @@ MODULE = ibtl OBJECTS = $(IBTL_OBJS:%=$(OBJS_DIR)/%) LINTS = $(IBTL_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) -WARLOCK_OUT = $(IBTL_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -94,10 +91,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -111,24 +106,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files $(WLCMD_DIR)/ibtl.wlcmd - $(WARLOCK) -c $(WLCMD_DIR)/ibtl.wlcmd $(WARLOCK_OUT) -l \ - ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/ibtl/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/mii/Makefile b/usr/src/uts/sparc/mii/Makefile index 620f0e1a9d..a853240a72 100644 --- a/usr/src/uts/sparc/mii/Makefile +++ b/usr/src/uts/sparc/mii/Makefile @@ -39,9 +39,6 @@ MODULE = mii OBJECTS = $(MII_OBJS:%=$(OBJS_DIR)/%) LINTS = $(MII_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) -WARLOCK_OUT = $(MII_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -70,10 +67,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) diff --git a/usr/src/uts/sparc/mpt_sas/Makefile b/usr/src/uts/sparc/mpt_sas/Makefile index 69bd3403b8..4f7414a794 100644 --- a/usr/src/uts/sparc/mpt_sas/Makefile +++ b/usr/src/uts/sparc/mpt_sas/Makefile @@ -39,12 +39,9 @@ OBJECTS = $(MPTSAS_OBJS:%=$(OBJS_DIR)/%) LINTS = $(MPTSAS_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/scsi/adapters/mpt_sas -WARLOCK_OUT = $(MPTSAS_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # -# Kernel Module Dependencies +# Kernel Module Dependencies # LDFLAGS += -dy -Nmisc/scsi -Ndrv/scsi_vhci -Nmisc/sata @@ -60,9 +57,9 @@ INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) # include $(UTSBASE)/sparc/Makefile.sparc -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-parentheses @@ -79,10 +76,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -96,36 +91,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -SCSI_FILES = $(SCSI_OBJS:%.o= -l $(UTSBASE)/sparc/scsi/%.ll) - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files scsi.files \ - $(WLCMD_DIR)/mptsas.wlcmd - $(WARLOCK) -c $(WLCMD_DIR)/mptsas.wlcmd $(WARLOCK_OUT) \ - $(UTSBASE)/sparc/warlock/scsi.ll \ - $(SCSI_FILES) \ - -l $(UTSBASE)/sparc/warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/scsi/adapters/mpt_sas/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd $(UTSBASE)/sparc/warlock; pwd; $(MAKE) warlock - -scsi.files: - @cd $(UTSBASE)/sparc/scsi; pwd; $(MAKE) warlock - diff --git a/usr/src/uts/sparc/nulldriver/Makefile b/usr/src/uts/sparc/nulldriver/Makefile index 8377da2f73..e49222c0a7 100644 --- a/usr/src/uts/sparc/nulldriver/Makefile +++ b/usr/src/uts/sparc/nulldriver/Makefile @@ -79,9 +79,6 @@ clobber: $(CLOBBER_DEPS) lint: $(LINT_DEPS) -warlock: - @echo warlock is not supported - modlintlib: $(MODLINTLIB_DEPS) clean.lint: $(CLEAN_LINT_DEPS) diff --git a/usr/src/uts/sparc/nv_sata/Makefile b/usr/src/uts/sparc/nv_sata/Makefile deleted file mode 100644 index 04791ed8c7..0000000000 --- a/usr/src/uts/sparc/nv_sata/Makefile +++ /dev/null @@ -1,140 +0,0 @@ -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -# -# -# Path to the base of the uts directory tree (usually /usr/src/uts). -# -UTSBASE = ../.. - -# -# Define the module and object file sets. -# -MODULE = nv_sata -OBJECTS = $(NV_SATA_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(NV_SATA_OBJS:%.o=$(LINTS_DIR)/%.ln) -WARLOCK_OUT = $(NV_SATA_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -CONF_SRCDIR = $(UTSBASE)/common/io/sata/adapters/nv_sata -WLCMD_DIR = $(UTSBASE)/common/io/warlock - -# -# Include common rules. -# -include $(UTSBASE)/sparc/Makefile.sparc - -# -# Define targets -# -ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint -INSTALL_TARGET = $(BINARY) $(ROOTMODULE) - -# -# Overrides. -# -DEBUG_FLGS = -DEBUG_DEFS += $(DEBUG_FLGS) - -# -# lint pass one enforcement -# -CFLAGS += $(CCVERBOSE) - -# -# Default build targets. -# -.KEEP_STATE: - -def: $(DEF_DEPS) - -all: $(ALL_DEPS) - -clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) - -clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) - -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - -install: $(INSTALL_DEPS) - -CERRWARN += -_gcc=-Wno-uninitialized - -# -# Include common targets. -# -include $(UTSBASE)/sparc/Makefile.targ - - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -SD_FILES = $(SD_OBJS:%.o=../sd/%.ll) -SATA_FILES = $(SATA_OBJS:%.o=-l ../sata/%.ll) -SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll) -CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll) - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WLCMD_DIR)/nv_sata.wlcmd $(WARLOCK_OUT) warlock_ddi.files \ - sata.files scsi.files sd.files cmlb.files - $(WARLOCK) -c $(WLCMD_DIR)/nv_sata.wlcmd $(WARLOCK_OUT) \ - $(SD_FILES) \ - $(SCSI_FILES) \ - $(CMLB_FILES) \ - $(SATA_FILES) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/sata/adapters/nv_sata/%.c - $(WLCC) $(CPPFLAGS) -D DEBUG -D __sparcv9 -o $@ $< - -sata.files: - @cd ../sata; pwd; $(MAKE) warlock - -scsi.files: - @cd ../scsi; pwd; $(MAKE) warlock - -sd.files: - @cd ../sd; pwd; $(MAKE) warlock_alone - -cmlb.files: - @cd ../cmlb; pwd; $(MAKE) warlock - - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/ohci/Makefile b/usr/src/uts/sparc/ohci/Makefile index a1afa2fa4e..2360e3480c 100644 --- a/usr/src/uts/sparc/ohci/Makefile +++ b/usr/src/uts/sparc/ohci/Makefile @@ -38,14 +38,11 @@ UTSBASE = ../.. # # Define the module and object file sets. # -MODULE = ohci +MODULE = ohci OBJECTS = $(OHCI_OBJS:%=$(OBJS_DIR)/%) LINTS = $(OHCI_OBJS:%.o=$(LINTS_DIR)/%.ln) -WARLOCK_OUT = $(OHCI_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/usb/hcd/openhci -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -55,7 +52,7 @@ include $(UTSBASE)/sparc/Makefile.sparc # # lint pass one enforcement # -CFLAGS += $(CCVERBOSE) +CFLAGS += $(CCVERBOSE) # # depends on misc/usba @@ -85,10 +82,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -102,34 +97,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -USBA_FILES = $(USBA_OBJS:%.o= -l ../usba/%.ll) - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/ohci.wlcmd warlock_ddi.files \ - usba.files - $(WARLOCK) -c $(WLCMD_DIR)/ohci.wlcmd $(WARLOCK_OUT) \ - $(USBA_FILES) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/hcd/openhci/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock - -usba.files: - @cd ../usba; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/pmcs/Makefile b/usr/src/uts/sparc/pmcs/Makefile index 4a963ee1f6..82414a28bf 100644 --- a/usr/src/uts/sparc/pmcs/Makefile +++ b/usr/src/uts/sparc/pmcs/Makefile @@ -39,9 +39,6 @@ OBJECTS = $(PMCS_OBJS:%=$(OBJS_DIR)/%) LINTS = $(PMCS_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/scsi/adapters/pmcs -WARLOCK_OUT = $(PMCS_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Kernel Module Dependencies diff --git a/usr/src/uts/sparc/rdsv3/Makefile b/usr/src/uts/sparc/rdsv3/Makefile index 53627981c0..ec1fa4ac0a 100644 --- a/usr/src/uts/sparc/rdsv3/Makefile +++ b/usr/src/uts/sparc/rdsv3/Makefile @@ -21,7 +21,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # -# This makefile drives the production of the rds driver +# This makefile drives the production of the rds driver # kernel module. # # sparc architecture dependent @@ -40,9 +40,6 @@ OBJECTS = $(RDSV3_OBJS:%=$(OBJS_DIR)/%) LINTS = $(RDSV3_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/ib/clients/rdsv3 -WARLOCK_OUT = $(RDSV3_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -114,36 +111,3 @@ $(ROOTLINK): $(ROOT_STRMOD_DIR) $(ROOTMODULE) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -warlock: $(WARLOCK_OK) $(WARLOCK_OUT) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/rdsv3.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/rdsv3.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/clients/rdsv3/%.c \ - $(UTSBASE)/common/sys/ib/clients/rdsv3/ib.h \ - $(UTSBASE)/common/sys/ib/clients/rdsv3/info.h \ - $(UTSBASE)/common/sys/ib/clients/rdsv3/loop.h \ - $(UTSBASE)/common/sys/ib/clients/rdsv3/rdma.h \ - $(UTSBASE)/common/sys/ib/clients/rdsv3/rdma_transport.h \ - $(UTSBASE)/common/sys/ib/clients/rdsv3/rds.h \ - $(UTSBASE)/common/sys/ib/clients/rdsv3/rds_rdma.h \ - $(UTSBASE)/common/sys/ib/clients/rdsv3/rdsv3_atomic.h \ - $(UTSBASE)/common/sys/ib/clients/rdsv3/rdsv3_debug.h \ - $(UTSBASE)/common/sys/ib/clients/rdsv3/rdsv3_impl.h \ - $(UTSBASE)/common/sys/ib/clients/rdsv3/rdsv3_ofed_types.h \ - $(UTSBASE)/common/sys/ib/clients/rdsv3/rdsv3_sc.h - $(WLCC) $(CPPFLAGS) -DDEBUG -Dinline= -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/s1394/Makefile b/usr/src/uts/sparc/s1394/Makefile index 5ac3270bd3..5122529ec5 100644 --- a/usr/src/uts/sparc/s1394/Makefile +++ b/usr/src/uts/sparc/s1394/Makefile @@ -43,8 +43,6 @@ MODULE = s1394 OBJECTS = $(S1394_OBJS:%=$(OBJS_DIR)/%) LINTS = $(S1394_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) -WARLOCK_OUT = $(S1394_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok # # Include common rules. @@ -100,10 +98,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -117,24 +113,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch - -# -# Warlock targets -# -warlock: $(MODULE).ok - -$(MODULE).ok: $(WARLOCK_OUT) warlock_ddi.files - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/1394/%.c - $(WLCC) $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock - diff --git a/usr/src/uts/sparc/sata/Makefile b/usr/src/uts/sparc/sata/Makefile deleted file mode 100644 index 7e805ca2f0..0000000000 --- a/usr/src/uts/sparc/sata/Makefile +++ /dev/null @@ -1,128 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -# -# uts/sparc/sata/Makefile -# -# This makefile drives the production of the sata "misc" -# kernel module. -# -# sparc architecture dependent -# - -# -# Path to the base of the uts directory tree (usually /usr/src/uts). -# -UTSBASE = ../.. - -# -# Define the module and object file sets. -# -MODULE = sata -OBJECTS = $(SATA_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(SATA_OBJS:%.o=$(LINTS_DIR)/%.ln) -WARLOCK_OUT = $(SATA_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) - -# -# Include common rules. -# -include $(UTSBASE)/sparc/Makefile.sparc - -# -# Define targets -# -ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint -INSTALL_TARGET = $(BINARY) $(ROOTMODULE) - -# -# Overrides. -# -DEBUG_FLGS = -DEBUG_DEFS += $(DEBUG_FLGS) - -# -# lint pass one enforcement -# -CFLAGS += $(CCVERBOSE) - -# -# Default build targets. -# -.KEEP_STATE: - -def: $(DEF_DEPS) - -all: $(ALL_DEPS) - -clean: $(CLEAN_DEPS); \ - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) - -clobber: $(CLOBBER_DEPS); \ - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) - -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - -install: $(INSTALL_DEPS) - -CERRWARN += -_gcc=-Wno-parentheses -CERRWARN += -_gcc=-Wno-unused-label -CERRWARN += -_gcc=-Wno-unused-function -CERRWARN += -_gcc=-Wno-unused-variable -CERRWARN += -_gcc=-Wno-uninitialized -CERRWARN += -_gcc=-Wno-empty-body - -# -# Include common targets. -# -include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock - -# -# Warlock targets -# - -SATA_FILES = $(SATA_OBJS:%.o=%.ll) - -warlock: $(MODULE).ok - -%.ok: $(SATA_FILES) - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/sata/impl/%.c - $(WLCC) $(CPPFLAGS) -D __sparcv9 -DDEBUG -o $@ $< diff --git a/usr/src/uts/sparc/sbp2/Makefile b/usr/src/uts/sparc/sbp2/Makefile index 05e8615c99..7d3db7b1d2 100644 --- a/usr/src/uts/sparc/sbp2/Makefile +++ b/usr/src/uts/sparc/sbp2/Makefile @@ -39,9 +39,6 @@ MODULE = sbp2 OBJECTS = $(SBP2_OBJS:%=$(OBJS_DIR)/%) LINTS = $(SBP2_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) -WARLOCK_OUT = $(SBP2_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -62,9 +59,9 @@ ALL_BUILDS = $(ALL_BUILDSONLY64) DEF_BUILDS = $(DEF_BUILDSONLY64) CLEANLINTFILES += $(LINT32_FILES) -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) # @@ -85,10 +82,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -102,25 +97,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock - -# -# Warlock -# -WARLOCK_CMD = $(WLCMD_DIR)/$(MODULE).wlcmd - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WARLOCK_CMD) - $(WARLOCK) -c $(WARLOCK_CMD) $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/sbp2/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< diff --git a/usr/src/uts/sparc/scsa1394/Makefile b/usr/src/uts/sparc/scsa1394/Makefile index 1c60c4c4da..f8f2543772 100644 --- a/usr/src/uts/sparc/scsa1394/Makefile +++ b/usr/src/uts/sparc/scsa1394/Makefile @@ -35,9 +35,6 @@ MODULE = scsa1394 OBJECTS = $(SCSA1394_OBJS:%=$(OBJS_DIR)/%) LINTS = $(SCSA1394_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WARLOCK_OUT = $(SCSA1394_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -92,10 +89,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) modlintlib: $(MODLINTLIB_DEPS) lint32 @@ -109,50 +104,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# Warlock targets -# -SBP2_FILES = $(SBP2_OBJS:%.o= -l ../sbp2/%.ll) -SD_FILES = $(SD_OBJS:%.o=../sd/%.ll) -SCSI_FILES = $(SCSI_OBJS:%.o= -l ../scsi/%.ll) -CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll) - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) sbp2.files warlock_ddi.files \ - $(WLCMD_DIR)/scsa1394.wlcmd sd.files scsi.files cmlb.files - $(WARLOCK) -c $(WLCMD_DIR)/scsa1394.wlcmd $(WARLOCK_OUT) $(SD_FILES) \ - $(SCSI_FILES) \ - $(CMLB_FILES) \ - $(SBP2_FILES) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/1394/targets/scsa1394/%.c - $(WLCC) $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $< - -sbp2.files: - @cd ../sbp2; pwd; $(MAKE) warlock - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock - -sd.files: - @cd ../sd; pwd; $(MAKE) warlock_alone - -scsi.files: - @cd ../scsi; pwd; $(MAKE) warlock - -cmlb.files: - @cd ../cmlb; pwd; $(MAKE) warlock - - diff --git a/usr/src/uts/sparc/scsa2usb/Makefile b/usr/src/uts/sparc/scsa2usb/Makefile index 3886f470ef..c122b2b7cb 100644 --- a/usr/src/uts/sparc/scsa2usb/Makefile +++ b/usr/src/uts/sparc/scsa2usb/Makefile @@ -44,18 +44,15 @@ OBJECTS = $(SCSA2USB_OBJS:%=$(OBJS_DIR)/%) LINTS = $(SCSA2USB_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/usb/scsa2usb -WARLOCK_OUT = $(SCSA2USB_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. # include $(UTSBASE)/sparc/Makefile.sparc -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) # depends on misc/usba misc/scsi @@ -86,10 +83,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -103,78 +98,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll) -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) -SD_FILES = $(SD_OBJS:%.o=../sd/%.ll) -ST_FILES = $(ST_OBJS:%.o=../st/%.ll) -SCSI_FILES = $(SCSI_OBJS:%.o= -l ../scsi/%.ll) -CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll) - -warlock: $(WARLOCK_OK) warlock_with_usba - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/scsa2usb.wlcmd warlock_ddi.files \ - scsi.files - $(WARLOCK) -c $(WLCMD_DIR)/scsa2usb.wlcmd $(WARLOCK_OUT) \ - ../warlock/scsi.ll \ - -l ../warlock/ddi_dki_impl.ll \ - $(SCSI_FILES) - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/scsa2usb/%.c \ - $(UTSBASE)/common/sys/usb/clients/mass_storage/usb_bulkonly.h \ - $(UTSBASE)/common/sys/usb/clients/mass_storage/usb_cbi.h \ - $(UTSBASE)/common/sys/usb/scsa2usb/scsa2usb.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_with_usba: $(WLCMD_DIR)/scsa2usb_with_usba.wlcmd $(WARLOCK_OUT) \ - usba_files ohci_files ehci_files uhci_files warlock_ddi.files sd.files \ - st.files scsi.files cmlb.files - $(WARLOCK) -c $(WLCMD_DIR)/scsa2usb_with_usba.wlcmd \ - $(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \ - $(SD_FILES) \ - $(ST_FILES) \ - $(SCSI_FILES) \ - $(CMLB_FILES) \ - $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - -usba_files: - @cd ../usba;pwd; $(MAKE) warlock - -uhci_files: - @cd ../uhci;pwd; $(MAKE) warlock - -ohci_files: - @cd ../ohci;pwd; $(MAKE) warlock - -ehci_files: - @cd ../ehci;pwd; $(MAKE) warlock - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock - -scsi.files: - @cd ../scsi; pwd; $(MAKE) warlock - -sd.files: - @cd ../sd; pwd; $(MAKE) warlock_alone - -cmlb.files: - @cd ../cmlb; pwd; $(MAKE) warlock - -st.files: - @cd ../st; pwd; $(MAKE) warlock_alone diff --git a/usr/src/uts/sparc/scsi/Makefile b/usr/src/uts/sparc/scsi/Makefile index f90607602f..54479da2f5 100644 --- a/usr/src/uts/sparc/scsi/Makefile +++ b/usr/src/uts/sparc/scsi/Makefile @@ -43,8 +43,6 @@ MODULE = scsi OBJECTS = $(SCSI_OBJS:%=$(OBJS_DIR)/%) LINTS = $(SCSI_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) -WARLOCK_OUT = $(SCSI_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok # # Include common rules. @@ -58,9 +56,9 @@ ALL_TARGET = $(BINARY) LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) # @@ -86,10 +84,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -103,23 +99,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch - -# -# Warlock targets -# -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/scsi/impl/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -%.ll: $(UTSBASE)/common/io/scsi/conf/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< diff --git a/usr/src/uts/sparc/sd/Makefile b/usr/src/uts/sparc/sd/Makefile index ea74399df4..e97a15f713 100644 --- a/usr/src/uts/sparc/sd/Makefile +++ b/usr/src/uts/sparc/sd/Makefile @@ -43,9 +43,6 @@ OBJECTS = $(SD_OBJS:%=$(OBJS_DIR)/%) LINTS = $(SD_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/sun/io/scsi/targets -WARLOCK_OUT = $(SD_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -59,9 +56,9 @@ ALL_TARGET = $(BINARY) $(SRC_CONFILE) LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) # @@ -89,10 +86,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -106,69 +101,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# Warlock targets -# -# Note that in warlock_with_{esp,isp} it is important to load sd.ll -# before {isp,esp}.ll; the reason is that both have _init/_info/_fini -# and warlock can only handle one extern function by a given name; -# any loaded after the first are ignored. - -SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll) -CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll) - -WARLOCK_TARGETS = warlock_alone warlock_with_esp warlock_with_fas - -warlock: $(WARLOCK_TARGETS) - -warlock_alone: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WLCMD_DIR)/sd.wlcmd $(WARLOCK_OUT) scsi_files \ - warlock_ddi.files cmlb_files - $(WARLOCK) -c $(WLCMD_DIR)/sd.wlcmd $(WARLOCK_OUT) $(SCSI_FILES) \ - $(CMLB_FILES) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/scsi/targets/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_with_esp: $(WLCMD_DIR)/sd_with_esp.wlcmd $(WARLOCK_OUT) scsi_files \ - esp_files warlock_ddi.files cmlb_files - $(WARLOCK) -c $(WLCMD_DIR)/sd_with_esp.wlcmd \ - $(WARLOCK_OUT) ../esp/esp $(SCSI_FILES) $(CMLB_FILES) \ - -l ../warlock/ddi_dki_impl.ll - -warlock_with_fas: $(WLCMD_DIR)/sd_with_fas.wlcmd $(WARLOCK_OUT) scsi_files \ - fas_files warlock_ddi.files cmlb_files - $(WARLOCK) -c $(WLCMD_DIR)/sd_with_fas.wlcmd \ - $(WARLOCK_OUT) ../fas/fas \ - ../fas/fas_callbacks \ - $(SCSI_FILES) $(CMLB_FILES) \ - -l ../warlock/ddi_dki_impl.ll - -cmlb_files: - @cd ../cmlb; pwd; $(MAKE) warlock - - -scsi_files: - @cd ../scsi; pwd; $(MAKE) warlock - -esp_files: - @cd ../esp; pwd; $(MAKE) warlock - -fas_files: - @cd ../fas; pwd; $(MAKE) warlock - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/ses/Makefile b/usr/src/uts/sparc/ses/Makefile index edc95a7b3b..73e29f288d 100644 --- a/usr/src/uts/sparc/ses/Makefile +++ b/usr/src/uts/sparc/ses/Makefile @@ -43,9 +43,6 @@ OBJECTS = $(SES_OBJS:%=$(OBJS_DIR)/%) LINTS = $(SES_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/sun/io/scsi/targets -WARLOCK_OUT = $(SES_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -58,7 +55,6 @@ include $(UTSBASE)/sparc/Makefile.sparc ALL_TARGET = $(BINARY) $(SRC_CONFILE) LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) -CLEANFILES += $(WARLOCK_TARGETS) # # Define dependency on scsi @@ -84,10 +80,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) modlintlib: $(MODLINTLIB_DEPS) lint64 @@ -99,58 +93,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# Warlock targets -# -# XXX FIX ME. this can be improved quite a bit - -SES_FILES = $(MODULE).ll -SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll) - -WARLOCK_TARGETS = $(WARLOCK_OK) warlock_with_esp.ok warlock_with_fas.ok - -warlock: $(WARLOCK_TARGETS) - -$(WARLOCK_OK): $(WLCMD_DIR)/$(MODULE).wlcmd $(SES_FILES) - @cd ../warlock; $(MAKE) warlock - @cd ../scsi; $(MAKE) warlock - $(WARLOCK) -c $(WLCMD_DIR)/$(MODULE).wlcmd $(SES_FILES) ../warlock/scsi.ll \ - -l ../warlock/ddi_dki_impl.ll \ - $(SCSI_FILES) - @ $(TOUCH) $@ - -warlock_with_esp.ok: $(WLCMD_DIR)/ses_with_esp.wlcmd $(SES_FILES) - @cd ../warlock; $(MAKE) warlock - @cd ../scsi; $(MAKE) warlock - @cd ../esp; $(MAKE) warlock; - $(WARLOCK) -c $(WLCMD_DIR)/ses_with_esp.wlcmd $(SES_FILES) ../esp/esp \ - ../warlock/scsi.ll \ - -l ../warlock/ddi_dki_impl.ll \ - $(SCSI_FILES) - @ $(TOUCH) $@ - -warlock_with_fas.ok: $(WLCMD_DIR)/ses_with_fas.wlcmd $(SES_FILES) - @cd ../warlock; $(MAKE) warlock - @cd ../scsi; $(MAKE) warlock - @cd ../fas; $(MAKE) warlock; - $(WARLOCK) -c $(WLCMD_DIR)/ses_with_fas.wlcmd $(SES_FILES) \ - ../fas/fas ../fas/fas_callbacks \ - ../warlock/scsi.ll \ - -l ../warlock/ddi_dki_impl.ll \ - $(SCSI_FILES) - @ $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/scsi/targets/%.c - $(WLCC) $(CPPFLAGS) -o $@ $< - - diff --git a/usr/src/uts/sparc/si3124/Makefile b/usr/src/uts/sparc/si3124/Makefile deleted file mode 100644 index 482a4b1781..0000000000 --- a/usr/src/uts/sparc/si3124/Makefile +++ /dev/null @@ -1,147 +0,0 @@ -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -# -# uts/sparc/si3124/Makefile -# -# This makefile drives the production of the -# "platform/i86pc/kernel/drv/si3124" kernel module. -# -# sparc architecture dependent -# - -# -# Path to the base of the uts directory tree (usually /usr/src/uts). -# -UTSBASE = ../.. - -# -# Define the module and object file sets. -# -MODULE = si3124 -OBJECTS = $(SI3124_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(SI3124_OBJS:%.o=$(LINTS_DIR)/%.ln) -WARLOCK_OUT = $(SI3124_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -CONF_SRCDIR = $(UTSBASE)/common/io/sata/adapters/si3124 -WLCMD_DIR = $(UTSBASE)/common/io/warlock - -# -# Include common rules. -# -include $(UTSBASE)/sparc/Makefile.sparc - -# -# Define targets -# -ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint -INSTALL_TARGET = $(BINARY) $(ROOTMODULE) - -# -# Overrides. -# -DEBUG_FLGS = -DEBUG_DEFS += $(DEBUG_FLGS) - -CERRWARN += -_gcc=-Wno-uninitialized - -# -# lint pass one enforcement -# -CFLAGS += $(CCVERBOSE) - -# -# Default build targets. -# -.KEEP_STATE: - -def: $(DEF_DEPS) - -all: $(ALL_DEPS) - -clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) - -clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) - -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - -install: $(INSTALL_DEPS) - -# -# Include common targets. -# -include $(UTSBASE)/sparc/Makefile.targ - - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -SD_FILES = $(SD_OBJS:%.o=../sd/%.ll) -SATA_FILES = $(SATA_OBJS:%.o=-l ../sata/%.ll) -SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll) -CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll) - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WLCMD_DIR)/si3124.wlcmd $(WARLOCK_OUT) warlock_ddi.files \ - sata.files scsi.files sd.files cmlb.files - $(WARLOCK) -c $(WLCMD_DIR)/si3124.wlcmd $(WARLOCK_OUT) \ - $(SD_FILES) \ - $(SCSI_FILES) \ - $(CMLB_FILES) \ - $(SATA_FILES) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/sata/adapters/si3124/%.c - $(WLCC) $(CPPFLAGS) -D DEBUG -D __sparcv9 -o $@ $< - -sata.files: - @cd ../sata; pwd; $(MAKE) warlock - -scsi.files: - @cd ../scsi; pwd; $(MAKE) warlock - -sd.files: - @cd ../sd; pwd; $(MAKE) warlock_alone - -cmlb.files: - @cd ../cmlb; pwd; $(MAKE) warlock - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/sol_ofs/Makefile b/usr/src/uts/sparc/sol_ofs/Makefile index 5f8ebb6a6e..31d0f9ca94 100644 --- a/usr/src/uts/sparc/sol_ofs/Makefile +++ b/usr/src/uts/sparc/sol_ofs/Makefile @@ -36,9 +36,7 @@ OBJECTS = $(SOL_OFS_OBJS:%=$(OBJS_DIR)/%) LINTS = $(SOL_OFS_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) LDFLAGS += -dy -Nmisc/ibtl -Nmisc/ibcm -WARLOCK_OUT = $(SOL_OFS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock + # # Include common rules. # @@ -76,10 +74,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -93,25 +89,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/sol_ofs.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/sol_ofs.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/clients/of/sol_ofs/%.c \ - $(UTSBASE)/common/sys/ib/clients/of/sol_ofs/sol_uverbs.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/sol_ucma/Makefile b/usr/src/uts/sparc/sol_ucma/Makefile index 9a9cbae186..d263e60262 100644 --- a/usr/src/uts/sparc/sol_ucma/Makefile +++ b/usr/src/uts/sparc/sol_ucma/Makefile @@ -37,9 +37,7 @@ LINTS = $(SOL_UCMA_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) LDFLAGS += -dy -Nmisc/sol_ofs CONF_SRCDIR = $(UTSBASE)/common/io/ib/clients/of/sol_ucma -WARLOCK_OUT = $(SOL_UCMA:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock + # # Include common rules. # @@ -76,10 +74,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -93,25 +89,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/sol_ucma.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/sol_ucma.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/clients/of/sol_ucma/%.c \ - $(UTSBASE)/common/sys/ib/clients/of/sol_ucma/sol_ucma.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/sol_uverbs/Makefile b/usr/src/uts/sparc/sol_uverbs/Makefile index ed3626eb42..67ea35fb18 100644 --- a/usr/src/uts/sparc/sol_uverbs/Makefile +++ b/usr/src/uts/sparc/sol_uverbs/Makefile @@ -37,9 +37,7 @@ LINTS = $(SOL_UVERBS_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) LDFLAGS += -dy -Nmisc/ibtl -Nmisc/sol_ofs CONF_SRCDIR = $(UTSBASE)/common/io/ib/clients/of/sol_uverbs -WARLOCK_OUT = $(SOL_UVERBS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock + # # Include common rules. # @@ -76,10 +74,8 @@ def: $(DEF_DEPS) all: $(ALL_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -93,25 +89,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/sol_uverbs.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/sol_uverbs.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/clients/of/sol_uverbs/%.c \ - $(UTSBASE)/common/sys/ib/clients/of/sol_uverbs/sol_uverbs.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/ssd/Makefile b/usr/src/uts/sparc/ssd/Makefile index d73bd3a5b3..47159b3ba3 100644 --- a/usr/src/uts/sparc/ssd/Makefile +++ b/usr/src/uts/sparc/ssd/Makefile @@ -45,9 +45,6 @@ OBJECTS = $(SSD_OBJS:%=$(OBJS_DIR)/%) LINTS = $(SSD_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/sun/io/scsi/targets -WARLOCK_OUT = ssd.ll -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -61,9 +58,9 @@ ALL_TARGET = $(BINARY) $(SRC_CONFILE) LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) -D__fibre -dalign LINTFLAGS += -D__fibre WLCCFLAGS = -D__fibre @@ -100,10 +97,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -117,46 +112,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -browser: $(BINARY) - -browser := CFLAGS += -xsb - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# Warlock targets - -SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll) -CMLB_FILES = $(CMLB_OBJS:%.o=-l ../cmlb/%.ll) - -warlock: warlock_alone - -warlock_alone: $(WARLOCK_OK) - -scsi_files: - @cd ../scsi; pwd; $(MAKE) warlock - -cmlb_files: - @cd ../cmlb; pwd; $(MAKE) warlock - -$(WARLOCK_OK): $(WLCMD_DIR)/ssd.wlcmd $(WARLOCK_OUT) scsi.files cmlb_files - $(WARLOCK) -c $(WLCMD_DIR)/ssd.wlcmd $(WARLOCK_OUT) \ - $(SCSI_FILES) $(CMLB_FILES) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -ssd.ll: $(UTSBASE)/common/io/scsi/targets/sd.c - $(WLCC) $(CPPFLAGS) $(WLCCFLAGS) -DDEBUG -o $@ $(UTSBASE)/common/io/scsi/targets/sd.c - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock - -scsi.files: - @cd ../scsi; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/st/Makefile b/usr/src/uts/sparc/st/Makefile index 03140e9e18..21f51215d6 100644 --- a/usr/src/uts/sparc/st/Makefile +++ b/usr/src/uts/sparc/st/Makefile @@ -42,9 +42,6 @@ OBJECTS = $(ST_OBJS:%=$(OBJS_DIR)/%) LINTS = $(ST_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/sun/io/scsi/targets -WARLOCK_OUT = $(ST_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -58,9 +55,9 @@ ALL_TARGET = $(BINARY) $(SRC_CONFILE) LINT_TARGET = $(MODULE).lint INSTALL_TARGET = $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) # @@ -91,10 +88,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -107,64 +102,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# Warlock targets -# -# Note that in warlock_with_{esp,isp} it is important to load st.ll -# before {isp,esp}.ll; the reason is that both have _init/_info/_fini -# and warlock can only handle one extern function by a given name; -# any loaded after the first are ignored. - -SCSI_FILES = $(SCSI_OBJS:%.o=-l ../scsi/%.ll) - -WARLOCK_TARGETS = warlock_alone warlock_with_esp warlock_with_fas - -warlock: $(WARLOCK_TARGETS) - -warlock_alone: $(WARLOCK_OK) - -warlock_with_esp: $(WLCMD_DIR)/st_with_esp.wlcmd $(WARLOCK_OUT) scsi_files \ - esp_files warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/st_with_esp.wlcmd \ - $(WARLOCK_OUT) ../esp/esp $(SCSI_FILES) \ - -l ../warlock/ddi_dki_impl.ll - -warlock_with_fas: $(WLCMD_DIR)/st_with_fas.wlcmd $(WARLOCK_OUT) scsi_files \ - fas_files warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/st_with_fas.wlcmd \ - $(WARLOCK_OUT) \ - ../fas/fas ../fas/fas_callbacks \ - $(SCSI_FILES) \ - -l ../warlock/ddi_dki_impl.ll - -scsi_files: - @cd ../scsi; pwd; $(MAKE) warlock - -esp_files: - @cd ../esp; pwd; $(MAKE) warlock - -fas_files: - @cd ../fas; pwd; $(MAKE) warlock - -st.ok: $(WLCMD_DIR)/st.wlcmd st.ll st_conf.ll scsi_files warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/st.wlcmd $(WARLOCK_OUT) $(SCSI_FILES) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/scsi/targets/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock - -scsi.files: - @cd ../scsi; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/tavor/Makefile b/usr/src/uts/sparc/tavor/Makefile index 8f03fa6db4..7bd88686ea 100644 --- a/usr/src/uts/sparc/tavor/Makefile +++ b/usr/src/uts/sparc/tavor/Makefile @@ -42,9 +42,6 @@ LINTS = $(TAVOR_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/ib/adapters/tavor LDFLAGS += -dy -Ndrv/ib -Nmisc/ibtl -Nmisc/ibmf -WARLOCK_OUT = $(TAVOR_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -71,9 +68,9 @@ CLEANLINTFILES += $(LINT32_FILES) #DEBUG_DEFS_DBG32 += -DTNF_DEBUG #DEBUG_DEFS_DBG64 += -DTNF_DEBUG -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) # @@ -102,10 +99,8 @@ all: $(ALL_DEPS) lint: $(LINT_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) modlintlib: $(MODLINTLIB_DEPS) lint32 @@ -117,27 +112,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock -TEST = test - -# -# Warlock targets -# -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files $(WLCMD_DIR)/tavor.wlcmd - $(WARLOCK) -c $(WLCMD_DIR)/tavor.wlcmd $(WARLOCK_OUT) \ - -l $(UTSBASE)/sparc/warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/ib/adapters/tavor/%.c - $(WLCC) $(CPPFLAGS) -DNPROBE -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd $(UTSBASE)/sparc/warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/tem/Makefile b/usr/src/uts/sparc/tem/Makefile index 838a4a6a00..1a9dcb12e1 100644 --- a/usr/src/uts/sparc/tem/Makefile +++ b/usr/src/uts/sparc/tem/Makefile @@ -44,9 +44,6 @@ OBJECTS = $(TEM_OBJS:%=$(OBJS_DIR)/%) $(FONT_OBJS:%=$(OBJS_DIR)/%) LINTS = $(TEM_OBJS:%.o=$(LINTS_DIR)/%.ln) LINTS += $(FONT_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) -WARLOCK_OUT = $(TEM_OBJS:%.o=%.ll) $(FONT_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -103,26 +100,3 @@ include $(UTSBASE)/sparc/Makefile.targ CLOBBERFILES += \ $(OBJS_DIR)/$(VGATEXT_FONT).o \ $(OBJS_DIR)/$(VGATEXT_FONT).c - -# -# Defines for local commands -# -TEST = test -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock - -# -# warlock targets -# - -warlock: $(WARLOCK_OUT) warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/tem.wlcmd $(WARLOCK_OUT) \ - -l ../../sparc/warlock/ddi_dki_impl.ll - $(TOUCH) $(WARLOCK_OK) - -%.ll: $(UTSBASE)/common/io/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../../sparc/warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/ugen/Makefile b/usr/src/uts/sparc/ugen/Makefile index f8988fea49..3b494749cc 100644 --- a/usr/src/uts/sparc/ugen/Makefile +++ b/usr/src/uts/sparc/ugen/Makefile @@ -43,18 +43,15 @@ MODULE = ugen OBJECTS = $(UGEN_OBJS:%=$(OBJS_DIR)/%) LINTS = $(UGEN_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WARLOCK_OUT = $(UGEN_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. # include $(UTSBASE)/sparc/Makefile.sparc -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-uninitialized @@ -77,10 +74,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -94,54 +89,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll) -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) - -warlock: $(WARLOCK_OK) warlock_with_usba - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/ugen.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/ugen.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/clients/ugen/%.c \ - $(UTSBASE)/common/sys/usb/clients/ugen/ugend.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - - -warlock_with_usba: $(WLCMD_DIR)/ugen_with_usba.wlcmd $(WARLOCK_OUT) \ - usba_files ohci_files ehci_files uhci_files warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/ugen_with_usba.wlcmd \ - $(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \ - $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - -usba_files: - @cd ../usba;pwd; $(MAKE) warlock - -uhci_files: - @cd ../uhci;pwd; $(MAKE) warlock - -ohci_files: - @cd ../ohci;pwd; $(MAKE) warlock - -ehci_files: - @cd ../ehci;pwd; $(MAKE) warlock - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock - diff --git a/usr/src/uts/sparc/uhci/Makefile b/usr/src/uts/sparc/uhci/Makefile index ebc994f8cb..efd8d429f8 100644 --- a/usr/src/uts/sparc/uhci/Makefile +++ b/usr/src/uts/sparc/uhci/Makefile @@ -38,14 +38,11 @@ UTSBASE = ../.. # # Define the module and object file sets. # -MODULE = uhci +MODULE = uhci OBJECTS = $(UHCI_OBJS:%=$(OBJS_DIR)/%) LINTS = $(UHCI_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/usb/hcd/uhci -WARLOCK_OUT = $(UHCI_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -55,7 +52,7 @@ include $(UTSBASE)/sparc/Makefile.sparc # # lint pass one enforcement # -CFLAGS += $(CCVERBOSE) +CFLAGS += $(CCVERBOSE) # # depends on misc/usba @@ -85,10 +82,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -102,34 +97,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -USBA_FILES = $(USBA_OBJS:%.o= -l ../usba/%.ll) - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/uhci.wlcmd warlock_ddi.files \ - usba.files - $(WARLOCK) -c $(WLCMD_DIR)/uhci.wlcmd $(WARLOCK_OUT) \ - $(USBA_FILES) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/hcd/uhci/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock - -usba.files: - @cd ../usba; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/usb_ac/Makefile b/usr/src/uts/sparc/usb_ac/Makefile index 3aee852b0e..1cb5902777 100644 --- a/usr/src/uts/sparc/usb_ac/Makefile +++ b/usr/src/uts/sparc/usb_ac/Makefile @@ -42,9 +42,6 @@ OBJECTS = $(USB_AC_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USB_AC_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/usb/clients/audio/usb_ac -WARLOCK_OUT = $(USB_AC_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -85,10 +82,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -102,59 +97,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll) -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) - - -# -# Warlock targets -# -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files \ - warlock_standalone warlock_usba.files warlock_with_usba - $(TOUCH) $(WARLOCK_OK) - - -warlock_with_usba: $(WLCMD_DIR)/usb_ac_with_usba.wlcmd $(WARLOCK_OUT) \ - warlock_ddi.files warlock_usba.files warlock_ohci.files \ - warlock_ehci.files warlock_uhci.files - $(WARLOCK) -c $(WLCMD_DIR)/usb_ac_with_usba.wlcmd \ - $(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \ - $(WARLOCK_OUT) -l ../warlock/ddi_dki_impl.ll - -warlock_standalone: $(WARLOCK_OUT) warlock_ddi.files $(WLCMD_DIR)/usb_ac.wlcmd - $(WARLOCK) -c $(WLCMD_DIR)/usb_ac.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - -%.ll: $(UTSBASE)/common/io/usb/clients/audio/usb_ac/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_usba.files: - @cd ../usba;pwd; $(MAKE) warlock - -warlock_ohci.files: - @cd ../ohci;pwd; $(MAKE) warlock - -warlock_uhci.files: - @cd ../uhci;pwd; $(MAKE) warlock - -warlock_ehci.files: - @cd ../ehci;pwd; $(MAKE) warlock - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/usb_ah/Makefile b/usr/src/uts/sparc/usb_ah/Makefile index ac5e14c875..d01c42d896 100644 --- a/usr/src/uts/sparc/usb_ah/Makefile +++ b/usr/src/uts/sparc/usb_ah/Makefile @@ -41,18 +41,15 @@ MODULE = usb_ah OBJECTS = $(USB_AH_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USB_AH_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_STRMOD_DIR)/$(MODULE) -WARLOCK_OUT = $(USB_AH_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. # include $(UTSBASE)/sparc/Makefile.sparc -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) # @@ -83,10 +80,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -100,29 +95,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/usb_ah.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usb_ah.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/clients/audio/usb_ah/%.c \ - $(UTSBASE)/common/sys/usb/clients/audio/usb_ah/usb_ah.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock - diff --git a/usr/src/uts/sparc/usb_as/Makefile b/usr/src/uts/sparc/usb_as/Makefile index 4261e3a0ea..75b280aea7 100644 --- a/usr/src/uts/sparc/usb_as/Makefile +++ b/usr/src/uts/sparc/usb_as/Makefile @@ -43,18 +43,15 @@ MODULE = usb_as OBJECTS = $(USB_AS_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USB_AS_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WARLOCK_OUT = $(USB_AS_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. # include $(UTSBASE)/sparc/Makefile.sparc -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) # @@ -83,10 +80,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -100,60 +95,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll) -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) - - -# -# Warlock targets -# -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) warlock_ddi.files \ - warlock_standalone warlock_usba.files warlock_with_usba - $(TOUCH) $(WARLOCK_OK) - - -warlock_with_usba: $(WLCMD_DIR)/usb_as_with_usba.wlcmd $(WARLOCK_OUT) \ - warlock_ddi.files warlock_ohci.files warlock_usba.files \ - warlock_ehci.files warlock_uhci.files - $(WARLOCK) -c $(WLCMD_DIR)/usb_as_with_usba.wlcmd \ - $(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \ - $(WARLOCK_OUT) -l ../warlock/ddi_dki_impl.ll - -warlock_standalone: $(WARLOCK_OUT) warlock_ddi.files $(WLCMD_DIR)/usb_as.wlcmd - $(WARLOCK) -c $(WLCMD_DIR)/usb_as.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - -%.ll: $(UTSBASE)/common/io/usb/clients/audio/usb_as/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - - -warlock_usba.files: - @cd ../usba;pwd; $(MAKE) warlock - -warlock_ohci.files: - @cd ../ohci;pwd; $(MAKE) warlock - -warlock_uhci.files: - @cd ../uhci;pwd; $(MAKE) warlock - -warlock_ehci.files: - @cd ../ehci;pwd; $(MAKE) warlock - -warlock_ddi.files: - @cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/usb_ia/Makefile b/usr/src/uts/sparc/usb_ia/Makefile index 2d39cf236d..bbb641d95f 100644 --- a/usr/src/uts/sparc/usb_ia/Makefile +++ b/usr/src/uts/sparc/usb_ia/Makefile @@ -43,18 +43,15 @@ MODULE = usb_ia OBJECTS = $(USB_IA_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USB_IA_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WARLOCK_OUT = $(USB_IA_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. # include $(UTSBASE)/sparc/Makefile.sparc -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) # @@ -76,10 +73,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -93,53 +88,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll) -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) - -warlock: $(WARLOCK_OK) warlock_with_usba - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/usb_ia.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usb_ia.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/usb_ia/%.c \ - $(UTSBASE)/common/sys/usb/usb_ia/usb_iavar.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_with_usba: $(WLCMD_DIR)/usb_ia_with_usba.wlcmd $(WARLOCK_OUT) \ - usba_files ohci_files ehci_files uhci_files warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usb_ia_with_usba.wlcmd \ - $(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \ - $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - - -usba_files: - @cd ../usba;pwd; $(MAKE) warlock - -uhci_files: - @cd ../uhci;pwd; $(MAKE) warlock - -ohci_files: - @cd ../ohci;pwd; $(MAKE) warlock - -ehci_files: - @cd ../ehci;pwd; $(MAKE) warlock - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/usb_mid/Makefile b/usr/src/uts/sparc/usb_mid/Makefile index 954e558785..a1b63e810d 100644 --- a/usr/src/uts/sparc/usb_mid/Makefile +++ b/usr/src/uts/sparc/usb_mid/Makefile @@ -43,18 +43,15 @@ MODULE = usb_mid OBJECTS = $(USB_MID_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USB_MID_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WARLOCK_OUT = $(USB_MID_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. # include $(UTSBASE)/sparc/Makefile.sparc -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) # @@ -76,10 +73,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -93,52 +88,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll) -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) - -warlock: $(WARLOCK_OK) warlock_with_usba - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/usb_mid.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usb_mid.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/usb_mid/%.c \ - $(UTSBASE)/common/sys/usb/usb_mid/usb_midvar.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_with_usba: $(WLCMD_DIR)/usb_mid_with_usba.wlcmd $(WARLOCK_OUT) \ - usba_files ohci_files ehci_files uhci_files warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usb_mid_with_usba.wlcmd \ - $(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \ - $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - -usba_files: - @cd ../usba;pwd; $(MAKE) warlock - -uhci_files: - @cd ../uhci;pwd; $(MAKE) warlock - -ohci_files: - @cd ../ohci;pwd; $(MAKE) warlock - -ehci_files: - @cd ../ehci;pwd; $(MAKE) warlock - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/usba/Makefile b/usr/src/uts/sparc/usba/Makefile index 044e1a3067..e90778e3ac 100644 --- a/usr/src/uts/sparc/usba/Makefile +++ b/usr/src/uts/sparc/usba/Makefile @@ -39,8 +39,6 @@ UTSBASE = ../.. MODULE = usba OBJECTS = $(USBA_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USBA_OBJS:%.o=$(LINTS_DIR)/%.ln) -WARLOCK_OUT = $(USBA_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) # @@ -48,9 +46,9 @@ ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) # include $(UTSBASE)/sparc/Makefile.sparc -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-uninitialized @@ -73,11 +71,9 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) -clean: $(CLEAN_DEPS); \ - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) +clean: $(CLEAN_DEPS) -clobber: $(CLOBBER_DEPS); \ - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) +clobber: $(CLOBBER_DEPS) lint: $(LINT_DEPS) @@ -91,24 +87,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock - -# -# Warlock targets -# - -USBA_FILES = $(USBA_OBJS:%.o=%.ll) - -warlock: $(MODULE).ok - -%.ok: $(USBA_FILES) - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/usba/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< diff --git a/usr/src/uts/sparc/usbecm/Makefile b/usr/src/uts/sparc/usbecm/Makefile index 4762360a0a..e4bfdcb03f 100644 --- a/usr/src/uts/sparc/usbecm/Makefile +++ b/usr/src/uts/sparc/usbecm/Makefile @@ -39,9 +39,6 @@ MODULE = usbecm OBJECTS = $(USBECM_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USBECM_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WARLOCK_OUT = $(USBECM_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -69,10 +66,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -86,52 +81,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock -TEST = test - -# -# warlock -# -WARLOCK_CMD = $(WLCMD_DIR)/$(MODULE).wlcmd - -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) - -warlock: $(WARLOCK_OK) warlock_with_usba - -%.ll: $(UTSBASE)/common/io/usb/clients/usbecm/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/usbecm.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usbecm.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -warlock_with_usba: $(WLCMD_DIR)/usbecm_with_usba.wlcmd $(WARLOCK_OUT) \ - usba_files ohci_files uhci_files ehci_files \ - warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usbecm_with_usba.wlcmd \ - $(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \ - $(WARLOCK_OUT) -l ../warlock/ddi_dki_impl.ll - -usba_files: - @cd ../usba;pwd; $(MAKE) warlock - -uhci_files: - @cd ../uhci;pwd; $(MAKE) warlock - -ohci_files: - @cd ../ohci;pwd; $(MAKE) warlock - -ehci_files: - @cd ../ehci;pwd; $(MAKE) warlock - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/usbftdi/Makefile b/usr/src/uts/sparc/usbftdi/Makefile index 54b0fcc5b9..8a7e1b41d9 100644 --- a/usr/src/uts/sparc/usbftdi/Makefile +++ b/usr/src/uts/sparc/usbftdi/Makefile @@ -38,11 +38,8 @@ UTSBASE = ../.. MODULE = usbftdi OBJECTS = $(USBFTDI_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USBFTDI_OBJS:%.o=$(LINTS_DIR)/%.ln) -WARLOCK_OUT = $(USBFTDI_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/usb/clients/usbser/usbftdi -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -67,10 +64,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -84,60 +79,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock -TEST = test - -# -# warlock -# -WARLOCK_CMD = $(WLCMD_DIR)/$(MODULE).wlcmd -USBSER_FILES = $(USBSER_OBJS:%.o=../usbser/%.ll) -USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll) -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): warlock_with_usba warlock_with_usbser - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/clients/usbser/usbftdi/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_with_usbser: $(WARLOCK_OUT) usbser_files warlock_ddi.files \ - $(WARLOCK_CMD) - $(WARLOCK) -c $(WARLOCK_CMD) $(WARLOCK_OUT) \ - $(USBSER_FILES) -l ../warlock/ddi_dki_impl.ll - -warlock_with_usba: $(WARLOCK_OUT) usbser_files \ - $(WLCMD_DIR)/usbftdi_with_usba.wlcmd usba_files ohci_files uhci_files \ - ehci_files warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usbftdi_with_usba.wlcmd \ - $(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \ - $(USBSER_FILES) \ - $(WARLOCK_OUT) -l ../warlock/ddi_dki_impl.ll - -usbser_files: - @cd ../usbser; pwd; $(MAKE) warlock - -usba_files: - @cd ../usba;pwd; $(MAKE) warlock - -uhci_files: - @cd ../uhci;pwd; $(MAKE) warlock - -ohci_files: - @cd ../ohci;pwd; $(MAKE) warlock - -ehci_files: - @cd ../ehci;pwd; $(MAKE) warlock - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/usbprn/Makefile b/usr/src/uts/sparc/usbprn/Makefile index 0fa8ce7e0c..8a797f86b8 100644 --- a/usr/src/uts/sparc/usbprn/Makefile +++ b/usr/src/uts/sparc/usbprn/Makefile @@ -41,18 +41,15 @@ MODULE = usbprn OBJECTS = $(USBPRN_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USBPRN_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WARLOCK_OUT = $(USBPRN_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. # include $(UTSBASE)/sparc/Makefile.sparc -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) # @@ -73,10 +70,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -90,52 +85,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll) -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) - -warlock: $(WARLOCK_OK) warlock_with_usba - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/usbprn.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usbprn.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/clients/printer/%.c \ - $(UTSBASE)/common/sys/usb/clients/printer/usbprn.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_with_usba: $(WLCMD_DIR)/usbprn_with_usba.wlcmd $(WARLOCK_OUT) \ - usba_files ohci_files ehci_files uhci_files warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usbprn_with_usba.wlcmd \ - $(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \ - $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - -usba_files: - @cd ../usba;pwd; $(MAKE) warlock - -ohci_files: - @cd ../ohci;pwd; $(MAKE) warlock - -uhci_files: - @cd ../uhci;pwd; $(MAKE) warlock - -ehci_files: - @cd ../ehci;pwd; $(MAKE) warlock - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/usbsacm/Makefile b/usr/src/uts/sparc/usbsacm/Makefile index 9c569539ce..3805e59c8b 100644 --- a/usr/src/uts/sparc/usbsacm/Makefile +++ b/usr/src/uts/sparc/usbsacm/Makefile @@ -39,18 +39,15 @@ MODULE = usbsacm OBJECTS = $(USBSACM_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USBSACM_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WARLOCK_OUT = $(USBSACM_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. # include $(UTSBASE)/sparc/Makefile.sparc -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) LDFLAGS += -dy -Nmisc/usba -Nmisc/usbser @@ -71,10 +68,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -88,61 +83,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock -TEST = test - -# -# warlock -# -WARLOCK_CMD = $(WLCMD_DIR)/$(MODULE).wlcmd - -USBSER_FILES = $(USBSER_OBJS:%.o=../usbser/%.ll) -USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll) -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): warlock_with_usbser warlock_with_usba - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/clients/usbser/usbsacm/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_with_usbser: $(WARLOCK_OUT) usbser_files warlock_ddi.files \ - $(WARLOCK_CMD) - $(WARLOCK) -c $(WARLOCK_CMD) $(WARLOCK_OUT) \ - $(USBSER_FILES) -l ../warlock/ddi_dki_impl.ll - -warlock_with_usba: $(WLCMD_DIR)/usbsacm_with_usba.wlcmd $(WARLOCK_OUT) \ - usbser_files usba_files ohci_files uhci_files ehci_files \ - warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usbsacm_with_usba.wlcmd \ - $(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \ - $(USBSER_FILES) \ - $(WARLOCK_OUT) -l ../warlock/ddi_dki_impl.ll - -usbser_files: - @cd ../usbser; pwd; $(MAKE) warlock - -usba_files: - @cd ../usba;pwd; $(MAKE) warlock - -uhci_files: - @cd ../uhci;pwd; $(MAKE) warlock - -ohci_files: - @cd ../ohci;pwd; $(MAKE) warlock - -ehci_files: - @cd ../ehci;pwd; $(MAKE) warlock - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/usbser/Makefile b/usr/src/uts/sparc/usbser/Makefile index bb60d82cea..56f053c4cb 100644 --- a/usr/src/uts/sparc/usbser/Makefile +++ b/usr/src/uts/sparc/usbser/Makefile @@ -39,19 +39,16 @@ UTSBASE = ../.. MODULE = usbser OBJECTS = $(USBSER_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USBSER_OBJS:%.o=$(LINTS_DIR)/%.ln) -WARLOCK_OUT = $(USBSER_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok ROOTMODULE = $(ROOT_MISC_DIR)/$(MODULE) -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. # include $(UTSBASE)/sparc/Makefile.sparc -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) # @@ -84,10 +81,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -101,29 +96,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock -TEST = test - -# -# Warlock -# -WARLOCK_CMD = $(WLCMD_DIR)/$(MODULE).wlcmd - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WARLOCK_CMD) warlock_ddi.files - $(WARLOCK) -c $(WARLOCK_CMD) $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/clients/usbser/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/usbskel/Makefile b/usr/src/uts/sparc/usbskel/Makefile index 664cf2fa17..627b16e9d9 100644 --- a/usr/src/uts/sparc/usbskel/Makefile +++ b/usr/src/uts/sparc/usbskel/Makefile @@ -44,18 +44,15 @@ OBJECTS = $(USBSKEL_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USBSKEL_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/common/io/usb/clients/usbskel -WARLOCK_OUT = $(USBSKEL_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. # include $(UTSBASE)/sparc/Makefile.sparc -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) # @@ -77,10 +74,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -94,54 +89,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll) -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) - -warlock: $(WARLOCK_OK) warlock_with_usba - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/usbskel.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usbskel.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/clients/usbskel/%.c \ - $(UTSBASE)/common/sys/usb/clients/usbskel/usbskel.h - $(WLCC) $(CPPFLAGS) -DDEBUG -DUSBSKEL_PM -DUSBSKEL_CPR -o $@ $< - - -warlock_with_usba: $(WLCMD_DIR)/usbskel_with_usba.wlcmd $(WARLOCK_OUT) \ - usba_files ohci_files ehci_files uhci_files warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usbskel_with_usba.wlcmd \ - $(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \ - $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - -usba_files: - @cd ../usba;pwd; $(MAKE) warlock - -uhci_files: - @cd ../uhci;pwd; $(MAKE) warlock - -ohci_files: - @cd ../ohci;pwd; $(MAKE) warlock - -ehci_files: - @cd ../ehci;pwd; $(MAKE) warlock - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock - diff --git a/usr/src/uts/sparc/usbsksp/Makefile b/usr/src/uts/sparc/usbsksp/Makefile index 28c036c0bc..951860f774 100644 --- a/usr/src/uts/sparc/usbsksp/Makefile +++ b/usr/src/uts/sparc/usbsksp/Makefile @@ -42,18 +42,15 @@ MODULE = usbsksp OBJECTS = $(USBSER_KEYSPAN_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USBSER_KEYSPAN_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WARLOCK_OUT = $(USBSER_KEYSPAN_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. # include $(UTSBASE)/sparc/Makefile.sparc -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) LDFLAGS += -dy -Nmisc/usba -Nmisc/usbser -Nmisc/usbs49_fw @@ -72,10 +69,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -91,60 +86,3 @@ install: $(INSTALL_DEPS) include $(UTSBASE)/sparc/Makefile.targ CERRWARN += -_gcc=-Wno-uninitialized - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock -TEST = test - -# -# warlock -# -WARLOCK_CMD = $(WLCMD_DIR)/usbser_keyspan.wlcmd -USBSER_FILES = $(USBSER_OBJS:%.o=../usbser/%.ll) -USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll) -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): warlock_with_usba warlock_with_usbser - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/clients/usbser/usbser_keyspan/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_with_usbser: $(WARLOCK_OUT) usbser_files warlock_ddi.files \ - $(WARLOCK_CMD) - $(WARLOCK) -c $(WARLOCK_CMD) $(WARLOCK_OUT) \ - $(USBSER_FILES) -l ../warlock/ddi_dki_impl.ll - -warlock_with_usba: $(WLCMD_DIR)/usbser_keyspan_with_usba.wlcmd $(WARLOCK_OUT) \ - usbser_files usba_files ohci_files uhci_files ehci_files \ - warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usbser_keyspan_with_usba.wlcmd \ - $(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \ - $(USBSER_FILES) \ - $(WARLOCK_OUT) -l ../warlock/ddi_dki_impl.ll - -usbser_files: - @cd ../usbser; pwd; $(MAKE) warlock - -usba_files: - @cd ../usba;pwd; $(MAKE) warlock - -uhci_files: - @cd ../uhci;pwd; $(MAKE) warlock - -ohci_files: - @cd ../ohci;pwd; $(MAKE) warlock - -ehci_files: - @cd ../ehci;pwd; $(MAKE) warlock - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/usbsprl/Makefile b/usr/src/uts/sparc/usbsprl/Makefile index e359afcab0..6ecac0694f 100644 --- a/usr/src/uts/sparc/usbsprl/Makefile +++ b/usr/src/uts/sparc/usbsprl/Makefile @@ -40,18 +40,15 @@ MODULE = usbsprl OBJECTS = $(USBSPRL_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USBSPRL_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WARLOCK_OUT = $(USBSPRL_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. # include $(UTSBASE)/sparc/Makefile.sparc -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) CERRWARN += -_gcc=-Wno-uninitialized @@ -72,10 +69,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -89,60 +84,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock -TEST = test - -# -# warlock -# -WARLOCK_CMD = $(WLCMD_DIR)/$(MODULE).wlcmd -USBSER_FILES = $(USBSER_OBJS:%.o=../usbser/%.ll) -USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll) -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) - -warlock: $(WARLOCK_OK) - -$(WARLOCK_OK): warlock_with_usbser warlock_with_usba - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/clients/usbser/usbsprl/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_with_usbser: $(WARLOCK_OUT) usbser_files warlock_ddi.files \ - $(WARLOCK_CMD) - $(WARLOCK) -c $(WARLOCK_CMD) $(WARLOCK_OUT) \ - $(USBSER_FILES) -l ../warlock/ddi_dki_impl.ll - -warlock_with_usba: $(WLCMD_DIR)/usbsprl_with_usba.wlcmd $(WARLOCK_OUT) \ - usbser_files usba_files ohci_files uhci_files ehci_files \ - warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usbsprl_with_usba.wlcmd \ - $(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \ - $(USBSER_FILES) \ - $(WARLOCK_OUT) -l ../warlock/ddi_dki_impl.ll - -usbser_files: - @cd ../usbser; pwd; $(MAKE) warlock - -usba_files: - @cd ../usba;pwd; $(MAKE) warlock - -uhci_files: - @cd ../uhci;pwd; $(MAKE) warlock - -ohci_files: - @cd ../ohci;pwd; $(MAKE) warlock - -ehci_files: - @cd ../ehci;pwd; $(MAKE) warlock - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/usbvc/Makefile b/usr/src/uts/sparc/usbvc/Makefile index 42f280d785..eb747fe312 100644 --- a/usr/src/uts/sparc/usbvc/Makefile +++ b/usr/src/uts/sparc/usbvc/Makefile @@ -45,18 +45,15 @@ MODULE = usbvc OBJECTS = $(USBVC_OBJS:%=$(OBJS_DIR)/%) LINTS = $(USBVC_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) -WARLOCK_OUT = $(USBVC_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. # include $(UTSBASE)/sparc/Makefile.sparc -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) # @@ -85,10 +82,8 @@ all: $(ALL_DEPS) def: $(DEF_DEPS) clean: $(CLEAN_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) clobber: $(CLOBBER_DEPS) - $(RM) $(WARLOCK_OUT) $(WARLOCK_OK) lint: $(LINT_DEPS) @@ -102,52 +97,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -# -# lock_lint rules -# -USBA_FILES = $(USBA_OBJS:%.o=../usba/%.ll) -UHCI_FILES = $(UHCI_OBJS:%.o=../uhci/%.ll) -OHCI_FILES = $(OHCI_OBJS:%.o=../ohci/%.ll) -EHCI_FILES = $(EHCI_OBJS:%.o=../ehci/%.ll) - -warlock: $(WARLOCK_OK) warlock_with_usba - -$(WARLOCK_OK): $(WARLOCK_OUT) $(WLCMD_DIR)/usbvc.wlcmd warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usbvc.wlcmd $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/usb/clients/video/usbvc/%.c \ - $(UTSBASE)/common/sys/usb/clients/video/usbvc/usbvc_var.h - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock_with_usba: $(WLCMD_DIR)/usbvc_with_usba.wlcmd $(WARLOCK_OUT) \ - usba_files ohci_files ehci_files uhci_files warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/usbvc_with_usba.wlcmd \ - $(USBA_FILES) $(OHCI_FILES) $(EHCI_FILES) $(UHCI_FILES) \ - $(WARLOCK_OUT) \ - -l ../warlock/ddi_dki_impl.ll - -usba_files: - @cd ../usba;pwd; $(MAKE) warlock - -uhci_files: - @cd ../uhci;pwd; $(MAKE) warlock - -ohci_files: - @cd ../ohci;pwd; $(MAKE) warlock - -ehci_files: - @cd ../ehci;pwd; $(MAKE) warlock - -warlock_ddi.files: - cd ../warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sparc/warlock/Makefile b/usr/src/uts/sparc/warlock/Makefile deleted file mode 100644 index 3fcb2bfb7e..0000000000 --- a/usr/src/uts/sparc/warlock/Makefile +++ /dev/null @@ -1,118 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. -# -# sparc architecture dependent -# -# uts/sparc/warlock/Makefile -# -# Path to the base of the uts directory tree (usually /usr/src/uts). -# -UTSBASE = ../.. - -# -# Define the module and object file sets. -# -MODULE = warlock -ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) - -.KEEP_STATE: - -CFLAGS += -I../../common/sys -I../../sun/sys/scsi -D_KERNEL -# -# Defines for local commands. -# -WARLOCK = warlock -WLCC = wlcc -TOUCH = touch -TEST = test - -include $(UTSBASE)/sparc/Makefile.sparc - -# -# lock_lint rules -# -all: warlock warlock.1394 warlock.ecpp warlock.scsi \ - warlock.usb warlock.ib warlock.sata warlock.wc - -warlock: $(MODULE).ok - -warlock.ok: ddi_dki_impl.ll scsi.ll - $(TOUCH) $@ - -%.ll: $(UTSBASE)/common/io/warlock/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -warlock.usb: - @cd ../usba; $(MAKE) clean; $(MAKE) warlock - @cd ../ohci; $(MAKE) clean; $(MAKE) warlock - @cd ../uhci; $(MAKE) clean; $(MAKE) warlock - @cd ../ehci; $(MAKE) clean; $(MAKE) warlock - @cd ../hid; $(MAKE) clean; $(MAKE) warlock - @cd ../scsa2usb; $(MAKE) clean; $(MAKE) warlock - @cd ../usb_ac; $(MAKE) clean; $(MAKE) warlock - @cd ../usb_as; $(MAKE) clean; $(MAKE) warlock - @cd ../usb_ah; $(MAKE) clean; $(MAKE) warlock - @cd ../ugen; $(MAKE) clean; $(MAKE) warlock - @cd ../usb_mid; $(MAKE) clean; $(MAKE) warlock - @cd ../usb_ia; $(MAKE) clean; $(MAKE) warlock - @cd ../usbprn; $(MAKE) clean; $(MAKE) warlock - @cd ../usbser; $(MAKE) clean; $(MAKE) warlock - @cd ../usbsksp; $(MAKE) clean; $(MAKE) warlock - @cd ../usbsprl; $(MAKE) clean; $(MAKE) warlock - @cd ../usbsacm; $(MAKE) clean; $(MAKE) warlock - @cd ../usbecm; $(MAKE) clean; $(MAKE) warlock - @cd ../usbskel; $(MAKE) clean; $(MAKE) warlock - -warlock.scsi: - @cd ../dad; $(MAKE) clean; $(MAKE) warlock - @cd ../dada; $(MAKE) clean; $(MAKE) warlock - @cd ../esp; $(MAKE) clean; $(MAKE) warlock - @cd ../fas; $(MAKE) clean; $(MAKE) warlock - @cd ../sd; $(MAKE) clean; $(MAKE) warlock - @cd ../ses; $(MAKE) clean; $(MAKE) warlock - @cd ../st; $(MAKE) clean; $(MAKE) warlock - @cd ../ssd; $(MAKE) clean; $(MAKE) warlock - -warlock.1394: - @cd ../s1394; $(MAKE) clean; $(MAKE) warlock - @cd ../hci1394; $(MAKE) clean; $(MAKE) warlock - @cd ../scsa1394; $(MAKE) clean; $(MAKE) warlock - @cd ../av1394; $(MAKE) clean; $(MAKE) warlock - -warlock.ecpp: - @cd ../ecpp; $(MAKE) clean; $(MAKE) warlock - -warlock.ib: - @cd ../ibmf; $(MAKE) clean; $(MAKE) warlock - @cd ../ib; $(MAKE) clean; $(MAKE) warlock - @cd ../ibtl; $(MAKE) clean; $(MAKE) warlock - @cd ../ibcm; $(MAKE) clean; $(MAKE) warlock - @cd ../ibd; $(MAKE) clean; $(MAKE) warlock - -warlock.sata: - @cd ../sata; $(MAKE) clean; $(MAKE) warlock - @cd ../si3124; $(MAKE) clean; $(MAKE) warlock - @cd ../ahci; $(MAKE) clean; $(MAKE) warlock - @cd ../nv_sata; $(MAKE) clean; $(MAKE) warlock - -warlock.wc: - @cd ../wc; $(MAKE) clean; $(MAKE) warlock diff --git a/usr/src/uts/sparc/wc/Makefile b/usr/src/uts/sparc/wc/Makefile index 86d8563330..2e6438cff9 100644 --- a/usr/src/uts/sparc/wc/Makefile +++ b/usr/src/uts/sparc/wc/Makefile @@ -41,9 +41,6 @@ OBJECTS = $(WC_OBJS:%=$(OBJS_DIR)/%) LINTS = $(WC_OBJS:%.o=$(LINTS_DIR)/%.ln) ROOTMODULE = $(ROOT_DRV_DIR)/$(MODULE) CONF_SRCDIR = $(UTSBASE)/sun/io -WARLOCK_OUT = $(WC_OBJS:%.o=%.ll) -WARLOCK_OK = $(MODULE).ok -WLCMD_DIR = $(UTSBASE)/common/io/warlock # # Include common rules. @@ -97,37 +94,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sparc/Makefile.targ - -# -# Defines for local commands -# -TEST = test -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock - -# -# warlock targets -# - -# -# vcons_conf.c is compiled to genunix, add it to WARLOCK_OUT -# -WARLOCK_OUT += vcons_conf.ll - -warlock: $(WARLOCK_OUT) sdev_vtops.file warlock_ddi.files - $(WARLOCK) -c $(WLCMD_DIR)/wc.wlcmd $(WARLOCK_OUT) \ - -l ../../sparc/warlock/ddi_dki_impl.ll - $(WARLOCK) -c $(WLCMD_DIR)/wc_devfs.wlcmd sdev_vtops.ll vcons_conf.ll \ - -l ../../sparc/warlock/ddi_dki_impl.ll - $(TOUCH) $(WARLOCK_OK) - -%.ll: $(UTSBASE)/common/io/%.c - $(WLCC) $(CPPFLAGS) -DDEBUG -o $@ $< - -sdev_vtops.file: - $(WLCC) $(CPPFLAGS) -DDEBUG -o sdev_vtops.ll -c \ - ../../common/fs/dev/sdev_vtops.c - -warlock_ddi.files: - @cd ../../sparc/warlock; pwd; $(MAKE) warlock diff --git a/usr/src/uts/sun4u/i2bsc/Makefile b/usr/src/uts/sun4u/i2bsc/Makefile index 0c984165b1..5db65683dc 100644 --- a/usr/src/uts/sun4u/i2bsc/Makefile +++ b/usr/src/uts/sun4u/i2bsc/Makefile @@ -22,7 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # This makefile drives the production of the i2bsc nexus driver. # @@ -44,9 +43,9 @@ CONF_SRCDIR = $(UTSBASE)/sun4u/io/i2c/nexus # include $(UTSBASE)/sun4u/Makefile.sun4u -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) -I$(UTSBASE)/sun4u LDFLAGS += -dy -N misc/i2c_svc @@ -86,27 +85,6 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) # -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock - -# -# Warlock targets -# - -I2BSC = $(I2BSC_OBJS:%.o=%.ll) - -warlock: $(MODULE).ok - -%.ok: $(I2BSC_FILES) - $(TOUCH) $@ - -%.ll: $(UTSBASE)/sun4u/io/i2c/nexus/i2bsc/%.c - $(WLCC) $(CFLAGS) $(CPPFLAGS) -DDEBUG -o $@ $< - -# # Include common targets # include $(UTSBASE)/sun4u/Makefile.targ diff --git a/usr/src/uts/sun4u/i2c_svc/Makefile b/usr/src/uts/sun4u/i2c_svc/Makefile index 3803d9691d..f17f211c52 100644 --- a/usr/src/uts/sun4u/i2c_svc/Makefile +++ b/usr/src/uts/sun4u/i2c_svc/Makefile @@ -1,6 +1,4 @@ # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -23,9 +21,9 @@ ROOTMODULE = $(ROOT_PSM_MISC_DIR)/$(MODULE) # include $(UTSBASE)/sun4u/Makefile.sun4u -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) LDFLAGS += -dy @@ -59,24 +57,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sun4u/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock - -# -# Warlock targets -# - -I2C_SVC_FILES = $(I2C_SVC_OBJS:%.o=%.ll) - -warlock: $(MODULE).ok - -%.ok: $(I2C_SVC_FILES) - $(TOUCH) $@ - -%.ll: $(UTSBASE)/sun4u/io/i2c/misc/%.c - $(WLCC) $(CFLAGS) $(CPPFLAGS) -DDEBUG -o $@ $< diff --git a/usr/src/uts/sun4u/montecarlo/acebus/Makefile b/usr/src/uts/sun4u/montecarlo/acebus/Makefile index 90d0438d14..03b756c375 100644 --- a/usr/src/uts/sun4u/montecarlo/acebus/Makefile +++ b/usr/src/uts/sun4u/montecarlo/acebus/Makefile @@ -97,23 +97,3 @@ LINT_LIB_DIR = $(MONTECARLO_LINT_LIB_DIR) # Include common targets. # include $(UTSBASE)/sun4u/montecarlo/Makefile.targ - -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock - -# -# Warlock targets -# - -ACEBUS_FILES = $(ACEBUS_OBJS:%.o=%.ll) - -warlock: $(MODULE).ok - -%.ok: $(ACEBUS_FILES) - $(TOUCH) $@ - -%.ll: $(UTSBASE)/sun4u/montecarlo/io/%.c - $(WLCC) $(CFLAGS) $(CPPFLAGS) -DDEBUG -o $@ $< diff --git a/usr/src/uts/sun4u/montecarlo/scsb/Makefile b/usr/src/uts/sun4u/montecarlo/scsb/Makefile index 3076c9dbb6..e20ca311ff 100644 --- a/usr/src/uts/sun4u/montecarlo/scsb/Makefile +++ b/usr/src/uts/sun4u/montecarlo/scsb/Makefile @@ -101,23 +101,3 @@ LINT_LIB_DIR = $(MONTECARLO_LINT_LIB_DIR) # Include common targets. # include $(UTSBASE)/sun4u/montecarlo/Makefile.targ - -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock - -# -# Warlock targets -# - -SCSB_FILES = $(SCSB_OBJS:%.o=%.ll) - -warlock: $(MODULE).ok - -%.ok: $(SCSB_FILES) - $(TOUCH) $@ - -%.ll: $(UTSBASE)/sun4u/montecarlo/io/%.c - $(WLCC) $(CFLAGS) $(CPPFLAGS) -DDEBUG -o $@ $< diff --git a/usr/src/uts/sun4u/pcf8584/Makefile b/usr/src/uts/sun4u/pcf8584/Makefile index bc08343e64..7134c7a6f0 100644 --- a/usr/src/uts/sun4u/pcf8584/Makefile +++ b/usr/src/uts/sun4u/pcf8584/Makefile @@ -19,8 +19,6 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -43,9 +41,9 @@ ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # include $(UTSBASE)/sun4u/Makefile.sun4u -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) -I../../sun4u LDFLAGS += -dy -N misc/i2c_svc @@ -83,27 +81,6 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) # -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock - -# -# Warlock targets -# - -PCF8584 = $(PCF8584_OBJS:%.o=%.ll) - -warlock: $(MODULE).ok - -%.ok: $(PCF8584_FILES) - $(TOUCH) $@ - -%.ll: $(UTSBASE)/sun4u/io/i2c/nexus/pcf8584/%.c - $(WLCC) $(CFLAGS) $(CPPFLAGS) -DDEBUG -o $@ $< - -# # Include common targets # include $(UTSBASE)/sun4u/Makefile.targ diff --git a/usr/src/uts/sun4u/seeprom/Makefile b/usr/src/uts/sun4u/seeprom/Makefile index df05378e64..a1c1fd4712 100644 --- a/usr/src/uts/sun4u/seeprom/Makefile +++ b/usr/src/uts/sun4u/seeprom/Makefile @@ -43,9 +43,9 @@ ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # include $(UTSBASE)/sun4u/Makefile.sun4u -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) LDFLAGS += -dy -N misc/i2c_svc @@ -88,32 +88,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sun4u/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock - -# -# Warlock targets -# - -SEEPROM_FILES = $(SEEPROM_OBJS:%.o=%.ll) - -warlock: $(MODULE).ok - warlock -c seeprom.wlcmd $(SEEPROM_FILES) \ - -l ../../sparc/warlock/ddi_dki_impl.ll - $(TOUCH) $@ - -# i2c_svc_files warlock_ddi_files - -warlock_with_svc: $(SEEPROM_FILES) - $(WARLOCK) -c seeprom.wlcmd $(SEEPROM_FILES) ../i2c_svc/i2c_svc.ll \ - -l ../../sparc/warlock/ddi_dki_impl.ll - -%.ok: $(SEEPROM_FILES) - -%.ll: $(UTSBASE)/sun4u/io/i2c/clients/%.c - $(WLCC) $(CFLAGS) $(CPPFLAGS) -DDEBUG -o $@ $< diff --git a/usr/src/uts/sun4u/smbus/Makefile b/usr/src/uts/sun4u/smbus/Makefile index d60bf5af4f..95db67bdd6 100644 --- a/usr/src/uts/sun4u/smbus/Makefile +++ b/usr/src/uts/sun4u/smbus/Makefile @@ -19,8 +19,6 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -43,9 +41,9 @@ ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # include $(UTSBASE)/sun4u/Makefile.sun4u -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) -I../../sun4u LDFLAGS += -dy -N misc/i2c_svc @@ -83,27 +81,6 @@ clean.lint: $(CLEAN_LINT_DEPS) install: $(INSTALL_DEPS) # -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock - -# -# Warlock targets -# - -SMBUS = $(SMBUS_OBJS:%.o=%.ll) - -warlock: $(MODULE).ok - -%.ok: $(SMBUS_FILES) - $(TOUCH) $@ - -%.ll: $(UTSBASE)/sun4u/io/i2c/nexus/smbus/%.c - $(WLCC) $(CFLAGS) $(CPPFLAGS) -DDEBUG -o $@ $< - -# # Include common targets # include $(UTSBASE)/sun4u/Makefile.targ diff --git a/usr/src/uts/sun4u/tda8444/Makefile b/usr/src/uts/sun4u/tda8444/Makefile index 8ee945ed0c..544faf4462 100644 --- a/usr/src/uts/sun4u/tda8444/Makefile +++ b/usr/src/uts/sun4u/tda8444/Makefile @@ -20,8 +20,6 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -45,9 +43,9 @@ ROOTMODULE = $(ROOT_PSM_DRV_DIR)/$(MODULE) # include $(UTSBASE)/sun4u/Makefile.sun4u -# -# lint pass one enforcement -# +# +# lint pass one enforcement +# CFLAGS += $(CCVERBOSE) LDFLAGS += -dy -N misc/i2c_svc @@ -81,24 +79,3 @@ install: $(INSTALL_DEPS) # Include common targets. # include $(UTSBASE)/sun4u/Makefile.targ - -# -# Defines for local commands. -# -WLCC = wlcc -TOUCH = touch -WARLOCK = warlock - -# -# Warlock targets -# - -TDA8444 = $(TDA8444_OBJS:%.o=%.ll) - -warlock: $(MODULE).ok - -%.ok: $(TDA8444_FILES) - $(TOUCH) $@ - -%.ll: $(UTSBASE)/sun4u/io/i2c/clients/tda8444/%.c - $(WLCC) $(CFLAGS) $(CPPFLAGS) -DDEBUG -o $@ $< |