From dadd73b61213fd1db77d1de04c619cb2b4791d31 Mon Sep 17 00:00:00 2001 From: Lauri Tirkkonen Date: Fri, 10 Aug 2018 14:13:27 +0300 Subject: [PATCH] cmd/dtrace/test: don't generate prot_nfs.c into include/ --- usr/src/.gitignore | 1 + usr/src/cmd/dtrace/test/tst/common/Makefile | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/usr/src/.gitignore b/usr/src/.gitignore index b89232aeb4..5d45ab69e4 100644 --- a/usr/src/.gitignore +++ b/usr/src/.gitignore @@ -687,6 +687,7 @@ cmd/dtrace/test/tst/common/json/tst.usdt.exe cmd/dtrace/test/tst/common/json/usdt.h cmd/dtrace/test/tst/common/nfs/tst.call.exe cmd/dtrace/test/tst/common/nfs/tst.call3.exe +cmd/dtrace/test/tst/common/nfs_prot.c cmd/dtrace/test/tst/common/pid/tst.args1.exe cmd/dtrace/test/tst/common/pid/tst.float.exe cmd/dtrace/test/tst/common/pid/tst.fork.exe diff --git a/usr/src/cmd/dtrace/test/tst/common/Makefile b/usr/src/cmd/dtrace/test/tst/common/Makefile index 6a09bb164d..bbf24b30b3 100644 --- a/usr/src/cmd/dtrace/test/tst/common/Makefile +++ b/usr/src/cmd/dtrace/test/tst/common/Makefile @@ -46,7 +46,7 @@ CLOBBERFILES += nfs/$(SNOOPOBJS) RPCSVCDIR = $(SRCTOP)/include/rpcsvc RPCSVCOBJS = nfs_prot.o RPCSVCSRCS = ${RPCSVCOBJS:%o=%c} -CLOBBERFILES += nfs/$(RPCSVCOBJS) $(RPCSVCDIR)/$(RPCSVCSRCS) +CLOBBERFILES += nfs/$(RPCSVCOBJS) $(RPCSVCSRCS) CLOBBERFILES += usdt/forker.h usdt/lazyprobe.h fasttrap/tst.fasttrap.exe := LDLIBS += -ldtrace @@ -63,10 +63,10 @@ nfs/%.o: $(SNOOPDIR)/%.c nfs/tst.call.exe: nfs/tst.call.o nfs/$(SNOOPOBJS) $(LINK.c) -o $@ nfs/tst.call.o nfs/$(SNOOPOBJS) $(LDLIBS) $(POST_PROCESS) ; $(STRIP_STABS) -$(RPCSVCDIR)/%.c: $(RPCSVCDIR)/%.x +%.c: $(RPCSVCDIR)/%.x $(RPCGEN) -Cc $< > $@ -nfs/$(RPCSVCOBJS): $(RPCSVCDIR)/$(RPCSVCSRCS) - $(COMPILE.c) -o $@ $(RPCSVCDIR)/$(RPCSVCSRCS) +nfs/$(RPCSVCOBJS): $(RPCSVCSRCS) + $(COMPILE.c) -o $@ $(RPCSVCSRCS) $(POST_PROCESS_O) nfs/tst.call3.exe: nfs/tst.call3.o nfs/$(RPCSVCOBJS) $(LINK.c) -o $@ nfs/tst.call3.o nfs/$(RPCSVCOBJS) \ -- 2.11.4.GIT