13588 want a tools geniconvtbl

Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Gordon Ross <gordon.w.ross@gmail.com>

12 files changed, 159 insertions, 261 deletions

diff --git a/exception_lists/packaging b/exception_lists/packaging
index 62a6cea3c9..b17404fecb 100644
--- a/exception_lists/packaging
+++ b/exception_lists/packaging
@@ -24,13 +24,13 @@
 # Copyright 2012 OmniTI Computer Consulting, Inc.  All rights reserved.
 # Copyright 2014 Garrett D'Amore <garrett@damore.org>
 # Copyright 2016 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
-# Copyright 2018 Nexenta Systems, Inc.
 # Copyright 2017 Toomas Soome <tsoome@me.com>
 # Copyright 2017 RackTop Systems.
-# Copyright 2019, Joyent, Inc.
+# Copyright 2018 Nexenta Systems, Inc.
 # Copyright 2018 Jason King
-# Copyright 2020 Peter Tribble
+# Copyright 2019, Joyent, Inc.
 # Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2020 Peter Tribble
 #
 
 #
@@ -744,11 +744,13 @@ usr/lib/sparcv9/libvrrpadm.so		sparc
 #
 opt/onbld/bin/i386/mandoc	i386
 opt/onbld/bin/sparc/mandoc	sparc
+opt/onbld/bin/i386/geniconvtbl	i386
+opt/onbld/bin/sparc/geniconvtbl	sparc
 opt/onbld/bin/i386/makesoftcore	i386
-opt/onbld/bin/i386/rpcgen	i386
-opt/onbld/bin/i386/vtfontcvt	i386
 opt/onbld/bin/sparc/makesoftcore	sparc
+opt/onbld/bin/i386/rpcgen	i386
 opt/onbld/bin/sparc/rpcgen	sparc
+opt/onbld/bin/i386/vtfontcvt	i386
 opt/onbld/bin/sparc/vtfontcvt	sparc
 
 #
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index 3bbabeb7f5..92b768d6d4 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -235,6 +235,7 @@ TIC=		$(ONBLD_TOOLS)/bin/$(MACH)/tic
 ZIC=		$(ONBLD_TOOLS)/bin/$(MACH)/zic
 OPENSSL=	/usr/bin/openssl
 CPCGEN=		$(ONBLD_TOOLS)/bin/$(MACH)/cpcgen
+GENICONVTBL=	$(ONBLD_TOOLS)/bin/$(MACH)/geniconvtbl
 
 DEFAULT_CONSOLE_COLOR=					\
 	-DDEFAULT_ANSI_FOREGROUND=ANSI_COLOR_WHITE	\
diff --git a/usr/src/cmd/geniconvtbl/Makefile b/usr/src/cmd/geniconvtbl/Makefile
index 7ed5411afb..8ad78d87bd 100644
--- a/usr/src/cmd/geniconvtbl/Makefile
+++ b/usr/src/cmd/geniconvtbl/Makefile
@@ -26,7 +26,7 @@
 
 include	../Makefile.cmd
 
-SUBDIRS=	native $(MACH)
+SUBDIRS=	$(MACH)
 $(BUILD64)SUBDIRS +=	$(MACH64)
 
 SAMPLES =	 samples
@@ -35,7 +35,7 @@ all	:= TARGET = all
 install	:= TARGET = install
 clean	:= TARGET = clean
 clobber	:= TARGET = clobber
-_msg	:= TARGET = catalog
+_msg	:= TARGET = _msg
 
 .KEEP_STATE:
 
@@ -43,7 +43,7 @@ _msg	:= TARGET = catalog
 
 all clean clobber install:	$(SUBDIRS) .WAIT $(SAMPLES)
 
-_msg:	$(SUBDIRS)
+_msg:	$(MACH)
 
 $(SUBDIRS) $(SAMPLES):	FRC
 		@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/cmd/geniconvtbl/Makefile.com b/usr/src/cmd/geniconvtbl/Makefile.com
