Mercurial > illumos > illumos-gate

changeset 10628:cddb35f5bfa6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6883291 native brand msgs not generated
author <gerald.jelinek@sun.com>
date Wed, 23 Sep 2009 17:30:23 -0600
parents e56a44d6d742
children 12b43beac546
files usr/src/lib/brand/Makefile usr/src/lib/brand/native/Makefile usr/src/lib/brand/native/zone/Makefile usr/src/lib/brand/sn1/Makefile usr/src/lib/brand/sn1/zone/Makefile
diffstat 5 files changed, 21 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/lib/brand/Makefile	Wed Sep 23 15:55:57 2009 -0700
+++ b/usr/src/lib/brand/Makefile	Wed Sep 23 17:30:23 2009 -0600
@@ -35,7 +35,7 @@
 i386_MSGSUBDIRS= lx
 
 SUBDIRS= sn1 native $($(MACH)_SUBDIRS)
-MSGSUBDIRS= $($(MACH)_MSGSUBDIRS)
+MSGSUBDIRS= native $($(MACH)_MSGSUBDIRS)
 
 all :=		TARGET= all
 install :=	TARGET= install
--- a/usr/src/lib/brand/native/Makefile	Wed Sep 23 15:55:57 2009 -0700
+++ b/usr/src/lib/brand/native/Makefile	Wed Sep 23 17:30:23 2009 -0600
@@ -20,11 +20,9 @@
 #
 
 #
-# Copyright 2006 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"
-#
 
 SUBDIRS=	zone
 
@@ -33,10 +31,11 @@
 clobber :=      TARGET= clobber
 install :=      TARGET= install
 lint :=         TARGET= lint
+_msg :=		TARGET= _msg
 
 .KEEP_STATE:
 
-all install clean clobber lint: $(SUBDIRS)
+all install clean clobber lint _msg: $(SUBDIRS)
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
--- a/usr/src/lib/brand/native/zone/Makefile	Wed Sep 23 15:55:57 2009 -0700
+++ b/usr/src/lib/brand/native/zone/Makefile	Wed Sep 23 17:30:23 2009 -0600
@@ -49,14 +49,12 @@
 CPPFLAGS +=	-I/usr/include/libxml2 -D_REENTRANT
 LDLIBS += -lzonecfg -luutil
 
-POFILES=	$(PROGS:%=%.po)
+POFILES=	$(PROGS:%=%.po) common.po
 POFILE=		native_zone.po
 
 $(POFILE): $(POFILES)
 	$(RM) $@
-	$(BUILDPO.pofiles)
-
-_msg: $(MSGDOMAINPOFILE)
+	$(CAT) $(POFILES) > $@
 
 lint: lint_PROG
 
@@ -64,7 +62,6 @@
 	$(ETCUSER)
 
 clean:
-	-$(RM) $(PROGS)
+	-$(RM) $(PROGS) $(POFILES) $(POFILE)
 
-include $(SRC)/Makefile.msg.targ
 include $(SRC)/cmd/Makefile.targ
--- a/usr/src/lib/brand/sn1/Makefile	Wed Sep 23 15:55:57 2009 -0700
+++ b/usr/src/lib/brand/sn1/Makefile	Wed Sep 23 17:30:23 2009 -0600
@@ -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.
 #
 
@@ -31,7 +31,7 @@
 .PARALLEL:
 
 SUBDIRS =	librtld_db sn1_brand zone
-MSGSUBDIRS =	librtld_db sn1_brand zone
+MSGSUBDIRS =	zone
 
 all :=		TARGET= all
 install :=	TARGET= install
--- a/usr/src/lib/brand/sn1/zone/Makefile	Wed Sep 23 15:55:57 2009 -0700
+++ b/usr/src/lib/brand/sn1/zone/Makefile	Wed Sep 23 17:30:23 2009 -0600
@@ -20,27 +20,33 @@
 #
 
 #
-# Copyright 2006 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"
-#
 
 BRAND=		sn1
 PROGS=		sn1_boot
 XMLDOCS=	config.xml platform.xml
 TEMPLATES=	SUNWsn1.xml
+CLOBBERFILES=	$(PROGS)
 
 all:	$(PROGS)
 
+include $(SRC)/cmd/Makefile.cmd
 include ../../Makefile.brand
 
+POFILES=	$(PROGS:%=%.po)
+POFILE=		sn1_zone.po
+
+$(POFILE): $(POFILES)
+	$(RM) $@
+	$(CAT) $(POFILES) > $@
+
 lint:
 
 clean:
-	-$(RM) $(PROGS)
+	-$(RM) $(PROGS) $(POFILES) $(POFILE)
 
 install: $(PROGS) $(ROOTPROGS) $(ROOTXMLDOCS) $(ROOTTEMPLATES)
 
-clobber: clean
-	-$(RM) $(ROOTPROGS) $(ROOTXMLDOCS) $(ROOTTEMPLATES)
+include $(SRC)/cmd/Makefile.targ