Mercurial > illumos > illumos-gate

changeset 10430:e48d1848c913

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6875650 Race between zpool and rcap/rcapstat when building _msg Contributed by Chad Mynhier <cmynhier@gmail.com>
author Krishnendu Sadhukhan - Sun Microsystems <Krishnendu.Sadhukhan@Sun.COM>
date Mon, 31 Aug 2009 22:34:26 -0700
parents 905b255607c2
children a4572ce3df84
files usr/src/cmd/rcap/rcapstat/Makefile usr/src/cmd/zpool/Makefile
diffstat 2 files changed, 6 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/rcap/rcapstat/Makefile	Tue Sep 01 06:38:59 2009 +0200
+++ b/usr/src/cmd/rcap/rcapstat/Makefile	Mon Aug 31 22:34:26 2009 -0700
@@ -49,9 +49,9 @@
 LINTFLAGS			+= $(LDLIBS) -mnu
 
 PROG =				rcapstat
-OBJS =				$(SRCS:%.c=%.o) rcapd_conf.o $(STAT_COMMON_OBJS)
+OBJS =				$(SRCS:%.c=%.o) rcapd_conf.o
 
-POFILES =			$(OBJS:%.o=%.po) $(STAT_COMMON_OBJS:%.o=%.po)
+POFILES =			$(OBJS:%.o=%.po)
 POFILE =			p$(PROG).po
 
 CLOBBERFILES += 		rcapd_conf.c $(POFILES) $(POFILE)
@@ -63,8 +63,8 @@
 
 include ../Makefile.com
 
-$(PROG): $(OBJS)
-	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
+$(PROG): $(OBJS) $(STAT_COMMON_OBJS)
+	$(LINK.c) $(OBJS) $(STAT_COMMON_OBJS) -o $@ $(LDLIBS)
 	$(POST_PROCESS)
 
 %.o : $(STATCOMMONDIR)/%.c
@@ -75,12 +75,8 @@
 	$(RM) $@
 	$(CAT) $(POFILES) > $@
 
-%.po: $(STATCOMMONDIR)/%.c
-	$(COMPILE.cpp) $< > $<.i
-	$(BUILD.po)
-
 clean:
-	$(RM) $(OBJS)
+	$(RM) $(OBJS) $(STAT_COMMON_OBJS)
 
 lint:
 	$(LINT.c) $(LINTSRCS)
--- a/usr/src/cmd/zpool/Makefile	Tue Sep 01 06:38:59 2009 +0200
+++ b/usr/src/cmd/zpool/Makefile	Mon Aug 31 22:34:26 2009 -0700
@@ -35,9 +35,7 @@
 
 STAT_COMMON_OBJS = timestamp.o
 STAT_COMMON_SRCS = $(STAT_COMMON_OBJS:%.o=$(STATCOMMONDIR)/%.c)
-STAT_COMMON_POFILES = $(STAT_COMMON_OBJS:%.o=%.po)
 SRCS += $(STAT_COMMON_SRCS)
-POFILES += $(STAT_COMMON_POFILES)
 
 LDLIBS += -lzfs -lnvpair -ldevid -lefi -ldiskmgt -luutil -lumem
 
@@ -70,12 +68,8 @@
 	$(RM) $@
 	$(CAT) $(POFILES) > $@
 
-%.po: $(STATCOMMONDIR)/%.c
-	$(COMPILE.cpp) $< > $<.i
-	$(BUILD.po)
-
 clean:
-	$(RM) $(OBJS)
+	$(RM) $(OBJS) $(STAT_COMMON_OBJS)
 
 lint:	lint_SRCS