diff options
| author | Uri Lublin <uril@redhat.com> | 2009-12-30 15:34:56 +0200 |
|---|---|---|
| committer | Yaniv Kamay <ykamay@redhat.com> | 2010-01-10 19:44:27 +0200 |
| commit | c854259ba4e841ff6ee7294267423c44919a1f9a (patch) | |
| tree | a597f312abd16329ea4b365831d4dc58dff7b625 | |
| parent | 5e079451771864ad977aaa187570d3ea62ea6360 (diff) | |
| download | spice-c854259ba4e841ff6ee7294267423c44919a1f9a.tar.gz spice-c854259ba4e841ff6ee7294267423c44919a1f9a.tar.xz spice-c854259ba4e841ff6ee7294267423c44919a1f9a.zip | |
configure.ac: use SPICE_COMMON_SRCDIR in server/Makefile.am (subdir config)
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 <uril@redhat.com>
| -rw-r--r-- | server/Makefile.am | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/server/Makefile.am b/server/Makefile.am index 2731efc3..63d88e18 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 |