[Spice-commits] src/Makefile.am

Christophe Fergau teuf at kemper.freedesktop.org
Mon Jun 20 16:20:32 UTC 2016


 src/Makefile.am |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ed876b4cc94135582c1c2523750e074bf77e76b2
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Mon Jun 20 15:07:30 2016 +0200

    build: Fix _DEPENDENCIES use
    
    We want to trigger rebuild of libspice-client-gtk-3.0.la or
    libspice-client-glib-2.0.la whenever the corresponding symbol file
    changes.
    However _DEPENDENCIES is not the right way of handling that as it will
    disable automatic automake dependency generation.
    This was not causing issues mainly because _DEPENDENCIES was mispelt as
    _DEPEDENCIES.
    
    Quoting automake manual:
    https://www.gnu.org/software/automake/manual/automake.html#index-EXTRA_005fmaude_005fDEPENDENCIES-1
    « The EXTRA_*_DEPENDENCIES variable may be useful for cases where you
    merely want to augment the automake-generated _DEPENDENCIES variable
    rather than replacing it. »
    
    So this commit switches to use EXTRA_*_DEPENDENCIES rather than
    *_DEPENDENCIES.

diff --git a/src/Makefile.am b/src/Makefile.am
index 73bb39c..6fb8507 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -156,7 +156,7 @@ SPICE_GTK_SOURCES_COMMON +=		\
 endif
 
 if WITH_GTK
-libspice_client_gtk_3_0_la_DEPEDENCIES = $(GTK_SYMBOLS_FILE)
+EXTRA_libspice_client_gtk_3_0_la_DEPENDENCIES = $(GTK_SYMBOLS_FILE)
 libspice_client_gtk_3_0_la_LDFLAGS = $(SPICE_GTK_LDFLAGS_COMMON)
 libspice_client_gtk_3_0_la_LIBADD = $(SPICE_GTK_LIBADD_COMMON)
 libspice_client_gtk_3_0_la_SOURCES = $(SPICE_GTK_SOURCES_COMMON)
@@ -176,7 +176,7 @@ nodist_libspice_client_gtkinclude_HEADERS =	\
 	$(NULL)
 endif
 
-libspice_client_glib_2_0_la_DEPENDENCIES = $(GLIB_SYMBOLS_FILE)
+EXTRA_libspice_client_glib_2_0_la_DEPENDENCIES = $(GLIB_SYMBOLS_FILE)
 
 libspice_client_glib_2_0_la_LDFLAGS =	\
 	-version-info 13:0:5		\


More information about the Spice-commits mailing list