6835279 multiple races building idmap_prot.h

--HG--
rename : usr/src/head/rpcsvc/idmap_prot.x => usr/src/uts/common/rpcsvc/idmap_prot.x

26 files changed, 71 insertions, 105 deletions

diff --git a/usr/src/cmd/idmap/idmapd/Makefile b/usr/src/cmd/idmap/idmapd/Makefile
index bb724b95db..2010d731ca 100644
--- a/usr/src/cmd/idmap/idmapd/Makefile
+++ b/usr/src/cmd/idmap/idmapd/Makefile
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
@@ -40,10 +40,6 @@ clobber :=	TARGET = clobber
 LIBSQLITE =	$(ROOT)/usr/lib/libsqlite.o
 SQLITELINT =	$(ROOT)/usr/lib/llib-lsqlite.ln
 
-IDMAP_PROT_DIR =        $(SRC)/head/rpcsvc
-IDMAP_PROT_X =          $(IDMAP_PROT_DIR)/idmap_prot.x
-IDMAP_PROT_H =          $(IDMAP_PROT_DIR)/idmap_prot.h
-
 include ../../Makefile.cmd
 
 POFILE =	$(PROG)_all.po
@@ -51,13 +47,12 @@ POFILE =	$(PROG)_all.po
 ROOTMANIFESTDIR = $(ROOTSVCSYSTEM)
 $(ROOTMANIFEST) := FILEMODE= 444
 
-INCS += -I. -I../../../lib/libidmap/common -I$(IDMAP_PROT_DIR)\
+INCS += -I. -I../../../lib/libidmap/common\
 	 -I../../../lib/libsldap/common\
 	 -I../../../lib/libadutils/common
 
 $(OBJS) := CPPFLAGS += $(INCS) -D_REENTRANT
 $(POFILE) := CPPFLAGS += $(INCS)
-CLOBBERFILES += $(IDMAP_PROT_H)
 
 CFLAGS += -v
 LDLIBS += -lsecdb -lsocket -lnsl -lidmap -lscf -lsldap -lldap -luuid -ladutils
@@ -79,10 +74,7 @@ lint := LDLIBS += $(SQLITELINT)
 
 all: $(PROG)
 
-$(IDMAP_PROT_H):	$(IDMAP_PROT_X)
-	$(RM) $@; $(RPCGEN) -CMNh -o $@ $(IDMAP_PROT_X)
-
-$(PROG): $(IDMAP_PROT_H) $(OBJS) $$(MAPFILES)
+$(PROG): $(OBJS) $$(MAPFILES)
 	$(LINK.c) -o $@ $(OBJS) $(LIBSQLITE) $(LDLIBS)
 	$(POST_PROCESS)
 
