From e432a2a66125e5f1296016ebd3250565900cc7c0 Mon Sep 17 00:00:00 2001 From: drbob Date: Mon, 22 Oct 2012 19:07:54 +0000 Subject: [PATCH] tweaked Makefile - only builds C++ by default. - files are generated into rs-nogui src tree. git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5713 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- rsctrl/src/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/rsctrl/src/Makefile b/rsctrl/src/Makefile index e4353a659..b6305a374 100644 --- a/rsctrl/src/Makefile +++ b/rsctrl/src/Makefile @@ -6,8 +6,8 @@ PROTO = core.proto peers.proto system.proto chat.proto search.proto files.proto PROTOPATH = ./definition #CDESTPATH = ./gencc CDESTPATH = ../../retroshare-nogui/src/rpc/proto/gencc -#PYDESTPATH = ./genpy -PYDESTPATH = ../../../../github/pyrs/pyrs/proto +PYDESTPATH = ./genpy +#PYDESTPATH = ../../../../github/pyrs/pyrs/proto CLIST = $(PROTO:%.proto=%.cc) CCODE = $(patsubst %.proto,$(CDESTPATH)/%.pb.cc, $(PROTO)) @@ -16,10 +16,12 @@ PYCODE = $(patsubst %.proto,$(PYDESTPATH)/%_pb2.py, $(PROTO)) all: allc - echo $(CCODE) - echo $(PYCODE) -allc: $(CCODE) $(PYCODE) +allc: $(CCODE) + echo $(CCODE) + +python_proto: $(PYCODE) + echo $(PYCODE) $(CDESTPATH)/%.pb.cc : $(PROTOPATH)/%.proto $(EXEC) --proto_path=$(PROTOPATH) --cpp_out=$(CDESTPATH) $<