index 66878963a2..5154484248 100644
--- a/usr/src/cmd/geniconvtbl/Makefile.com
+++ b/usr/src/cmd/geniconvtbl/Makefile.com
@@ -24,161 +24,99 @@
 # Copyright (c) 2019, Joyent, Inc.
 #
 
-$(NOT_NATIVE)NATIVE_BUILD = $(POUND_SIGN)
-
-ITM	= geniconvtbl.so
+LIB	= geniconvtbl.so
 PROG	= geniconvtbl
 
-SRCSH1  = iconv_tm.h hash.h
-SRCCH1  = itmcomp.h itm_util.h maptype.h
-SRCSC1  = itmcomp.c assemble.c disassemble.c itm_util.c
-SRCY1   = itm_comp.y
-SRCL1   = itm_comp.l
-SRCI1   = geniconvtbl.c
-
-
-YTABC   = y.tab.c
-YTABH   = y.tab.h
-LEXYY   = lex.yy.c
-YOUT    = y.output
-MAPFILE	= ../mapfile
-
-
-
-SRCSH	= $(SRCSH1:%.h=../%.h)
-SRCCH	= $(SRCCH1:%.h=../%.h)
-SRCSC	= $(SRCSC1:%.c=../%.c)
-SRCI	= $(SRCI1:%.c=../%.c)
-SRCY    = $(SRCY1:%.y=../%.y)
-SRCL    = $(SRCL1:%.l=../%.l)
-
-SRCYC	= $(SRCY:%.y=%.c)
-SRCLC	= $(SRCL:%.l=%.c)
-
-SRCS    = $(SRCSC) $(YTABC) $(LEXYY)
-HDRS	= $(SRCCH1) $(ERNOSTRH)
+SRCDIR  = $(SRC)/cmd/geniconvtbl
 
+MAPFILE	= $(SRCDIR)/mapfile
 
+OBJS    = itmcomp.o assemble.o disassemble.o itm_util.o y.tab.o lex.yy.o
+MSGFILES = itmcomp.i assemble.i disassemble.i itm_util.i y.tab.i lex.yy.i geniconvtbl.i
 
-SED	= sed
-LEXSED	= ../lex.sed
-YACCSED	= ../yacc.sed
-
-
-
-# include ../../../lib/Makefile.lib
-include ../../Makefile.cmd
+include $(SRC)/cmd/Makefile.cmd
 
+POFILE	= geniconvtbl_.po
 
 ROOTDIRS32=	$(ROOTLIB)/iconv
 ROOTDIRS64=	$(ROOTLIB)/iconv/$(MACH64)
-ROOTITM32 =	$(ROOTDIRS32)/$(ITM)
-ROOTITM64 =	$(ROOTDIRS64)/$(ITM)
-
-# defined for some useful targets like clean,
-OBJS	= $(SRCSC1:%.c=%.o) $(YTABC:.c=.o) $(LEXYY:.c=.o)
+ROOTLIB32 =	$(ROOTDIRS32)/$(LIB)
+ROOTLIB64 =	$(ROOTDIRS64)/$(LIB)
 
-CHECKHDRS = $(HDRS%.h=%.check)
+CLOBBERFILES=	$(LIB)
+CLEANFILES =	$(OBJS) y.tab.c y.tab.h lex.yy.c \
+		$(POFILE)
 
-CLOBBERFILES=	$(ITM) $(SRCYC)
-CLEANFILES =	$(OBJS) $(YTABC) $(YTABH) $(LEXYY) $(YOUT) \
-		$(POFILES) $(POFILE)
-
-CPPFLAGS	+= -I. -I..
+CPPFLAGS	+= -I. -I$(SRCDIR)
 CERRWARN	+= $(CNOWARN_UNINIT)
 CERRWARN	+= -_gcc=-Wno-unused-label
 CERRWARN	+= -_gcc=-Wno-switch
 CERRWARN	+= -_gcc=-Wno-unused-variable
 CERRWARN	+= -_gcc=-Wno-implicit-function-declaration
