13558 remove support for optional subdirectories in the build

Reviewed by: Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Yuri Pankov <yuripv@yuripv.dev>
Approved by: Gordon Ross <gordon.w.ross@gmail.com>

19 files changed, 57 insertions, 180 deletions

diff --git a/usr/src/cmd/Makefile b/usr/src/cmd/Makefile
index 3fb4a7d611..7bac5c58ce 100644
--- a/usr/src/cmd/Makefile
+++ b/usr/src/cmd/Makefile
@@ -136,7 +136,6 @@ COMMON_SUBDIRS=		\
 	dirname		\
 	dis		\
 	diskinfo	\
-	diskmgtd	\
 	dispadmin	\
 	dladm		\
 	dlstat		\
@@ -222,7 +221,6 @@ COMMON_SUBDIRS=		\
 	ipf		\
 	isainfo		\
 	isalist		\
-	itutools	\
 	iscsiadm	\
 	iscsid		\
 	iscsitsvc	\
@@ -796,17 +794,10 @@ AUDITSUBDIRS=		\
 	auditstat	\
 	praudit
 
-#
-# commands not owned by the systems group
-#
-BWOSDIRS=
-
-
 all :=		TARGET = all
 install :=	TARGET = install
 clean :=	TARGET = clean
 clobber :=	TARGET = clobber
-lint :=		TARGET = lint
 _msg :=		TARGET = _msg
 _dc :=		TARGET = _dc
 
@@ -814,9 +805,9 @@ _dc :=		TARGET = _dc
 
 SUBDIRS = $(COMMON_SUBDIRS) $($(MACH)_SUBDIRS)
 
-.PARALLEL:	$(BWOSDIRS) $(SUBDIRS) $(MSGSUBDIRS) $(AUDITSUBDIRS)
+.PARALLEL:	$(SUBDIRS) $(MSGSUBDIRS) $(AUDITSUBDIRS)
 
-all install clean clobber lint: $(FIRST_SUBDIRS) .WAIT $(SUBDIRS) \
+all install clean clobber: $(FIRST_SUBDIRS) .WAIT $(SUBDIRS) \
 	$(AUDITSUBDIRS)
 
 #
@@ -846,11 +837,7 @@ ast:	isaexec
 print:	lp
 fmt:	mailx
 
-$(FIRST_SUBDIRS) $(BWOSDIRS) $(SUBDIRS) $(AUDITSUBDIRS): FRC
-	@if [ -f $@/Makefile  ]; then \
-		cd $@; pwd; $(MAKE) $(TARGET); \
-	else \
-		true; \
-	fi
+$(FIRST_SUBDIRS) $(SUBDIRS) $(AUDITSUBDIRS): FRC
+		cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/Makefile
index c27b139a5e..6df43efaa4 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/Makefile
@@ -210,17 +210,8 @@ THIRDPARTYLICENSE.arp: arp.c
 
 CLOBBERFILES += THIRDPARTYLICENSE.arp
 
-#
-# The reason this rule checks for the existence of the
-# Makefile is that some of the directories do not exist
-# in our exportable source builds.
-#
 $(SUBDIRS): FRC
-	@if [ -f $@/Makefile  ]; then \
-		cd $@; pwd; $(MAKE) $(TARGET); \
-	else \
-		true; \
-	fi
+	cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
 
diff --git a/usr/src/cmd/fwflash/Makefile b/usr/src/cmd/fwflash/Makefile
index f4b718d3a0..3bba66702f 100644
--- a/usr/src/cmd/fwflash/Makefile
+++ b/usr/src/cmd/fwflash/Makefile
@@ -28,7 +28,7 @@ include $(SRC)/Makefile.master
 PROG=		fwflash
 COMMON_SUBDIRS=	$(MACH)
 IDF_SUBDIRS=	plugins/transport
-VRF_SUBDIRS=	plugins 
+VRF_SUBDIRS=	plugins
 SUBDIRS=	$(COMMON_SUBDIRS) .WAIT \
 		$(IDF_SUBDIRS) .WAIT \
 		$(VRF_SUBDIRS)
