diff options
| author | Gary Mills <gary_mills@fastmail.fm> | 2015-07-01 08:28:25 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@omniti.com> | 2015-07-02 13:53:15 -0400 |
| commit | 77eb9dd4fa1a2a4b00af3d1973a84b60fbf40cdf (patch) | |
| tree | e4331a806a65928d0b5a0564a5492c4e62adcbc5 /usr/src/lib/librpcsvc | |
| parent | 29a47e6ee6365b8ebcd68a3d59c0e1ef32f17ceb (diff) | |
| download | illumos-joyent-77eb9dd4fa1a2a4b00af3d1973a84b60fbf40cdf.tar.gz | |
687 rpcgen should not generate absolute #includes
Reviewed by: Marcel Telka <marcel@telka.sk>
Approved by: Dan McDonald <danmcd@omniti.com>
Diffstat (limited to 'usr/src/lib/librpcsvc')
| -rw-r--r-- | usr/src/lib/librpcsvc/Makefile | 44 | ||||
| -rw-r--r-- | usr/src/lib/librpcsvc/Makefile.com | 4 |
2 files changed, 27 insertions, 21 deletions
diff --git a/usr/src/lib/librpcsvc/Makefile b/usr/src/lib/librpcsvc/Makefile index 4e61f7a7e2..1209096b72 100644 --- a/usr/src/lib/librpcsvc/Makefile +++ b/usr/src/lib/librpcsvc/Makefile @@ -19,15 +19,17 @@ # CDDL HEADER END # # +# Copyright 2015 Gary Mills # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../../Makefile.master -PROTOCOL_DIR= $(ROOT)/usr/include/rpcsvc +# Relative path to ensure path to header file is also relative +HEAD_DIR= ../../head/rpcsvc +UTS_DIR= ../../uts/common/rpcsvc +RPC_DIR= ../../uts/common/rpc SUBDIRS= $(MACH) $(BUILD64)SUBDIRS += $(MACH64) @@ -81,32 +83,32 @@ clean clobber lint: $(SUBDIRS) # # Derived files # -common/bootparam_prot_xdr.c: $(PROTOCOL_DIR)/bootparam_prot.x - $(RPCGEN) -c $(PROTOCOL_DIR)/bootparam_prot.x > $@ +common/bootparam_prot_xdr.c: $(HEAD_DIR)/bootparam_prot.x + $(RPCGEN) -c $(HEAD_DIR)/bootparam_prot.x > $@ -common/rstat_xdr.c: $(PROTOCOL_DIR)/rstat.x - $(RPCGEN) -c $(PROTOCOL_DIR)/rstat.x > $@ +common/rstat_xdr.c: $(HEAD_DIR)/rstat.x + $(RPCGEN) -c $(HEAD_DIR)/rstat.x > $@ -common/rusers_xdr.c: $(PROTOCOL_DIR)/rusers.x - $(RPCGEN) -c $(PROTOCOL_DIR)/rusers.x > $@ +common/rusers_xdr.c: $(HEAD_DIR)/rusers.x + $(RPCGEN) -c $(HEAD_DIR)/rusers.x > $@ -common/sm_inter_xdr.c: $(PROTOCOL_DIR)/sm_inter.x - $(RPCGEN) -c $(PROTOCOL_DIR)/sm_inter.x > $@ +common/sm_inter_xdr.c: $(UTS_DIR)/sm_inter.x + $(RPCGEN) -c $(UTS_DIR)/sm_inter.x > $@ -common/spray_xdr.c: $(PROTOCOL_DIR)/spray.x - $(RPCGEN) -c $(PROTOCOL_DIR)/spray.x > $@ +common/spray_xdr.c: $(HEAD_DIR)/spray.x + $(RPCGEN) -c $(HEAD_DIR)/spray.x > $@ -common/nlm_prot.c: $(PROTOCOL_DIR)/nlm_prot.x - $(RPCGEN) -c $(PROTOCOL_DIR)/nlm_prot.x > $@ +common/nlm_prot.c: $(UTS_DIR)/nlm_prot.x + $(RPCGEN) -c $(UTS_DIR)/nlm_prot.x > $@ -common/mount_xdr.c: $(PROTOCOL_DIR)/mount.x - $(RPCGEN) -c $(PROTOCOL_DIR)/mount.x > $@ +common/mount_xdr.c: $(HEAD_DIR)/mount.x + $(RPCGEN) -c $(HEAD_DIR)/mount.x > $@ -common/nsm_addr_xdr.c: $(PROTOCOL_DIR)/nsm_addr.x - $(RPCGEN) -c $(PROTOCOL_DIR)/nsm_addr.x > $@ +common/nsm_addr_xdr.c: $(UTS_DIR)/nsm_addr.x + $(RPCGEN) -c $(UTS_DIR)/nsm_addr.x > $@ -common/rpc_sztypes.c: $(PROTOCOL_DIR)/rpc_sztypes.x - $(RPCGEN) -c $(PROTOCOL_DIR)/rpc_sztypes.x > $@ +common/rpc_sztypes.c: $(RPC_DIR)/rpc_sztypes.x + $(RPCGEN) -c $(RPC_DIR)/rpc_sztypes.x > $@ # include library targets include ../Makefile.targ diff --git a/usr/src/lib/librpcsvc/Makefile.com b/usr/src/lib/librpcsvc/Makefile.com index 64a77e161e..15b6c6cb48 100644 --- a/usr/src/lib/librpcsvc/Makefile.com +++ b/usr/src/lib/librpcsvc/Makefile.com @@ -20,6 +20,7 @@ # # +# Copyright 2015 Gary Mills # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -57,6 +58,9 @@ $(LINTLIB):= SRCS = $(SRCDIR)/$(LINTSRC) LDLIBS += -lnsl -lc +# Needed so header files with relative paths will work +CPPFLAGS += -I.. + .KEEP_STATE: lint: lintcheck |