-YFLAGS		+= -d -v
+YFLAGS		+= -d
 CFLAGS		+= -D_FILE_OFFSET_BITS=64
 
 # dump_expr() is too hairy
 SMATCH=off
 
-$(ITM) :=	CFLAGS += $(GSHARED) $(C_PICFLAGS) $(ZTEXT) -h$@
-$(ITM) :=	CPPFLAGS += -D_REENTRANT
-$(ITM) :=	sparc_CFLAGS += -xregs=no%appl
-$(ITM) :=	sparcv9_CFLAGS += -xregs=no%appl
-
-LDLIBS += -lgen
-
-MY_NATIVE_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -I. -I..
-MY_NATIVE_LDFLAGS = $(MAPFILE.NES:%=-Wl,-M%) $(MAPFILE.PGA:%=-Wl,-M%) $(MAPFILE.NED:%=-Wl,-M%) $(ZDIRECT) $(ZLAZYLOAD)
-MY_NATIVE_LDLIBS = -lgen
-
-#
-# Message catalog
-#
-POFILES= $(SRCSC1:%.c=%.po) $(SRCI1:%.c=%.po) \
-		$(SRCY1:%.y=%.po) $(SRCL1:%.l=%.po)
-
-POFILE= geniconvtbl_.po
-
-
-
+$(LIB) :=	LDFLAGS += $(GSHARED) -h$@ $(ZTEXT) $(ZDEFS) $(BDIRECT) \
+		$(C_PICFLAGS) $(MAPFILE:%=-Wl,-M%)			\
+		$(MAPFILE.PGA:%=-Wl,-M%) $(MAPFILE.NED:%=-Wl,-M%)
+$(LIB) :=	CPPFLAGS += -D_REENTRANT
+$(LIB) :=	sparc_CFLAGS += -xregs=no%appl
+$(LIB) :=	sparcv9_CFLAGS += -xregs=no%appl
+$(LIB) :=	LDLIBS += -lc
 
+$(PROG) :=	LDLIBS += -lgen
 
 .KEEP_STATE:
 
-.PARALLEL: $(ITM) $(OBJS)
+.PARALLEL: $(LIB) $(OBJS)
 
 $(PROG): $(OBJS)
 	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
 	$(POST_PROCESS)
 
-$(ITM): $(SRCI)
-	$(CC) $(CFLAGS) $(CPPFLAGS) -Wl,-M$(MAPFILE) -o $@ $(SRCI) $(LDLIBS)
+$(LIB): $(SRCDIR)/geniconvtbl.c
+	$(LINK.c) -o $@ $(SRCDIR)/geniconvtbl.c $(LDLIBS)
 	$(POST_PROCESS_SO)
 
-$(YTABC) $(YTABH): $(SRCY)
-	$(YACC) $(YFLAGS) $(SRCY)
-	@ $(MV) $(YTABC) $(YTABC)~
-	@ $(SED) -f $(YACCSED) $(YTABC)~ > $(YTABC)
-	@ $(RM) $(YTABC)~
-
-$(LEXYY): $(SRCL) $(YTABH)
-	$(LEX) -t $(SRCL) | $(SED) -f $(LEXSED) > $(LEXYY)
-
+y.tab.c + y.tab.h: $(SRCDIR)/itm_comp.y
+	$(YACC) $(YFLAGS) $(SRCDIR)/itm_comp.y
+	@ $(MV) y.tab.c y.tab.c~
+	@ $(SED) -f  $(SRCDIR)/yacc.sed y.tab.c~ > y.tab.c
+	@ $(RM) y.tab.c~
 
