From dabed0b3cf854f5857b1547db25ce33718c9d0a1 Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 29 Jul 2015 23:00:03 +0200 Subject: [PATCH] [LMSAPI] move proto files into lms-api/proto --- {src/lms-api => lms-api}/proto/auth.proto | 0 {src/lms-api => lms-api}/proto/collection.proto | 0 {src/lms-api => lms-api}/proto/common.proto | 0 {src/lms-api => lms-api}/proto/media.proto | 0 {src/lms-api => lms-api}/proto/messages.proto | 0 src/Makefile.am | 4 ++-- test/Makefile.am | 4 ++-- 7 files changed, 4 insertions(+), 4 deletions(-) rename {src/lms-api => lms-api}/proto/auth.proto (100%) rename {src/lms-api => lms-api}/proto/collection.proto (100%) rename {src/lms-api => lms-api}/proto/common.proto (100%) rename {src/lms-api => lms-api}/proto/media.proto (100%) rename {src/lms-api => lms-api}/proto/messages.proto (100%) diff --git a/src/lms-api/proto/auth.proto b/lms-api/proto/auth.proto similarity index 100% rename from src/lms-api/proto/auth.proto rename to lms-api/proto/auth.proto diff --git a/src/lms-api/proto/collection.proto b/lms-api/proto/collection.proto similarity index 100% rename from src/lms-api/proto/collection.proto rename to lms-api/proto/collection.proto diff --git a/src/lms-api/proto/common.proto b/lms-api/proto/common.proto similarity index 100% rename from src/lms-api/proto/common.proto rename to lms-api/proto/common.proto diff --git a/src/lms-api/proto/media.proto b/lms-api/proto/media.proto similarity index 100% rename from src/lms-api/proto/media.proto rename to lms-api/proto/media.proto diff --git a/src/lms-api/proto/messages.proto b/lms-api/proto/messages.proto similarity index 100% rename from src/lms-api/proto/messages.proto rename to lms-api/proto/messages.proto diff --git a/src/Makefile.am b/src/Makefile.am index e537e5c2..2f9310ae 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -112,8 +112,8 @@ MOSTLYCLEANFILES = \ $(builddir)/messages.pb.cc \ $(builddir)/messages.pb.h -%.pb.cc %.pb.h: $(srcdir)/lms-api/proto/%.proto - $(PROTOC) --proto_path=$(srcdir)/lms-api/proto/ --cpp_out=$(builddir)/ $^ +%.pb.cc %.pb.h: $(top_srcdir)/lms-api/proto/%.proto + $(PROTOC) --proto_path=$(top_srcdir)/lms-api/proto/ --cpp_out=$(builddir)/ $^ endif diff --git a/test/Makefile.am b/test/Makefile.am index d551d4f7..e4cedacb 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -26,8 +26,8 @@ BUILT_SOURCES = \ remote_client_CXXFLAGS=-std=c++11 -Wall -Wextra -DBOOST_LOG_DYN_LINK -I$(top_srcdir)/src -%.pb.cc %.pb.h: $(top_srcdir)/src/lms-api/proto/%.proto - $(PROTOC) --proto_path=$(top_srcdir)/src/lms-api/proto/ --cpp_out=$(builddir)/ $^ +%.pb.cc %.pb.h: $(top_srcdir)/lms-api/proto/%.proto + $(PROTOC) --proto_path=$(top_srcdir)/lms-api/proto/ --cpp_out=$(builddir)/ $^ endif