diff --git a/usr/src/cmd/idmap/idmapd/adutils.h b/usr/src/cmd/idmap/idmapd/adutils.h
index 6b722749ac..a6195bf035 100644
--- a/usr/src/cmd/idmap/idmapd/adutils.h
+++ b/usr/src/cmd/idmap/idmapd/adutils.h
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -48,7 +48,7 @@ extern "C" {
 #include <time.h>
 #include <thread.h>
 #include <synch.h>
-#include "idmap_prot.h"
+#include <rpcsvc/idmap_prot.h>
 #include "libadutils.h"
 #include <sys/idmap.h>
 
diff --git a/usr/src/cmd/idmap/idmapd/idmapd.h b/usr/src/cmd/idmap/idmapd/idmapd.h
index c225c3f47e..404facea9d 100644
--- a/usr/src/cmd/idmap/idmapd/idmapd.h
+++ b/usr/src/cmd/idmap/idmapd/idmapd.h
@@ -37,7 +37,7 @@
 #include <sqlite/sqlite.h>
 #include <syslog.h>
 #include <inttypes.h>
-#include "idmap_prot.h"
+#include <rpcsvc/idmap_prot.h>
 #include "adutils.h"
 #include "idmap_priv.h"
 #include "idmap_config.h"
diff --git a/usr/src/cmd/idmap/idmapd/nldaputils.h b/usr/src/cmd/idmap/idmapd/nldaputils.h
index bdd17fe2af..7ec05d8f6f 100644
--- a/usr/src/cmd/idmap/idmapd/nldaputils.h
+++ b/usr/src/cmd/idmap/idmapd/nldaputils.h
@@ -34,7 +34,7 @@
 #include <libintl.h>
 #include <strings.h>
 #include <inttypes.h>
-#include "idmap_prot.h"
+#include <rpcsvc/idmap_prot.h>
 #include "idmapd.h"
 #include "idmap_config.h"
 
diff --git a/usr/src/cmd/idmap/idmapd/rpc_svc.c b/usr/src/cmd/idmap/idmapd/rpc_svc.c
index cc75053740..44cb9f2471 100644
--- a/usr/src/cmd/idmap/idmapd/rpc_svc.c
+++ b/usr/src/cmd/idmap/idmapd/rpc_svc.c
@@ -19,19 +19,17 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * RPC service routines
  * It was initially generated using rpcgen.
  */
 
 #include "idmapd.h"
-#include "idmap_prot.h"
+#include <rpcsvc/idmap_prot.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <rpc/xdr.h>
diff --git a/usr/src/cmd/idmap/req.flg b/usr/src/cmd/idmap/req.flg
index 1b5d312e4f..98a8a62122 100644
--- a/usr/src/cmd/idmap/req.flg
+++ b/usr/src/cmd/idmap/req.flg
@@ -19,12 +19,8 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 
-echo_file usr/src/head/Makefile
-echo_file usr/src/head/rpcsvc/idmap_prot.x
 echo_file usr/src/lib/libidmap/Makefile
diff --git a/usr/src/lib/libadutils/Makefile b/usr/src/lib/libadutils/Makefile
index f3e3636e44..c7e81dec5a 100644
--- a/usr/src/lib/libadutils/Makefile
+++ b/usr/src/lib/libadutils/Makefile
@@ -28,10 +28,6 @@ include $(SRC)/lib/Makefile.lib
 SUBDIRS	=	$(MACH)
 $(BUILD64)SUBDIRS += $(MACH64)
 
-# Both MACH and MACH64 subdirs invoke rpcgen on the same file,
-# so to prevent collisions, we turn off parallelism.
-.NO_PARALLEL:	$(SUBDIRS)
-
 all := 		TARGET = all
 clean :=	TARGET = clean
 clobber :=	TARGET = clobber
diff --git a/usr/src/lib/libadutils/Makefile.com b/usr/src/lib/libadutils/Makefile.com
index e4f524a09f..0adac33c04 100644
--- a/usr/src/lib/libadutils/Makefile.com
+++ b/usr/src/lib/libadutils/Makefile.com
@@ -35,23 +35,14 @@ LDLIBS +=	-lc -lldap -lresolv -lsocket -lnsl
 SRCDIR =	../common
 $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 
-IDMAP_PROT_DIR =	$(SRC)/head/rpcsvc
-IDMAP_PROT_X =		$(IDMAP_PROT_DIR)/idmap_prot.x
-IDMAP_PROT_H =		$(IDMAP_PROT_DIR)/idmap_prot.h
-
 CFLAGS +=	$(CCVERBOSE)
-CPPFLAGS +=	-D_REENTRANT -I$(SRCDIR) -I$(IDMAP_PROT_DIR)
-
-CLOBBERFILES +=	$(IDMAP_PROT_H)
+CPPFLAGS +=	-D_REENTRANT -I$(SRCDIR)
 
 lint := OBJECTS = $(LINT_OBJECTS)
 
 .KEEP_STATE:
 
-all: $(IDMAP_PROT_H) $(LIBS)
-
-$(IDMAP_PROT_H):	$(IDMAP_PROT_X)
-	$(RM) $@; $(RPCGEN) -CMNh -o $@ $(IDMAP_PROT_X)
+all: $(LIBS)
 
 lint: lintcheck
 
diff --git a/usr/src/lib/libadutils/common/addisc.h b/usr/src/lib/libadutils/common/addisc.h
index 2d6d1a2b47..faf3393523 100644
--- a/usr/src/lib/libadutils/common/addisc.h
+++ b/usr/src/lib/libadutils/common/addisc.h
@@ -27,7 +27,7 @@
 #ifndef	_ADINFO_H
 #define	_ADINFO_H
 
-#include "idmap_prot.h"
+#include <rpcsvc/idmap_prot.h>
 
 
 #ifdef __cplusplus
diff --git a/usr/src/lib/libadutils/common/adutils_impl.h b/usr/src/lib/libadutils/common/adutils_impl.h
index 3c9de84ba3..563fa892ec 100644
--- a/usr/src/lib/libadutils/common/adutils_impl.h
+++ b/usr/src/lib/libadutils/common/adutils_impl.h
@@ -32,7 +32,7 @@
 #include <ldap.h>
 #include <pthread.h>
 #include "addisc.h"
-#include "idmap_prot.h"
+#include <rpcsvc/idmap_prot.h>
 #include "libadutils.h"
 
 #ifdef	__cplusplus
diff --git a/usr/src/lib/libidmap/Makefile b/usr/src/lib/libidmap/Makefile
index f7e9e4ee79..b1ac710759 100644
--- a/usr/src/lib/libidmap/Makefile
+++ b/usr/src/lib/libidmap/Makefile
@@ -31,10 +31,6 @@ HDRDIR =	common
 SUBDIRS	=	$(MACH)
 $(BUILD64)SUBDIRS += $(MACH64)
 
-# Both MACH and MACH64 subdirs invoke rpcgen on the same file,
-# so to prevent collisions, we turn off parallelism.
-.NO_PARALLEL:	$(SUBDIRS)
-
 POFILE =	libidmap.po
 MSGFILES =	`$(GREP) -l gettext common/*.[ch]`
 XGETFLAGS =	-a
diff --git a/usr/src/lib/libidmap/Makefile.com b/usr/src/lib/libidmap/Makefile.com
index 262be28278..985987407f 100644
--- a/usr/src/lib/libidmap/Makefile.com
+++ b/usr/src/lib/libidmap/Makefile.com
@@ -39,27 +39,22 @@ CPPFLAGS += -I$(SRC)/lib/libsldap/common
 SRCDIR =	../common
 $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 
-IDMAP_PROT_DIR =	$(SRC)/head/rpcsvc
-IDMAP_PROT_X =		$(IDMAP_PROT_DIR)/idmap_prot.x
-IDMAP_PROT_H =		$(IDMAP_PROT_DIR)/idmap_prot.h
+IDMAP_PROT_X =		$(SRC)/uts/common/rpcsvc/idmap_prot.x
 
 ADUTILS_DIR =		$(SRC)/lib/libadutils/common
 
 CFLAGS +=	$(CCVERBOSE)
-CPPFLAGS +=	-D_REENTRANT -I$(SRCDIR) -I$(IDMAP_PROT_DIR) -I$(ADUTILS_DIR)
+CPPFLAGS +=	-D_REENTRANT -I$(SRCDIR) -I$(ADUTILS_DIR)
 
-CLOBBERFILES +=	$(IDMAP_PROT_H) $(SRCDIR)/idmap_xdr.c
+CLOBBERFILES +=	idmap_xdr.c
 
 lint := OBJECTS = $(LINT_OBJECTS)
 
 .KEEP_STATE:
 
-all: $(IDMAP_PROT_H) $(LIBS)
+all: $(LIBS)
 
-$(IDMAP_PROT_H):	$(IDMAP_PROT_X)
-	$(RM) $@; $(RPCGEN) -CMNh -o $@ $(IDMAP_PROT_X)
-
-$(SRCDIR)/idmap_xdr.c:	$(IDMAP_PROT_H) $(IDMAP_PROT_X)
+idmap_xdr.c:	$(IDMAP_PROT_X)
 	$(RM) $@; $(RPCGEN) -CMNc -o $@ $(IDMAP_PROT_X)
 
 lint: lintcheck
diff --git a/usr/src/lib/libidmap/common/idmap_cache.c b/usr/src/lib/libidmap/common/idmap_cache.c
index f83b65ee08..7d58d079b5 100644
--- a/usr/src/lib/libidmap/common/idmap_cache.c
+++ b/usr/src/lib/libidmap/common/idmap_cache.c
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -38,7 +38,7 @@
 #include <sys/idmap.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include "idmap_prot.h"
+#include <rpcsvc/idmap_prot.h>
 #include "idmap_cache.h"
 
 
diff --git a/usr/src/lib/libidmap/common/idmap_impl.h b/usr/src/lib/libidmap/common/idmap_impl.h
index 854a5911d6..15f054a008 100644
--- a/usr/src/lib/libidmap/common/idmap_impl.h
+++ b/usr/src/lib/libidmap/common/idmap_impl.h
@@ -35,7 +35,7 @@
 #include <libscf.h>
 #include <resolv.h>
 
-#include "idmap_prot.h"
+#include <rpcsvc/idmap_prot.h>
 #include "idmap_priv.h"
 
 
diff --git a/usr/src/lib/libidmap/common/idmap_priv.h b/usr/src/lib/libidmap/common/idmap_priv.h
index 8b2e200977..ad08404f77 100644
--- a/usr/src/lib/libidmap/common/idmap_priv.h
+++ b/usr/src/lib/libidmap/common/idmap_priv.h
@@ -35,7 +35,7 @@
 #include <resolv.h>
 
 #include "idmap.h"
-#include "idmap_prot.h"
+#include <rpcsvc/idmap_prot.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/usr/src/lib/nsswitch/ad/common/ad_common.h b/usr/src/lib/nsswitch/ad/common/ad_common.h
index a6c74fba02..a328b00b9a 100644
--- a/usr/src/lib/nsswitch/ad/common/ad_common.h
+++ b/usr/src/lib/nsswitch/ad/common/ad_common.h
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -39,7 +39,7 @@ extern "C" {
 #include <signal.h>
 #include <idmap.h>
 #include <sys/idmap.h>
-#include <idmap_prot.h>
+#include <rpcsvc/idmap_prot.h>
 #include <idmap_priv.h>
 #include "addisc.h"
 #include "libadutils.h"
diff --git a/usr/src/pkgdefs/etc/exception_list_i386 b/usr/src/pkgdefs/etc/exception_list_i386
index 4cbd44e52b..316a9f7963 100644
--- a/usr/src/pkgdefs/etc/exception_list_i386
+++ b/usr/src/pkgdefs/etc/exception_list_i386
@@ -1246,3 +1246,7 @@ usr/include/sys/stmf_sbd_ioctl.h	i386
 usr/lib/fm/dict/TEST.dict		i386
 usr/lib/locale/C/LC_MESSAGES/TEST.mo	i386
 usr/lib/locale/C/LC_MESSAGES/TEST.po	i386
+
+# Private idmap RPC protocol
+usr/include/rpcsvc/idmap_prot.h		i386
+usr/include/rpcsvc/idmap_prot.x		i386
diff --git a/usr/src/pkgdefs/etc/exception_list_sparc b/usr/src/pkgdefs/etc/exception_list_sparc
index ea87309e5d..84a50e963f 100644
--- a/usr/src/pkgdefs/etc/exception_list_sparc
+++ b/usr/src/pkgdefs/etc/exception_list_sparc
@@ -1345,3 +1345,7 @@ usr/include/sys/stmf_sbd_ioctl.h	sparc
 usr/lib/fm/dict/TEST.dict		sparc
 usr/lib/locale/C/LC_MESSAGES/TEST.mo	sparc
 usr/lib/locale/C/LC_MESSAGES/TEST.po	sparc
+
+# Private idmap RPC protocol
+usr/include/rpcsvc/idmap_prot.h		sparc
+usr/include/rpcsvc/idmap_prot.x		sparc
diff --git a/usr/src/uts/Makefile b/usr/src/uts/Makefile
index abdab6d9d4..d90b0f04fb 100644
--- a/usr/src/uts/Makefile
+++ b/usr/src/uts/Makefile
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # include global definitions
@@ -87,18 +87,6 @@ def all lint: all_h $(PMTMO_FILE) $($(MACH)_ARCHITECTURES)
 
 install: all_h install_dirs $(PMTMO_FILE) $($(MACH)_ARCHITECTURES)
 
-clean clobber: $($(MACH)_ARCHITECTURES)
-	@if [ '$(PATCH_BUILD)' != '#' ] ; then \
-		echo $(RM) $(PMTMO_FILE) ; \
-		$(RM) $(PMTMO_FILE) ; \
-	fi
-
-EXTRA_CLOBBER_TARGETS= common/avs/ns/rdc
-clobber: $(EXTRA_CLOBBER_TARGETS)
-
-
-clean.lint modlist: $($(MACH)_ARCHITECTURES)
-
 install_dirs:
 	@cd ..; pwd; $(MAKE) rootdirs
 	@pwd
@@ -169,6 +157,14 @@ COMMON_HDRDIRS= common/avs \
 # are simple enough that they can be driven from the src tree.
 $(CLOSED_BUILD)COMMON_HDRDIRS += $(CLOSED)/uts/common/sys
 
+#
+# Subset of COMMON_HDRDIRS in which at least one header is generated
+# at runtime (e.g., rpcgen).  (This is a partial list; there are
+# other directories that should be included and do not yet have the
+# necessary Makefile support.  See 6414855.)
+#
+DYNHDRDIRS = common/rpcsvc common/idmap
+
 sparc_HDRDIRS= sun/sys
 i386_HDRDIRS= i86pc/vm i86xpv/vm
 
@@ -188,6 +184,18 @@ all_h: FRC
 	@cd common/gssapi; pwd; $(MAKE) $@
 	@cd common/idmap; pwd; $(MAKE) $@
 
+clean clobber: $($(MACH)_ARCHITECTURES) $(DYNHDRDIRS)
+	@if [ '$(PATCH_BUILD)' != '#' ] ; then \
+		echo $(RM) $(PMTMO_FILE) ; \
+		$(RM) $(PMTMO_FILE) ; \
+	fi
+
+EXTRA_CLOBBER_TARGETS= common/avs/ns/rdc
+clobber: $(EXTRA_CLOBBER_TARGETS)
+
+
+clean.lint modlist: $($(MACH)_ARCHITECTURES)
+
 ONC_FILES=	common/io/timod.c \
 		common/os/sig.c \
 		common/os/flock.c \
diff --git a/usr/src/uts/common/idmap/Makefile b/usr/src/uts/common/idmap/Makefile
index 6d4d07e647..e88c7dfbbe 100755..100644
--- a/usr/src/uts/common/idmap/Makefile
+++ b/usr/src/uts/common/idmap/Makefile
@@ -18,23 +18,20 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"	
-#
 # uts/common/idmap/Makefile
 #
 # include global definitions
 include ../../../Makefile.master
 
-IDMAP_PROT_DIR= 	$(SRC)/head/rpcsvc
+IDMAP_PROT_DIR= 	$(SRC)/uts/common/rpcsvc
 
 IDMAP_PROT_X=		$(IDMAP_PROT_DIR)/idmap_prot.x
 DERIVED_SRCS=		idmap_xdr.c
-DERIVED_HDRS=		$(IDMAP_PROT_DIR)/idmap_prot.h
-DERIVED_FILES=		$(DERIVED_SRCS) $(DERIVED_HDRS)
+DERIVED_FILES=		$(DERIVED_SRCS)
 HDRS=			kidmap_priv.h
 CHECKHDRS=		$(HDRS:%.h=%.check)
 
@@ -51,11 +48,9 @@ idmap_xdr.c:	$(IDMAP_PROT_X)
 	$(RM) $@
 	$(RPCGEN) -CMNc -D_KERNEL -o $@ $(IDMAP_PROT_X)
 
-$(IDMAP_PROT_DIR)/idmap_prot.h:	$(IDMAP_PROT_X)
-	$(RM) $@
-	$(RPCGEN) -CMNh -o $@ $(IDMAP_PROT_X)
-
 check:	$(CHECKHDRS)
 
 clean:
 	$(RM) $(DERIVED_FILES)
+
+clobber:	clean
diff --git a/usr/src/uts/common/idmap/idmap_cache.c b/usr/src/uts/common/idmap/idmap_cache.c
index 7d71320ab7..184dd0ebe4 100644
--- a/usr/src/uts/common/idmap/idmap_cache.c
+++ b/usr/src/uts/common/idmap/idmap_cache.c
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -36,7 +36,7 @@
 #include <sys/sysmacros.h>
 #include <sys/ksynch.h>
 #include <sys/kidmap.h>
-#include "idmap_prot.h"
+#include <rpcsvc/idmap_prot.h>
 #include "kidmap_priv.h"
 
 
diff --git a/usr/src/uts/common/idmap/idmap_kapi.c b/usr/src/uts/common/idmap/idmap_kapi.c
index 29ecf5e38c..0ae909f670 100644
--- a/usr/src/uts/common/idmap/idmap_kapi.c
+++ b/usr/src/uts/common/idmap/idmap_kapi.c
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -49,7 +49,7 @@
 #include <sys/disp.h>
 #include <sys/kidmap.h>
 #include <sys/zone.h>
-#include "idmap_prot.h"
+#include <rpcsvc/idmap_prot.h>
 #include "kidmap_priv.h"
 
 
diff --git a/usr/src/uts/common/rpcsvc/Makefile b/usr/src/uts/common/rpcsvc/Makefile
index a23d3192f9..b6e0608a1e 100644
--- a/usr/src/uts/common/rpcsvc/Makefile
+++ b/usr/src/uts/common/rpcsvc/Makefile
@@ -19,10 +19,8 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2006 Sun Microsystems, Inc.
-# All rights reserved.  Use is subject to license terms.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # uts/common/rpcsvc/Makefile
 #	This makefile installs system header files that go into
@@ -35,7 +33,8 @@ include ../../../Makefile.master
 # completely via rpcgen.  The NLM description should go here some day.
 # Also, the v3 headers have been hacked so that they no longer
 # quite reflect what goes over the wire.
-RPCGEN_SRC=	autofs_prot.x sm_inter.x nsm_addr.x
+IDMAP_PROT_X=	idmap_prot.x
+RPCGEN_SRC=	autofs_prot.x sm_inter.x nsm_addr.x $(IDMAP_PROT_X)
 
 DERIVED_HDRS=	$(RPCGEN_SRC:%.x=%.h)
 
@@ -71,3 +70,5 @@ $(ROOTDIRS):
 %.h: %.x
 	$(RPCGEN) -C -h $< -o $@
 
+idmap_prot.h:	$(IDMAP_PROT_X)
+	$(RPCGEN) -CMNh -o $@ $(IDMAP_PROT_X)
diff --git a/usr/src/head/rpcsvc/idmap_prot.x b/usr/src/uts/common/rpcsvc/idmap_prot.x
index 84893f290b..84893f290b 100644
--- a/usr/src/head/rpcsvc/idmap_prot.x
+++ b/usr/src/uts/common/rpcsvc/idmap_prot.x
diff --git a/usr/src/uts/intel/idmap/Makefile b/usr/src/uts/intel/idmap/Makefile
index 1967ff90c1..157f5cbed0 100644
--- a/usr/src/uts/intel/idmap/Makefile
+++ b/usr/src/uts/intel/idmap/Makefile
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 # 
 #
@@ -53,11 +53,6 @@ include $(UTSBASE)/intel/Makefile.intel
 LDFLAGS += -dy -N"sys/doorfs" -N"strmod/rpcmod"
 
 #
-#	Include dependencies
-#
-INC_PATH += -I$(SRC)/head/rpcsvc
-
-#
 # Lint warnings turned off
 #
 # Function variables unused for rpcgen-generated code
diff --git a/usr/src/uts/sparc/idmap/Makefile b/usr/src/uts/sparc/idmap/Makefile
index 04fe90c119..d201370ec2 100644
--- a/usr/src/uts/sparc/idmap/Makefile
+++ b/usr/src/uts/sparc/idmap/Makefile
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #
@@ -53,11 +53,6 @@ include $(UTSBASE)/sparc/Makefile.sparc
 LDFLAGS += -dy -N"sys/doorfs" -N"strmod/rpcmod"
 
 #
-#	Include dependencies
-#
-INC_PATH += -I$(SRC)/head/rpcsvc
-
-#
 # Lint warnings turned off
 #
 # Function variables unused for rpcgen-generated code