-$(POFILE):  .WAIT $(POFILES)
-	$(RM) $@
-	$(CAT) $(POFILES) >$@
-
-$(POFILES): $(SRCSC) $(SRCI) $(SRCY) $(SRCL)
-
-%.po:	../%.c
-	$(COMPILE.cpp) $<  > $<.i
-	$(BUILD.po)
-
-hdrchk: $(HDRCHECKS)
-
-cstyle: $(SRCS)
-	$(DOT_C_CHECK)
+lex.yy.c: $(SRCDIR)/itm_comp.l y.tab.h
+	$(LEX) -t $(SRCDIR)/itm_comp.l | $(SED) -f $(SRCDIR)/lex.sed > $(@)
 
 clean:
 	$(RM) $(CLEANFILES)
 
+$(POFILE): $(MSGFILES)
+	$(BUILDPO.msgfiles)
+
 %.o:	%.c
 	$(COMPILE.c) $<
 
-%.o:	../%.c
+%.o:	$(SRCDIR)/%.c
 	$(COMPILE.c) $<
 
+%.i:	$(SRCDIR)/%.c
+	$(CPPFORPO) $< > $@
+
 # install rule
 $(ROOTDIRS32)/%: $(ROOTDIRS32) %
-	-$(INS.file)
+	$(INS.file)
 
 $(ROOTDIRS64)/%: $(ROOTDIRS64) %
-	-$(INS.file)
+	$(INS.file)
 
 $(ROOTDIRS32): $(ROOTLIB)
-	-$(INS.dir)
+	$(INS.dir)
 
 $(ROOTDIRS64): $(ROOTDIRS32)
-	-$(INS.dir)
-
-$(ROOTLIB) $(ROOTBIN):
-	-$(INS.dir)
+	$(INS.dir)
 
-include ../../Makefile.targ
+include $(SRC)/cmd/Makefile.targ
+include $(SRC)/Makefile.msg.targ
diff --git a/usr/src/cmd/geniconvtbl/amd64/Makefile b/usr/src/cmd/geniconvtbl/amd64/Makefile
index 6faaf24145..77c9257990 100644
--- a/usr/src/cmd/geniconvtbl/amd64/Makefile
+++ b/usr/src/cmd/geniconvtbl/amd64/Makefile
@@ -23,26 +23,12 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 .KEEP_STATE:
 
-
-
 include ../Makefile.com
 include ../../Makefile.cmd.64
 
-#catalog: $(MSGDOMAIN64) $(POFILE)
-#	$(RM) $(MSGDOMAIN64)/$(POFILE)
-#	$(CP) $(POFILE) $(MSGDOMAIN64)
-
-lint := SRCS = $(SRCI)
-
-all: $(ITM)
-
-install: all  $(ROOTITM64) $(ROOTLINKS64)
-
-both: $(ITM) $(PROG)
+all: $(LIB)
 
-catalog:
+install: all  $(ROOTLIB64) $(ROOTLINKS64)
diff --git a/usr/src/cmd/geniconvtbl/i386/Makefile b/usr/src/cmd/geniconvtbl/i386/Makefile
index 7b2fd74210..b50960a70f 100644
--- a/usr/src/cmd/geniconvtbl/i386/Makefile
+++ b/usr/src/cmd/geniconvtbl/i386/Makefile
@@ -22,19 +22,15 @@
 # Copyright 1999, 2003 Sun Microsystems, Inc.
 # All rights reserved.
 # Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# cmd/geniconvtbl/i386/Makefile
 
 .KEEP_STATE:
 
 include ../Makefile.com
 
-catalog: $(MSGDOMAIN) $(POFILE)
-	$(RM) $(MSGDOMAIN)/$(POFILE)
-	$(CP) $(POFILE) $(MSGDOMAIN)
+_msg: $(MSGDOMAINPOFILE)
+
+all:	$(PROG) $(LIB)
+
+install: all $(ROOTBIN) $(ROOTPROG) $(ROOTLIB32) $(ROOTLINKS32)
 
-all:	$(PROG) $(ITM) $(NATIVEPROG)
 
