pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-01-06 19:05:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: Move spice-common to subprojects/ directory

Browse Source 
The reason for this commit is that Meson expects all submodules to be
placed in this subdirectory, and since autotools build is more flexible
in this case, we make some small adjustments to configure.ac and
Makefile.am files to accommodate for this change.

Signed-off-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
This commit is contained in:
Eduardo Lima (Etrunko) 2018-07-20 12:55:06 -03:00
parent 35488f1562
commit b0e141b387
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "spice-common"]
path = spice-common
path = subprojects/spice-common
url = ../spice-common.git

2
Makefile.am
View File

@ -1,7 +1,7 @@
NULL =
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = spice-common server docs tools
SUBDIRS = subprojects/spice-common server docs tools
check-valgrind:
$(MAKE) -C server check-valgrind

10
configure.ac
View File

@ -30,7 +30,7 @@ SPICE_SERVER_VERSION=`printf "0x%02x%02x%02x" $major $minor $micro`
AC_SUBST(SPICE_SERVER_VERSION)
AC_CONFIG_MACRO_DIR([m4])
m4_include([spice-common/m4/spice-deps.m4])
m4_include([subprojects/spice-common/m4/spice-deps.m4])
AM_CONFIG_HEADER([config.h])
AC_CONFIG_AUX_DIR(.)
@ -138,12 +138,14 @@ AM_CONDITIONAL(HAVE_SASL, test "x$have_sasl" = "xyes")
dnl =========================================================================
dnl Check deps
AC_CONFIG_SUBDIRS([spice-common])
COMMON_CFLAGS='-I ${top_srcdir}/spice-common/ -I ${top_builddir}/spice-common/'
AC_CONFIG_SUBDIRS([subprojects/spice-common])
COMMON_CFLAGS='-I ${top_srcdir}/subprojects/spice-common/ -I ${top_builddir}/subprojects/spice-common/'
COMMON_CFLAGS="$COMMON_CFLAGS -DG_LOG_DOMAIN=\\\"Spice\\\""
AC_SUBST(COMMON_CFLAGS)
SPICE_COMMON_DIR='${top_builddir}/subprojects/spice-common'
AC_SUBST(SPICE_COMMON_DIR)
AC_CHECK_LIBM
AC_SUBST(LIBM)

4
server/Makefile.am
View File

@ -40,8 +40,8 @@ EXTRA_libspice_server_la_DEPENDENCIES = $(srcdir)/spice-server.syms
endif
libserver_la_LIBADD = \
$(top_builddir)/spice-common/common/libspice-common.la \
$(top_builddir)/spice-common/common/libspice-common-server.la \
$(SPICE_COMMON_DIR)/common/libspice-common.la \
$(SPICE_COMMON_DIR)/common/libspice-common-server.la \
$(GL_LIBS) \
$(GLIB2_LIBS) \
$(GOBJECT2_LIBS) \

4
server/tests/Makefile.am
View File

@ -38,7 +38,7 @@ libtest_a_SOURCES = \
LDADD = \
libtest.a \
$(top_builddir)/spice-common/common/libspice-common.la \
$(SPICE_COMMON_DIR)/common/libspice-common.la \
$(top_builddir)/server/libserver.la \
$(GIO_UNIX_LIBS) \
$(GLIB2_LIBS) \
@ -87,7 +87,7 @@ spice_server_replay_SOURCES = replay.c \
basic-event-loop.h
spice_server_replay_LDADD = \
$(top_builddir)/spice-common/common/libspice-common.la \
$(SPICE_COMMON_DIR)/common/libspice-common.la \
$(top_builddir)/server/libspice-server.la \
$(GLIB2_LIBS) \
$(GOBJECT2_LIBS) \

0
spice-common → subprojects/spice-common
View File