diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2011-07-21 18:23:49 +0200 |
|---|---|---|
| committer | Alon Levy <alevy@redhat.com> | 2011-07-22 16:24:04 +0300 |
| commit | aab6aa419c74cac0dda3acceb17558ebdcc85459 (patch) | |
| tree | a8432ed66aecebb7474fc63e91886f75e1b21eca | |
| parent | ebe1cf76d4a86fea239b425caabe64aeaa2e13e2 (diff) | |
| download | spice-aab6aa419c74cac0dda3acceb17558ebdcc85459.tar.gz spice-aab6aa419c74cac0dda3acceb17558ebdcc85459.tar.xz spice-aab6aa419c74cac0dda3acceb17558ebdcc85459.zip | |
fix make distcheck
| -rw-r--r-- | client/smartcard_channel.cpp | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | server/Makefile.am | 3 | ||||
| -rw-r--r-- | server/char_device.h | 2 | ||||
| -rw-r--r-- | server/reds.c | 2 | ||||
| -rw-r--r-- | server/smartcard.c | 6 | ||||
| -rw-r--r-- | server/smartcard.h | 2 | ||||
| -rw-r--r-- | server/tests/Makefile.am | 6 |
8 files changed, 13 insertions, 12 deletions
diff --git a/client/smartcard_channel.cpp b/client/smartcard_channel.cpp index b086ad79..9770b1b8 100644 --- a/client/smartcard_channel.cpp +++ b/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" { diff --git a/configure.ac b/configure.ac index 01872c55..7081497b 100644 --- a/configure.ac +++ b/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]) diff --git a/server/Makefile.am b/server/Makefile.am index bd54aa2c..93ed3120 100644 --- a/server/Makefile.am +++ b/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) diff --git a/server/char_device.h b/server/char_device.h index 486df6fe..9b90b878 100644 --- a/server/char_device.h +++ b/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); diff --git a/server/reds.c b/server/reds.c index 9f881c35..f082c531 100644 --- a/server/reds.c +++ b/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 diff --git a/server/smartcard.c b/server/smartcard.c index 20a31f2e..c75094d6 100644 --- a/server/smartcard.c +++ b/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 diff --git a/server/smartcard.h b/server/smartcard.h index cc74d9bd..b8731dda 100644 --- a/server/smartcard.h +++ b/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 diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am index ddac420e..0c3441eb 100644 --- a/server/tests/Makefile.am +++ b/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) |