-install: all $(ROOTBIN) $(ROOTPROG) $(ROOTITM32) $(ROOTLINKS32)
diff --git a/usr/src/cmd/geniconvtbl/samples/Makefile b/usr/src/cmd/geniconvtbl/samples/Makefile
index 85a33593d3..514fe32281 100644
--- a/usr/src/cmd/geniconvtbl/samples/Makefile
+++ b/usr/src/cmd/geniconvtbl/samples/Makefile
@@ -21,27 +21,19 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# cmd/geniconvtbl/samples/Makefile
-
 
 INPUTFILES = ISO8859-1_to_UTF-8.src UTF-8_to_ISO8859-1.src\
 		eucJP_to_ISO-2022-JP.src ISO-2022-JP_to_eucJP.src \
 		ISO646_to_ISO8859-1.src ISO8859-1_to_ISO646.src
-		
+
 OUTPUTFILES	= ISO646%ISO8859-1.bt ISO8859-1%ISO646.bt
-# ONLY TWO binarytables are deribalables
+# ONLY TWO binarytables are deliverables
 
 #		ISO8859-1%UTF-8.bt UTF-8%ISO8859-1.bt
 #		eucJP%ISO-2022-JP.bt ISO-2022-JP%eucJP.bt \
-#		ISO646%ISO8859-1.bt ISO8859-1%ISO646.bt 
+#		ISO646%ISO8859-1.bt ISO8859-1%ISO646.bt
 # OUTPUTFILES	= $(INPUTFILES:%.src=%.bt)   NEVER USE ( WATCH OUT FILE NAME )
 
-
-GENICONVTBL= ../native/geniconvtbl
-
-
 # include ../../../lib/Makefile.lib
 include ../../Makefile.cmd
 
@@ -79,8 +71,8 @@ UTF-8%ISO8859_1.bt: UTF-8_to_ISO8859_1.src
 eucJP%ISO-2022-JP.bt: eucJP_to_ISO-2022-JP.src
 	$(GENICONVTBL) -o $@ -f eucJP_to_ISO-2022-JP.src
 
-ISO-2022-JP%eucJP.bt: ISO-2022-JP_to_eucJP.src 
-	$(GENICONVTBL) -o $@ -f ISO-2022-JP_to_eucJP.src 
+ISO-2022-JP%eucJP.bt: ISO-2022-JP_to_eucJP.src
+	$(GENICONVTBL) -o $@ -f ISO-2022-JP_to_eucJP.src
 
 ISO646%ISO8859-1.bt: ISO646_to_ISO8859-1.src
 	$(GENICONVTBL) -o $@ -f ISO646_to_ISO8859-1.src
@@ -90,14 +82,14 @@ ISO8859-1%ISO646.bt: ISO8859-1_to_ISO646.src
 
 
 # install rule
-# 
+#
 $(SRCSDIRS)/%: % $(SRCSDIRS)
 	$(INS.file)
 
 $(BTSDIRS)/%: % $(BTSDIRS)
 	$(INS.file)
 
-$(SRCSDIRS) $(BTSDIRS): $(ROOTDIRS) 
+$(SRCSDIRS) $(BTSDIRS): $(ROOTDIRS)
 	$(INS.dir)
 
 $(ROOTDIRS): $(ROOTICONVDIRS)
@@ -120,6 +112,6 @@ $(BTSDIRS)/%: $(BTSDIRS) %
 
 #
 # %.bt:	%.src
-#	$(GENICONVTBL) -o $@ -f $< 
+#	$(GENICONVTBL) -o $@ -f $<
 
 #   include ../../Makefile.targ
diff --git a/usr/src/cmd/geniconvtbl/sparc/Makefile b/usr/src/cmd/geniconvtbl/sparc/Makefile
index 8d07afa773..c6120df896 100644
--- a/usr/src/cmd/geniconvtbl/sparc/Makefile
+++ b/usr/src/cmd/geniconvtbl/sparc/Makefile
@@ -23,18 +23,13 @@
 # All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# cmd/geniconvtbl/sparc/Makefile
 
 .KEEP_STATE:
 
 include ../Makefile.com
 
