diff options
| author | Krishnendu Sadhukhan - Sun Microsystems <Krishnendu.Sadhukhan@Sun.COM> | 2009-08-31 22:34:26 -0700 |
|---|---|---|
| committer | Krishnendu Sadhukhan - Sun Microsystems <Krishnendu.Sadhukhan@Sun.COM> | 2009-08-31 22:34:26 -0700 |
| commit | a211e62b4643abef28f572d6839d7da55c547a29 (patch) | |
| tree | a8ac5937bec28b10232aded977f205cbc5837039 | |
| parent | 38f9230374f68e497735c3b79c1caed0ef10abda (diff) | |
| download | illumos-joyent-a211e62b4643abef28f572d6839d7da55c547a29.tar.gz | |
6875650 Race between zpool and rcap/rcapstat when building _msg
Contributed by Chad Mynhier <cmynhier@gmail.com>
| -rw-r--r-- | usr/src/cmd/rcap/rcapstat/Makefile | 14 | ||||
| -rw-r--r-- | usr/src/cmd/zpool/Makefile | 8 |
2 files changed, 6 insertions, 16 deletions
diff --git a/usr/src/cmd/rcap/rcapstat/Makefile b/usr/src/cmd/rcap/rcapstat/Makefile index 87e58eb043..1b4e0e6180 100644 --- a/usr/src/cmd/rcap/rcapstat/Makefile +++ b/usr/src/cmd/rcap/rcapstat/Makefile @@ -49,9 +49,9 @@ LDFLAGS += $(MAPFILE.NGB:%=-M%) 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 @@ all: $(PROG) $(MAPFILE.NGB) 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 @@ $(POFILE): $(POFILES) $(RM) $@ $(CAT) $(POFILES) > $@ -%.po: $(STATCOMMONDIR)/%.c - $(COMPILE.cpp) $< > $<.i - $(BUILD.po) - clean: - $(RM) $(OBJS) + $(RM) $(OBJS) $(STAT_COMMON_OBJS) lint: $(LINT.c) $(LINTSRCS) diff --git a/usr/src/cmd/zpool/Makefile b/usr/src/cmd/zpool/Makefile index 1e1afa942e..9b2d4e3d07 100644 --- a/usr/src/cmd/zpool/Makefile +++ b/usr/src/cmd/zpool/Makefile @@ -35,9 +35,7 @@ STATCOMMONDIR = $(SRC)/cmd/stat/common 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 @@ $(POFILE): $(POFILES) $(RM) $@ $(CAT) $(POFILES) > $@ -%.po: $(STATCOMMONDIR)/%.c - $(COMPILE.cpp) $< > $<.i - $(BUILD.po) - clean: - $(RM) $(OBJS) + $(RM) $(OBJS) $(STAT_COMMON_OBJS) lint: lint_SRCS |