@@ -39,19 +39,12 @@ clobber :=      TARGET= clobber
 check :=	TARGET= check
 install :=      TARGET= install
 install_h :=	TARGET= install_h
-lint :=         TARGET= lint
 _msg :=         TARGET= _msg
-msg :=         	TARGET= msg
 
-
-all clean clobber install lint msg _msg: $(SUBDIRS)
+all clean clobber install _msg: $(SUBDIRS)
 check install_h: $(COMMON_SUBDIRS)
 
 $(SUBDIRS): FRC
-	@if [ -f $@/Makefile ]; then \
-       		cd $@; pwd; $(MAKE) $(TARGET); \
-        else \
-       		true; \
-        fi
+	cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/cmd/fwflash/Makefile.targ b/usr/src/cmd/fwflash/Makefile.targ
index 57efebf6ac..12c4a243ca 100644
--- a/usr/src/cmd/fwflash/Makefile.targ
+++ b/usr/src/cmd/fwflash/Makefile.targ
@@ -35,10 +35,9 @@ HDRS=		fwflash.h
 
 PROG=		$(SRCS:%.c=%)
 OBJS=		$(SRCS:%.c=%.o)
-LINTFILE=	$(SRCS:%.c=%.ln)
 POFILES=	$(SRCS:%.c=%.po)
 
-POFILE= 	fwflash_msg.po
+POFILE=		fwflash_msg.po
 
 HDRDIR=../common
 SRCDIR=../common
@@ -73,7 +72,7 @@ $(PROG): install_h $(OBJS)
 all:	$(PROG)
 
 clean:
-	$(RM) $(POFILE) $(POFILES) $(LINTFILE) $(PROG)
+	$(RM) $(POFILE) $(POFILES) $(PROG)
 
 clobber: clean
 	$(RM) $(OBJS)
@@ -84,6 +83,4 @@ install: all $(ROOTUSRSBIN) $(ROOTUSRSBIN)/$(PROG)
 
 install_h:$(ROOTUSRINCLDFWFLASH) $(ROOTHDRS)
 
-lint: $(LINTFILE)	
-
-_msg msg:	$(POFILE)
+_msg:	$(POFILE)
diff --git a/usr/src/cmd/fwflash/plugins/Makefile b/usr/src/cmd/fwflash/plugins/Makefile
index 036159eb65..2053d1723c 100644
--- a/usr/src/cmd/fwflash/plugins/Makefile
+++ b/usr/src/cmd/fwflash/plugins/Makefile
@@ -34,21 +34,13 @@ all :=		TARGET= all
 install :=	TARGET= install
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
-lint :=		TARGET= lint
 _msg :=		TARGET= _msg
-msg :=		TARGET= msg
-
 
 .KEEP_STATE:
 
-all clean clobber install lint msg _msg:		$(SUBDIRS)
-
+all clean clobber install _msg:		$(SUBDIRS)
 
 $(SUBDIRS): FRC
-	@if [ -f $@/Makefile ]; then \
-		cd $@; pwd; $(MAKE) $(TARGET); \
-	else \
-		true; \
-	fi
+	cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/cmd/fwflash/plugins/Makefile.targ b/usr/src/cmd/fwflash/plugins/Makefile.targ
index 8edeaccd66..408b3d5556 100644
--- a/usr/src/cmd/fwflash/plugins/Makefile.targ
+++ b/usr/src/cmd/fwflash/plugins/Makefile.targ
@@ -34,14 +34,13 @@ PLUGINS= $(HERMON-MELLANOX_LIB) $(TAVOR-MELLANOX_LIB) $(SD-GENERIC_LIB)
 OBJECTS= $(PLUGINS:%.so=%.o)
 DYNLIB=	$(PLUGINS:%=%)
 POFILES= $(PLUGINS:%.so=%.po)