-catalog: $(MSGDOMAIN) $(POFILE)
-	$(RM) $(MSGDOMAIN)/$(POFILE)
-	$(CP) $(POFILE) $(MSGDOMAIN)
+_msg: $(MSGDOMAINPOFILE)
 
-all:	$(PROG) $(ITM) $(NATIVEPROG)
+all:	$(PROG) $(LIB)
 
-install: all $(ROOTBIN) $(ROOTPROG) $(ROOTITM32) $(ROOTLINKS32)
+install: all $(ROOTBIN) $(ROOTPROG) $(ROOTLIB32) $(ROOTLINKS32)
diff --git a/usr/src/cmd/geniconvtbl/sparcv9/Makefile b/usr/src/cmd/geniconvtbl/sparcv9/Makefile
index fdfde784dd..be3745875c 100644
--- a/usr/src/cmd/geniconvtbl/sparcv9/Makefile
+++ b/usr/src/cmd/geniconvtbl/sparcv9/Makefile
@@ -22,27 +22,12 @@
 # Copyright (c) 1999 by Sun Microsystems, Inc.
 # All rights reserved.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# cmd/geniconvtbl/sparcv9/Makefile
 
 .KEEP_STATE:
 
-
-
 include ../Makefile.com
 include ../../Makefile.cmd.64
 
-#catalog: $(MSGDOMAIN64) $(POFILE)
-#	$(RM) $(MSGDOMAIN64)/$(POFILE)
-#	$(CP) $(POFILE) $(MSGDOMAIN64)
-
-lint := SRCS = $(SRCI)
-
-all: $(ITM)
-
-install: all  $(ROOTITM64) $(ROOTLINKS64)
-
-both: $(ITM) $(PROG)
+all: $(LIB)
 
-catalog:
+install: all  $(ROOTLIB64) $(ROOTLINKS64)
diff --git a/usr/src/lib/iconv_modules/utf-8/Makefile b/usr/src/lib/iconv_modules/utf-8/Makefile
index 472066bc7e..cc14caf0c0 100644
--- a/usr/src/lib/iconv_modules/utf-8/Makefile
+++ b/usr/src/lib/iconv_modules/utf-8/Makefile
@@ -43,7 +43,6 @@ INPUTFILES1	= $(CODESETS:%=%+UTF-8.src)
 INPUTFILES2	= $(CODESETS:%=UTF-8+%.src)
 INPUTFILES	= $(INPUTFILES1) $(INPUTFILES2)
 BINARYTABLES	= $(INPUTFILES:%.src=%.bt)
-GENICONVTBL	= /usr/bin/geniconvtbl
 GENI_SRCS	= common/binarytables/srcs
 ICONV_DIR	= $(ROOT)/usr/lib/iconv
 BTS_DIR		= $(ICONV_DIR)/geniconvtbl/binarytables
diff --git a/usr/src/tools/Makefile b/usr/src/tools/Makefile
index 3ddfad375e..3c1d9097a7 100644
--- a/usr/src/tools/Makefile
+++ b/usr/src/tools/Makefile
@@ -40,97 +40,98 @@ include ../Makefile.master
 # Anything built before 'install.bin' is present must override binary
 # installation rules in their makefiles. This includes the Makefile for
 # 'install.bin' itself.
-BOOT_SUBDIRS= \
-	smatch \
-	.WAIT \
-	cw \
-	.WAIT \
-	install.bin \
-	.WAIT \
+BOOT_SUBDIRS=		\
+	smatch		\
+	.WAIT		\
+	cw		\
+	.WAIT		\
+	install.bin	\
+	.WAIT		\
 	ctf
 
