diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2012-03-20 02:33:25 +0100 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2012-03-25 19:22:52 +0200 |
| commit | 05a203af120016428eb1661ee060ea85e37b4c96 (patch) | |
| tree | dbbf9bf3903895a5b7f06eb22db6308627376a23 /configure.ac | |
| parent | 6db275a422013a34247b805923f88b23db850ea1 (diff) | |
build-sys: move codegen & proto to spice-common
With this iteration, all the spice_codegen.py/proto/marshaller
generation has been moved to spice-common.
The spice-common directory will ship spice-protocol, since it's needed
there too to build libspice-common.
Again, make distcheck passes. Build with mingw & fedora linux.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 1ac291f..45d99dc 100644 --- a/configure.ac +++ b/configure.ac @@ -23,8 +23,6 @@ AC_SUBST(SPICE_GTK_LOCALEDIR) GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) -# Define default SPICE_COMMON_SRCDIR -SPICE_COMMON_SRCDIR='$(top_srcdir)'/common # no opengl support yet AM_CONDITIONAL(SUPPORT_GL, false) @@ -71,9 +69,9 @@ AC_CHECK_HEADERS([sys/socket.h netinet/in.h arpa/inet.h]) AC_CHECK_LIBM AC_SUBST(LIBM) -AC_CONFIG_SUBDIRS([spice-protocol]) -PROTOCOL_CFLAGS='-I ${top_srcdir}/spice-protocol' -AC_SUBST(PROTOCOL_CFLAGS) +AC_CONFIG_SUBDIRS([spice-common]) +COMMON_CFLAGS='-I ${top_srcdir}/spice-common/ -I ${top_srcdir}/spice-common/spice-protocol/' +AC_SUBST(COMMON_CFLAGS) dnl ========================================================================= dnl Chek optional features @@ -593,7 +591,6 @@ SPICE_GTK_CFLAGS="$SPICE_GLIB_CFLAGS $GTK_CFLAGS " AC_SUBST(SPICE_GLIB_CFLAGS) AC_SUBST(SPICE_GTK_CFLAGS) -AC_SUBST(SPICE_COMMON_SRCDIR) AC_SUBST(SPICE_GLIB_REQUIRES) AC_SUBST(SPICE_GTK_REQUIRES) @@ -605,12 +602,10 @@ spice-client-glib-2.0.pc spice-client-gtk-2.0.pc spice-client-gtk-3.0.pc spice-controller.pc -common/Makefile data/Makefile data/spicy.desktop.in data/spicy.nsis po/Makefile.in -python_modules/Makefile gtk/Makefile gtk/controller/Makefile doc/Makefile |