-LINTFILE= $(PLUGINS:%.so=%.ln)
 
 POFILE=	fwflash_verify_msg.po
 SRCDIR=	../vendor
 
 include $(SRC)/cmd/fwflash/Makefile.com
 
-CLEANFILES= $(PLUGINS) $(POFILE) $(POFILES) $(LINTFILE)
+CLEANFILES= $(PLUGINS) $(POFILE) $(POFILES)
 
 LIBS= $(DYNLIB)
 CFLAGS += $(C_PICFLAGS)
@@ -58,21 +57,18 @@ $(HERMON-MELLANOX_LIB):= SONAME = $(HERMON-MELLANOX_LIB)
 $(TAVOR-MELLANOX_LIB):=	SONAME = $(TAVOR-MELLANOX_LIB)
 $(SD-GENERIC_LIB):= SONAME = $(SD-GENERIC_LIB)
 
-$(HERMON-MELLANOX_LIB):= DYNFLAGS += -R/usr/lib/fwflash/identify 
+$(HERMON-MELLANOX_LIB):= DYNFLAGS += -R/usr/lib/fwflash/identify
 $(HERMON-MELLANOX_LIB):= LDLIBS += -L. $(ROOT)/usr/lib/fwflash/identify/hermon.so
 
 $(SD-GENERIC_LIB):= LDLIBS += -L$(ROOT)/usr/lib/scsi -lscsi
 $(SD-GENERIC_LIB):= DYNFLAGS += -R/usr/lib/scsi
 
-
-.KEEP STATE:
+.KEEP_STATE:
 
 all: $(LIBS)
 
 install: all $(ROOTLIBS)
 
-lint: $(LINTFILE) 
-
-_msg msg: $(POFILE)
+_msg: $(POFILE)
 
 include $(SRC)/lib/Makefile.targ
diff --git a/usr/src/cmd/fwflash/plugins/transport/Makefile b/usr/src/cmd/fwflash/plugins/transport/Makefile
index c594def918..6ae3d18e29 100644
--- a/usr/src/cmd/fwflash/plugins/transport/Makefile
+++ b/usr/src/cmd/fwflash/plugins/transport/Makefile
@@ -33,24 +33,13 @@ all :=          TARGET= all
 install :=      TARGET= install
 clean :=        TARGET= clean
 clobber :=      TARGET= clobber
-lint :=         TARGET= lint
 _msg :=         TARGET= _msg
-msg :=		TARGET= msg
-
 
 .KEEP_STATE:
 
-all clean clobber install lint msg _msg:		$(SUBDIRS)
-
-
+all clean clobber install _msg:		$(SUBDIRS)
 
 $(SUBDIRS): FRC
-	@if [ -f $@/Makefile ]; then \
-		cd $@; pwd; $(MAKE) $(TARGET); \
-	else \
-		true; \
-	fi
+	cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
-
-
diff --git a/usr/src/cmd/fwflash/plugins/transport/Makefile.targ b/usr/src/cmd/fwflash/plugins/transport/Makefile.targ
index c3fefe1a06..31a935bf5a 100644
--- a/usr/src/cmd/fwflash/plugins/transport/Makefile.targ
+++ b/usr/src/cmd/fwflash/plugins/transport/Makefile.targ
@@ -37,7 +37,6 @@ PLUGINS=	$(SES_LIB) $(TAVOR_LIB) $(HERMON_LIB) $(SD_LIB) $(UFM_LIB)
 OBJECTS= $(PLUGINS:%.so=%.o)
 DYNLIB=	$(PLUGINS:%=%)
 POFILES= $(PLUGINS:%.so=%.po)
-LINTFILE= $(PLUGINS:%.so=%.ln)
 
 SLINKS=		sgen.so
 POFILE=	fwflash_transport_identify_ses.po
@@ -45,7 +44,7 @@ SRCDIR= ../common
 
 include $(SRC)/cmd/fwflash/Makefile.com
 