-COMMON_SUBDIRS= \
-	codesign \
-	cscope-fast \
-	env \
-	findunref \
-	lintdump \
-	make \
-	makesoftcore \
-	ndrgen \
-	onbld \
-	protocmp \
-	protolist \
-	scripts \
+COMMON_SUBDIRS=		\
+	codesign	\
+	cscope-fast	\
+	env		\
+	findunref	\
+	lintdump	\
+	make		\
+	makesoftcore	\
+	ndrgen		\
+	onbld		\
+	protocmp	\
+	protolist	\
+	scripts		\
 	sgs
 
 #
 #  special versions of commands for use only in build
 #
-UNSHIPPED_SUBDIRS = \
-	$(SGSMSG) \
-	$(SGSLIBCONV) \
-	$(SGSLIBELF) \
-	$(SGSLIBLDDBG) \
-	$(SGSLIBLD) \
-	$(SGSLD) \
-	localedef \
-	mandoc \
-	rpcgen \
-	tic \
-	vtfontcvt \
+UNSHIPPED_SUBDIRS =		\
+	$(SGSMSG)		\
+	$(SGSLIBCONV)		\
+	$(SGSLIBELF)		\
+	$(SGSLIBLDDBG)		\
+	$(SGSLIBLD)		\
+	$(SGSLD)		\
+	geniconvtbl		\
+	localedef		\
+	mandoc			\
+	rpcgen			\
+	tic			\
+	vtfontcvt		\
 	zic
 
-sparc_SUBDIRS= \
-	chk4ubin \
-	stabs \
+sparc_SUBDIRS=			\
+	chk4ubin		\
+	stabs			\
 	tokenize
 
-i386_SUBDIRS=		\
-	aw		\
-	cpcgen		\
-	elfextract	\
-	mbh_patch	\
+i386_SUBDIRS=			\
+	aw			\
+	cpcgen			\
+	elfextract		\
+	mbh_patch		\
 	btxld
 
 $(INTEL_BLD)sgs: aw
 
-SUBDIRS= \
-	$($(MACH)_SUBDIRS) \
-	$(COMMON_SUBDIRS) \
+SUBDIRS=			\
+	$($(MACH)_SUBDIRS)	\
+	$(COMMON_SUBDIRS)	\
 	$(UNSHIPPED_SUBDIRS)
 
 include Makefile.tools
 
-ROOTDIRS= \
-	$(ROOTOPT) \
-	$(ROOTONBLD) \
-	$(ROOTONBLD)/bin \
-	$(ROOTONBLD)/bin/$(MACH) \
-	$(ROOTONBLD)/lib \
-	$(ROOTONBLD)/lib/$(MACH) \
-	$(ROOTONBLD)/lib/$(MACH)/64 \
-	$(ROOTONBLD)/lib/perl \
-	$(ROOTONBLD)/env \
-	$(ROOTONBLD)/etc \
-	$(ROOTONBLD)/etc/exception_lists \
-	$(ROOTONBLD)/share \
-	$(ROOTONBLD)/man \
+ROOTDIRS=					\
+	$(ROOTOPT)				\
+	$(ROOTONBLD)				\
+	$(ROOTONBLD)/bin			\
+	$(ROOTONBLD)/bin/$(MACH)		\
+	$(ROOTONBLD)/lib			\
+	$(ROOTONBLD)/lib/$(MACH)		\
+	$(ROOTONBLD)/lib/$(MACH)/64		\
+	$(ROOTONBLD)/lib/perl			\
+	$(ROOTONBLD)/env			\
+	$(ROOTONBLD)/etc			\
+	$(ROOTONBLD)/etc/exception_lists	\
+	$(ROOTONBLD)/share			\
+	$(ROOTONBLD)/man			\
 	$(ROOTONBLD)/man/man1onbld
 
 $(BUILDPY2TOOLS)ROOTDIRS += \
