fix make distcheck

client/smartcard_channel.cpp

@@ -16,7 +16,7 @@
 */
 #include <spice/enums.h>
 
-#include "client/red_client.h"
+#include "red_client.h"
 #include "mutex.h"
 
 extern "C" {

configure.ac

@@ -207,7 +207,7 @@ SPICE_REQUIRES+=" celt051 >= 0.5.1.1"
 
 if test ! -e client/generated_marshallers.cpp; then
 AC_MSG_CHECKING([for pyparsing python module])
-echo "import pyparsing" | python - >/dev/null 2&>1
+echo "import pyparsing" | python - >/dev/null 2>&1
 if test $? -ne 0 ; then
     AC_MSG_RESULT([not found])
     AC_MSG_ERROR([pyparsing python module is required to compile this package])

server/Makefile.am

@@ -60,7 +60,7 @@ lib_LTLIBRARIES = libspice-server.la
 
 libspice_server_la_LDFLAGS =			\
 	-version-number $(SPICE_LT_VERSION)	\
-	-Wl,--version-script=spice-server.syms	\
+	-Wl,--version-script=$(top_srcdir)/server/spice-server.syms	\
 	-no-undefined				\
 	$(NULL)
 
@@ -150,6 +150,7 @@ libspice_serverinclude_HEADERS =		\
 EXTRA_DIST =					\
 	glz_encode_match_tmpl.c			\
 	glz_encode_tmpl.c			\
+	spice-server.syms			\
 	$(NULL)
 
 BUILT_SOURCES = $(spice_built_sources)

server/char_device.h

@@ -1,7 +1,7 @@
 #ifndef __CHAR_DEVICE_H__
 #define __CHAR_DEVICE_H__
 
-#include "server/spice-experimental.h"
+#include "spice-experimental.h"
 
 struct SpiceCharDeviceState {
     void (*wakeup)(SpiceCharDeviceInstance *sin);

server/reds.c

@@ -60,7 +60,7 @@
 #include "demarshallers.h"
 #include "marshaller.h"
 #include "generated_marshallers.h"
-#include "server/char_device.h"
+#include "char_device.h"
 #ifdef USE_TUNNEL
 #include "red_tunnel_worker.h"
 #endif

server/smartcard.c

@@ -17,9 +17,9 @@
 */
 #include <arpa/inet.h>
 
-#include "server/char_device.h"
-#include "server/red_channel.h"
-#include "server/smartcard.h"
+#include "char_device.h"
+#include "red_channel.h"
+#include "smartcard.h"
 #include "vscard_common.h"
 
 #define SMARTCARD_MAX_READERS 10

server/smartcard.h

@@ -18,7 +18,7 @@
 #ifndef __SMART_CARD_H__
 #define __SMART_CARD_H__
 
-#include "server/spice-experimental.h"
+#include "spice-experimental.h"
 
 // Maximal length of APDU
 #define APDUBufSize 270

server/tests/Makefile.am

@@ -1,8 +1,8 @@
 NULL =
 
-INCLUDES =                          \
-	-I..                            \
-	-I../../common                  \
+INCLUDES =                              \
+	-I$(top_srcdir)/server          \
+	-I$(top_srcdir)/common          \
 	$(PROTOCOL_CFLAGS)              \
 	$(SPICE_NONPKGCONFIG_CFLAGS)    \
 	$(NULL)