-CLEANFILES=	$(PLUGINS) $(POFILES) $(POFILE) $(LINTFILE) $(SLINKS)
+CLEANFILES=	$(PLUGINS) $(POFILES) $(POFILE) $(SLINKS)
 
 LIBS= $(DYNLIB)
 CFLAGS += $(C_PICFLAGS)
@@ -79,7 +78,7 @@ $(UFM_LIB):=	LDLIBS += -lpcidb -lnvpair -lc
 $(SES_LIB):=	DYNFLAGS += -R/usr/lib/scsi
 $(SD_LIB):=	DYNFLAGS += -R/usr/lib/scsi
 
-.KEEP STATE:
+.KEEP_STATE:
 
 $(ROOTUSRLIBFWFLASHIDF)/$(SLINKS) : $(ROOTUSRLIBFWFLASHIDF)/$(SES_LIB)
 	@$(RM) $@
@@ -90,8 +89,6 @@ all: $(LIBS)
 install: all  $(ROOTLIBS) \
 	$(ROOTUSRLIBFWFLASHIDF)/$(SLINKS)
 
-lint: $(LINTFILE)
-
-_msg msg: $(POFILE)
+_msg: $(POFILE)
 
 include $(SRC)/lib/Makefile.targ
diff --git a/usr/src/cmd/sgs/Makefile.sub b/usr/src/cmd/sgs/Makefile.sub
index 31d82769b8..7356ba6653 100644
--- a/usr/src/cmd/sgs/Makefile.sub
+++ b/usr/src/cmd/sgs/Makefile.sub
@@ -27,19 +27,8 @@
 
 include		$(SRC)/Makefile.master
 
-# This is how the SUBDIRS stuff should look by the time the SGS
-# directory is fully converted:
-#
-# SUBDIRS=	$(MACH) $(BUILD64) $(MACH64)
-#
-# $(SUBDIRS):	FRC
-#	@cd $@; pwd; $(MAKE) $(TARGET)
-#
-# In the meantime, we use an sneaky trick on the $(SUBDIRS) target
-# to build whatever 64-bit directories we actually find as a side-effect
-# of descending into the 32-bit directories.  Ick.
-
 SUBDIRS =	$(MACH) $(EXTRASUBDIRS)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -58,8 +47,5 @@ all clean clobber delete install catalog package chkmsg: \
 
 $(SUBDIRS):	FRC
 		@ cd $@; pwd; $(MAKE) $(TARGET)
-		@ $(BUILD64)if [ -f $(MACH64)/Makefile ]; then		\
-		  $(BUILD64)     cd $(MACH64); pwd; $(MAKE) $(TARGET);	\
-		  $(BUILD64)else /bin/true; fi
 
 FRC:
diff --git a/usr/src/cmd/sgs/messages/Makefile b/usr/src/cmd/sgs/messages/Makefile
index 3fb5c9663e..515d509227 100644
--- a/usr/src/cmd/sgs/messages/Makefile
+++ b/usr/src/cmd/sgs/messages/Makefile
@@ -20,9 +20,29 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright (c) 1996 by Sun Microsystems, Inc.
 # All rights reserved.
+#
+
+include		../../../Makefile.master
+
+SUBDIRS=	$(MACH)
+
+all :=		TARGET= all
+clean :=	TARGET= clean
+clobber :=	TARGET= clobber
+delete :=	TARGET= delete
+install :=	TARGET= install
+catalog :=	TARGET= catalog
+package :=	TARGET= package
+chkmsg :=	TARGET= chkmsg
+
+.KEEP_STATE:
+.KEEP_STATE_FILE: .make.state.$(MACH)
+
+all clean clobber delete install catalog package chkmsg:	$(SUBDIRS)
+
+$(SUBDIRS):	FRC
+		@cd $@; pwd; $(MAKE) $(TARGET)
 