-	$(ROOTONBLD)/lib/python$(PYTHON_VERSION) \
-	$(ROOTONBLD)/lib/python$(PYTHON_VERSION)/onbld \
-	$(ROOTONBLD)/lib/python$(PYTHON_VERSION)/onbld/Checks \
+	$(ROOTONBLD)/lib/python$(PYTHON_VERSION)		\
+	$(ROOTONBLD)/lib/python$(PYTHON_VERSION)/onbld		\
+	$(ROOTONBLD)/lib/python$(PYTHON_VERSION)/onbld/Checks	\
 	$(ROOTONBLD)/lib/python$(PYTHON_VERSION)/onbld/Scm
 
-$(BUILDPY3TOOLS)ROOTDIRS += \
-	$(ROOTONBLD)/lib/python$(PYTHON3_VERSION) \
-	$(ROOTONBLD)/lib/python$(PYTHON3_VERSION)/onbld \
-	$(ROOTONBLD)/lib/python$(PYTHON3_VERSION)/onbld/__pycache__ \
-	$(ROOTONBLD)/lib/python$(PYTHON3_VERSION)/onbld/Checks \
-	$(ROOTONBLD)/lib/python$(PYTHON3_VERSION)/onbld/Checks/__pycache__ \
-	$(ROOTONBLD)/lib/python$(PYTHON3_VERSION)/onbld/Scm \
+$(BUILDPY3TOOLS)ROOTDIRS +=							\
+	$(ROOTONBLD)/lib/python$(PYTHON3_VERSION)				\
+	$(ROOTONBLD)/lib/python$(PYTHON3_VERSION)/onbld				\
+	$(ROOTONBLD)/lib/python$(PYTHON3_VERSION)/onbld/__pycache__		\
+	$(ROOTONBLD)/lib/python$(PYTHON3_VERSION)/onbld/Checks			\
+	$(ROOTONBLD)/lib/python$(PYTHON3_VERSION)/onbld/Checks/__pycache__	\
+	$(ROOTONBLD)/lib/python$(PYTHON3_VERSION)/onbld/Scm			\
 	$(ROOTONBLD)/lib/python$(PYTHON3_VERSION)/onbld/Scm/__pycache__
 
 all :=		TARGET= install
diff --git a/usr/src/cmd/geniconvtbl/native/Makefile b/usr/src/tools/geniconvtbl/Makefile
index bb795a07f3..74cc5628f5 100644
--- a/usr/src/cmd/geniconvtbl/native/Makefile
+++ b/usr/src/tools/geniconvtbl/Makefile
@@ -26,19 +26,22 @@
 
 .KEEP_STATE:
 
-NOT_NATIVE = $(POUND_SIGN)              # tell Makefile.com we're native
+include	$(SRC)/cmd/Makefile.cmd
+include $(SRC)/cmd/geniconvtbl/Makefile.com
+include $(SRC)/tools/Makefile.tools
 
-include ../Makefile.com
+CPPFLAGS	= -I. -I$(SRCDIR)
+CERRWARN	+= $(CNOWARN_UNINIT)
+CERRWARN	+= -_gcc=-Wno-unused-label
+CERRWARN	+= -_gcc=-Wno-switch
+CERRWARN	+= -_gcc=-Wno-unused-variable
+CERRWARN	+= -_gcc=-Wno-implicit-function-declaration
+YFLAGS		+= -d
+CFLAGS		+= -D_FILE_OFFSET_BITS=64
 
-CC =		$(NATIVECC)
-LD =		$(NATIVELD)
-CFLAGS =	$(NATIVE_CFLAGS)
-CPPFLAGS =	$(MY_NATIVE_CPPFLAGS)
-LDFLAGS =	$(MY_NATIVE_LDFLAGS)
-LDLIBS =	$(MY_NATIVE_LDLIBS)
-NATIVE_LIBS +=	libgen.so libc.so
-POST_PROCESS =
+LDLIBS		+= -lgen -lc
+NATIVE_LIBS	+= libgen.so libc.so
 
-all install:	$(PROG)
+install: $(ROOTONBLDMACHPROG)
 
-catalog:
+all: $(PROG)