Replace all $(top_srcdir)/common.
This would (after following patches) enables building the server from
either spice/ (top directory) or spice/server.
Signed-off-by: Uri Lublin <u...@redhat.com>
---
server/Makefile.am | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/server/Makefile.am b/server/Makefile.am
index 2731efc..63d88e1 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -1,9 +1,11 @@
NULL =
+COMMON_DIR=$(SPICE_COMMON_SRCDIR)
+
INCLUDES = \
-I. \
- -I$(top_srcdir)/common \
- -I$(top_srcdir)/common/linux \
+ -I$(COMMON_DIR) \
+ -I$(COMMON_DIR)/linux \
$(FFMPEG_CFLAGS) \
$(QCAIRO_CFLAGS) \
$(GL_CFLAGS) \
@@ -16,16 +18,16 @@ INCLUDES = \
$(VISIBILITY_HIDDEN_CFLAGS) \
$(NULL)
-COMMON_SRCS = \
- $(top_srcdir)/common/cairo_canvas.c \
- $(top_srcdir)/common/gl_canvas.c \
- $(top_srcdir)/common/region.c \
- $(top_srcdir)/common/glc.c \
- $(top_srcdir)/common/ogl_ctx.c \
- $(top_srcdir)/common/rop3.c \
- $(top_srcdir)/common/quic.c \
- $(top_srcdir)/common/lz.c \
- $(top_srcdir)/common/canvas_utils.c \
+COMMON_SRCS = \
+ $(COMMON_DIR)/cairo_canvas.c \
+ $(COMMON_DIR)/gl_canvas.c \
+ $(COMMON_DIR)/region.c \
+ $(COMMON_DIR)/glc.c \
+ $(COMMON_DIR)/ogl_ctx.c \
+ $(COMMON_DIR)/rop3.c \
+ $(COMMON_DIR)/quic.c \
+ $(COMMON_DIR)/lz.c \
+ $(COMMON_DIR)/canvas_utils.c \
$(NULL)
lib_LTLIBRARIES = libspice.la
--
1.6.5.2
------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev
_______________________________________________
Spice-space-devel mailing list
Spice-space-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/spice-space-devel
