owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'remote-conditional' into develop

Browse Source
This commit is contained in:
emeric
2015-07-29 23:07:07 +02:00
parent 531d84f622 773eba50f0
commit 293533198d
7 changed files with 4 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lms-api/proto/auth.proto → lms-api/proto/auth.proto
-2
View File
@@ -17,8 +17,6 @@
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
import "common.proto";
package LmsAPI;
message AuthRequest
src/lms-api/proto/collection.proto → lms-api/proto/collection.proto
-2
View File
@@ -17,8 +17,6 @@
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
import "common.proto";
package LmsAPI;
message AudioCollectionRequest
src/lms-api/proto/media.proto → lms-api/proto/media.proto
-2
View File
@@ -17,8 +17,6 @@
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
import "common.proto";
package LmsAPI;
message MediaRequest
src/lms-api/proto/messages.proto → lms-api/proto/messages.proto
-2
View File
@@ -17,8 +17,6 @@
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
import "common.proto";
import "auth.proto";
import "collection.proto";
import "media.proto";
src/Makefile.am
+2 -8
View File
@@ -81,8 +81,6 @@ nodist_lms_SOURCES = \
$(builddir)/auth.pb.h \
$(builddir)/collection.pb.cc \
$(builddir)/collection.pb.h \
$(builddir)/common.pb.cc \
$(builddir)/common.pb.h \
$(builddir)/media.pb.cc \
$(builddir)/media.pb.h \
$(builddir)/messages.pb.cc \
@@ -93,8 +91,6 @@ BUILT_SOURCES = \
$(builddir)/auth.pb.h \
$(builddir)/collection.pb.cc \
$(builddir)/collection.pb.h \
$(builddir)/common.pb.cc \
$(builddir)/common.pb.h \
$(builddir)/media.pb.cc \
$(builddir)/media.pb.h \
$(builddir)/messages.pb.cc \
@@ -105,15 +101,13 @@ MOSTLYCLEANFILES = \
$(builddir)/auth.pb.h \
$(builddir)/collection.pb.cc \
$(builddir)/collection.pb.h \
$(builddir)/common.pb.cc \
$(builddir)/common.pb.h \
$(builddir)/media.pb.cc \
$(builddir)/media.pb.h \
$(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
src/lms-api/proto/common.proto
-27
View File
@@ -1,27 +0,0 @@
/*
* Copyright (C) 2013 Emeric Poupon
*
* This file is part of LMS.
*
* LMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* LMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
package LmsAPI;
message Error
{
required bool error = 1;
optional string message = 2;
}
test/Makefile.am
+2 -4
View File
@@ -13,21 +13,19 @@ remote_client_SOURCES = \
nodist_remote_client_SOURCES = \
$(builddir)/auth.pb.cc \
$(builddir)/collection.pb.cc \
$(builddir)/common.pb.cc \
$(builddir)/media.pb.cc \
$(builddir)/messages.pb.cc
BUILT_SOURCES = \
$(builddir)/auth.pb.h \
$(builddir)/collection.pb.h \
$(builddir)/common.pb.h \
$(builddir)/media.pb.h \
$(builddir)/messages.pb.h
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