-include		$(SRC)/cmd/sgs/Makefile.sub
+FRC:
diff --git a/usr/src/lib/Makefile b/usr/src/lib/Makefile
index 59e47c2bd6..5c796c3caf 100644
--- a/usr/src/lib/Makefile
+++ b/usr/src/lib/Makefile
@@ -543,8 +543,6 @@ _msg:			$(MSGSUBDIRS:%=%-nodepend) .WAIT _dc
 
 _dc:			$(DCSUBDIRS:%=%-nodepend)
 
-lint:
-
 # Library interdependencies are called out explicitly here.
 ../cmd/sgs/libconv: crt
 ../cmd/sgs/libdl: crt
@@ -722,17 +720,9 @@ udapl:		libdevinfo libdladm
 # OpenSolaris).
 #
 $(SUBDIRS): FRC
-	@if [ -f $@/Makefile  ]; then \
-		cd $@; pwd; $(MAKE) $(TARGET); \
-	else \
-		true; \
-	fi
+	cd $@; pwd; $(MAKE) $(TARGET)
 
 $(SUBDIRS:%=%-nodepend):
-	@if [ -f $(@:%-nodepend=%)/Makefile  ]; then \
-		cd $(@:%-nodepend=%); pwd; $(MAKE) $(TARGET); \
-	else \
-		true; \
-	fi
+	cd $(@:%-nodepend=%); pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/stand/lib/Makefile b/usr/src/stand/lib/Makefile
index 154094db33..c578595c45 100644
--- a/usr/src/stand/lib/Makefile
+++ b/usr/src/stand/lib/Makefile
@@ -31,12 +31,6 @@ sparc_SUBDIRS =
 SUBDIRS = fs/hsfs fs/nfs fs/ufs inet sa sock tcpstubs xdr \
 	tcp $($(MACH)_SUBDIRS)
 
-LINTSUBDIRS = $(SUBDIRS)
-
-#
-# We can get away with this since we're only building .a's, and by the
-# time we run lint all of the lint libraries have already been built.
-#
 .PARALLEL: $(SUBDIRS)
 
 .KEEP_STATE:
@@ -45,23 +39,11 @@ all	:=	TARGET = all
 clean	:=	TARGET = clean
 clobber	:=	TARGET = clobber
 install	:=	TARGET = install
-lint	:=	TARGET = lint
 
 all clean clobber install: $(SUBDIRS)
 
-lint: $(LINTSUBDIRS)
-
-#
-# The reason this rule checks for the existence of the
-# Makefile is that some of the directories do not exist
-# in our exportable source builds.
-#
 $(SUBDIRS): FRC
-	@if [ -f $@/Makefile  ]; then \
-		cd $@; pwd; $(MAKE) $(TARGET); \
-	else \
-		true; \
-	fi
+	cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
 
diff --git a/usr/src/test/Makefile.com b/usr/src/test/Makefile.com
index 49e23dd496..aec03b8027 100644
--- a/usr/src/test/Makefile.com
+++ b/usr/src/test/Makefile.com
@@ -17,23 +17,12 @@ all     :=      TARGET = all
 install :=      TARGET = install
 clean   :=      TARGET = clean
 clobber :=      TARGET = clobber
-lint    :=      TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber install lint: $(SUBDIRS)
-
-lint_PROG:
-	$(LINT.c) $(PROG).c $(LDLIBS)
-
-lint_SRCS:
-	$(LINT.c) $(SRCS) $(LDLIBS)
+all clean clobber install: $(SUBDIRS)
 
 $(SUBDIRS): FRC
-	@if [ -f $@/Makefile  ]; then \
-		cd $@; pwd; $(MAKE) $(TARGET); \
-	else \
-		true; \
-	fi
+	cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/uts/i86pc/Makefile b/usr/src/uts/i86pc/Makefile
index 1638d050df..ec0f61cfb4 100644
--- a/usr/src/uts/i86pc/Makefile
+++ b/usr/src/uts/i86pc/Makefile
@@ -79,11 +79,7 @@ $(IMPLEMENTATIONS):     FRC
 	@cd $@; pwd; THISIMPL=$@ $(MAKE) $(NO_STATE) $(TARGET)
 
 $(XMODS):	FRC
