[Spice-commits] 2 commits - configure.ac gtk/Makefile.am

[Hans de Goede]

 configure.ac    |    2 +-
 gtk/Makefile.am |   20 +++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit 86a1d20c61260a2bac143c9719303c2d8787cbdf
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Fri Sep 2 17:36:33 2011 +0200

    gtk/Makefile.am: Better explicit deps fro autogenerated files
    
    Auto-generated files need explicit deps on them to ensure things
    are build in the right order when doing things like make -j200:
    1) We had an explicit deps on spice-marshal.h, but only for spice-channel.c,
       but others need it to
    2) autogen.c files need autogen.h, note this is done in a separate make
       statement, since the deps of the actual build rule are used during the
       generation!
    3) Group all the autogen explicit deps together
    
    Signed-off-by: Hans de Goede <hdegoede at redhat.com>

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index c21af16..40fd327 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -381,7 +381,17 @@ spicy_stats_LDADD =				\
 
 
 
-spice-channel.c: spice-marshal.h
+$(libspice_client_glib_2_0_la_SOURCES): spice-glib-enums.h spice-marshal.h
+
+if HAVE_GTK_2
+$(libspice_client_gtk_2_0_la_SOURCES): spice-glib-enums.h spice-widget-enums.h
+else
+$(libspice_client_gtk_3_0_la_SOURCES): spice-glib-enums.h spice-widget-enums.h
+endif
+
+spice-marshal.c: spice-marshal.h
+spice-glib-enums.c: spice-glib-enums.h
+spice-widget-enums.c: spice-widget-enums.h
 
 spice-marshal.c: spice-marshal.txt
 	$(AM_V_GEN)echo "#include \"spice-marshal.h\"" > $@ && \
@@ -390,8 +400,6 @@ spice-marshal.c: spice-marshal.txt
 spice-marshal.h: spice-marshal.txt
 	$(AM_V_GEN)glib-genmarshal --header $< > $@ || (rm -f $@ && exit 1)
 
-$(libspice_client_glib_2_0_la_SOURCES): spice-glib-enums.h
-
 spice-glib-enums.c: spice-channel.h channel-inputs.h spice-session.h
 	$(AM_V_GEN)glib-mkenums --fhead "#include <glib-object.h>\n" \
 			--fhead "#include \"spice-glib-enums.h\"\n\n" \
@@ -418,12 +426,6 @@ spice-glib-enums.h: spice-channel.h channel-inputs.h spice-session.h
 			--eprod "GType @enum_name at _get_type (void);\n" \
 		$^ >  $@
 
-if HAVE_GTK_2
-$(libspice_client_gtk_2_0_la_SOURCES): spice-glib-enums.h spice-widget-enums.h
-else
-$(libspice_client_gtk_3_0_la_SOURCES): spice-glib-enums.h spice-widget-enums.h
-endif
-
 spice-widget-enums.c: spice-widget.h
 	$(AM_V_GEN)glib-mkenums --fhead "#include <glib-object.h>\n" \
 			--fhead "#include \"spice-widget-enums.h\"\n\n" \
commit d9040ea7f713204def2787a1ea380e39be76ebf5
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Fri Sep 2 16:52:45 2011 +0200

    configure.ac: Update minimum required spice-protocol to 0.9.0
    
    This is needed for usbredir support.
    
    Signed-off-by: Hans de Goede <hdegoede at redhat.com>

diff --git a/configure.ac b/configure.ac
index 98b91de..4550c8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,7 @@ AC_CHECK_HEADERS([sys/socket.h netinet/in.h arpa/inet.h])
 
 dnl =========================================================================
 dnl Chek optional features
-PKG_CHECK_MODULES(PROTOCOL, spice-protocol >= 0.8.1)
+PKG_CHECK_MODULES(PROTOCOL, spice-protocol >= 0.9.0)
 AC_SUBST(PROTOCOL_CFLAGS)
 
 SPICE_GLIB_REQUIRES=""