Repairing tests

Makefile.am

@@ -109,7 +109,7 @@ MOSTLYCLEANFILES = \
 
 
 %.pb.cc %.pb.h: $(top_srcdir)/remote/proto/%.proto
-	$(PROTOC) --proto_path=$(srcdir)/remote/proto/ --cpp_out=$(builddir)/ $^
+	$(PROTOC) --proto_path=$(top_srcdir)/remote/proto/ --cpp_out=$(builddir)/ $^
 
 lms_CXXFLAGS=-DBOOST_LOG_DYN_LINK -std=c++11 -Wall -I$(top_srcdir)/boost/ -I$(top_srcdir)/ui -I$(top_srcdir)/remote
 

test/Makefile.am

@@ -7,11 +7,6 @@ remote_SOURCES = \
 	$(srcdir)/RemoteClientServer.cpp			\
 	$(srcdir)/TestDatabase.cpp				\
 	$(top_srcdir)/logger/Logger.cpp 			\
-	$(top_srcdir)/remote/messages/auth.pb.cc		\
-	$(top_srcdir)/remote/messages/collection.pb.cc		\
-	$(top_srcdir)/remote/messages/common.pb.cc		\
-	$(top_srcdir)/remote/messages/media.pb.cc		\
-	$(top_srcdir)/remote/messages/messages.pb.cc		\
 	$(top_srcdir)/database/Artist.cpp			\
 	$(top_srcdir)/database/Genre.cpp			\
 	$(top_srcdir)/database/Release.cpp			\
@@ -21,9 +16,27 @@ remote_SOURCES = \
 	$(top_srcdir)/database/SqlQuery.cpp		\
 	$(top_srcdir)/database/User.cpp			\
 	$(top_srcdir)/database/Video.cpp
+nodist_remote_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_CXXFLAGS=-std=c++11 -Wall -Wextra -DBOOST_LOG_DYN_LINK -I$(top_srcdir) -I$(top_srcdir)/remote -I$(top_srcdir)/boost
 
+%.pb.cc %.pb.h: $(top_srcdir)/remote/proto/%.proto
+	$(PROTOC) --proto_path=$(top_srcdir)/remote/proto/ --cpp_out=$(builddir)/ $^
+
+
 database_user_SOURCES = \
 	$(srcdir)/CheckDatabaseUser.cpp		\
 	$(top_srcdir)/logger/Logger.cpp 			\

test/RemoteClientServer.cpp

@@ -28,7 +28,7 @@
 
 #include "remote/server/Server.hpp"
 #include "remote/messages/Header.hpp"
-#include "remote/messages/messages.pb.h"
+#include "messages.pb.h"
 
 #include "TestDatabase.hpp"