-	@if [ -f $@/Makefile  ]; then \
-		cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET); \
-	else \
-		true; \
-	fi
+	cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
 
 install_h check:	$(IMPLEMENTATIONS) FRC
 	@cd sys; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/uts/i86xpv/Makefile b/usr/src/uts/i86xpv/Makefile
index ba2927dfa6..2b62799664 100644
--- a/usr/src/uts/i86xpv/Makefile
+++ b/usr/src/uts/i86xpv/Makefile
@@ -74,11 +74,7 @@ setup: FRC
 	@cd cpu/scripts; pwd; $(MAKE) $(TARGET)
 
 $(XMODS):	FRC
-	@if [ -f $@/Makefile  ]; then \
-		cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET); \
-	else \
-		true; \
-	fi
+	cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
 
 install_h check:	FRC
 	@cd sys; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/uts/intel/Makefile b/usr/src/uts/intel/Makefile
index 46f0fb2be1..ff9ed42c94 100644
--- a/usr/src/uts/intel/Makefile
+++ b/usr/src/uts/intel/Makefile
@@ -115,11 +115,7 @@ $(KMODS) $(SUBDIRS) config:	FRC
 	@cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
 
 $(XMODS):	FRC
-	@if [ -f $@/Makefile  ]; then \
-		cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET); \
-	else \
-		true; \
-	fi
+	cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
 
 install_h check:	FRC
 	@cd sys; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/uts/sparc/Makefile b/usr/src/uts/sparc/Makefile
index 6fe0be4ce9..f9df68dbc3 100644
--- a/usr/src/uts/sparc/Makefile
+++ b/usr/src/uts/sparc/Makefile
@@ -55,11 +55,7 @@ $(KMODS) config:	FRC
 	@cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
 
 $(XMODS):	FRC
-	@if [ -f $@/Makefile  ]; then \
-		cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET); \
-	else \
-		true; \
-	fi
+	cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
 
 install_h check:	FRC
 	@cd asm; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/uts/sun4u/Makefile b/usr/src/uts/sun4u/Makefile
index 7da95236ca..4ceb2d38d8 100644
--- a/usr/src/uts/sun4u/Makefile
+++ b/usr/src/uts/sun4u/Makefile
@@ -153,11 +153,7 @@ $(IMPLEMENTATIONS):	FRC
 	@cd $@; pwd; THISIMPL=$@ $(MAKE) $(NO_STATE) $(TARGET)
 
 $(XMODS):	FRC
-	@if [ -f $@/Makefile  ]; then \
-		cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET); \
-	else \
-		true; \
-	fi
+	cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
 
 install_h check: install_platforms $(IMPLEMENTATIONS)
 	@cd sys; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/uts/sun4v/Makefile b/usr/src/uts/sun4v/Makefile
index 8b09c1e732..4e1ac2a6da 100644
--- a/usr/src/uts/sun4v/Makefile
+++ b/usr/src/uts/sun4v/Makefile
@@ -83,19 +83,7 @@ $(IMPLEMENTATIONS):	FRC
 	@cd $@; pwd; THISIMPL=$@ $(MAKE) $(NO_STATE) $(TARGET)
 
 $(XMODS):	FRC
-	@if [ -f $@/Makefile  ]; then \
-		cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET); \
-	else \
-		true; \
-	fi
-
-$(CLOSED_XMODS):	FRC
-	@if [ -f $(CLOSED)/uts/sun4v/$@/Makefile  ]; then \
-		cd $(CLOSED)/uts/sun4v/$@; pwd; \
-		    $(MAKE) $(NO_STATE) $(TARGET); \
-	else \
-		true; \
-	fi
+	cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
 
 $(CLOSED_KMODS):	FRC
 	cd $(CLOSED)/uts/sun4v/$@; pwd; $(MAKE) $(NO_STATE) $(TARGET)