[Spice-commits] 5 commits - gtk/Makefile.am vapi/Makefile.am
Marc-André Lureau
elmarco at kemper.freedesktop.org
Wed Oct 29 03:41:34 PDT 2014
gtk/Makefile.am | 20 ++++++++++++++------
vapi/Makefile.am | 7 ++++---
2 files changed, 18 insertions(+), 9 deletions(-)
New commits:
commit 32a3a7a29bb4ef8fcff2fb2c236d5333e292e883
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date: Tue Oct 28 21:30:25 2014 +0100
build-sys: make vapigen silent
diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 46f06a0..ad43d69 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -20,14 +20,14 @@ EXTRA_DIST = \
CLEANFILES += $(vapi_DATA)
spice-client-glib-2.0.vapi: $(top_builddir)/gtk/SpiceClientGLib-2.0.gir SpiceClientGLib-2.0.metadata
- $(AM_V_GEN)$(VAPIGEN) \
+ $(AM_V_GEN)$(VAPIGEN) -q \
--metadatadir=$(srcdir) \
--library spice-client-glib-2.0 \
--pkg gio-2.0 \
$<
spice-client-gtk-$(SPICE_GTK_API_VERSION).vapi: $(top_builddir)/gtk/SpiceClientGtk-$(SPICE_GTK_API_VERSION).gir spice-client-glib-2.0.vapi
- $(AM_V_GEN)$(VAPIGEN) \
+ $(AM_V_GEN)$(VAPIGEN) -q \
--vapidir=$(builddir) \
--girdir=$(top_builddir)/gtk \
--pkg spice-client-glib-2.0 \
commit 8d6d14718e8d9d9346683f6ce33dcf3400eac740
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date: Tue Oct 28 21:30:13 2014 +0100
build-sys: clean-up generated vapi files
diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 568007d..46f06a0 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -17,6 +17,8 @@ EXTRA_DIST = \
SpiceClientGLib-2.0.metadata \
$(NULL)
+CLEANFILES += $(vapi_DATA)
+
spice-client-glib-2.0.vapi: $(top_builddir)/gtk/SpiceClientGLib-2.0.gir SpiceClientGLib-2.0.metadata
$(AM_V_GEN)$(VAPIGEN) \
--metadatadir=$(srcdir) \
commit 716de3b1d232a12b03a0efc9c844de15b5078f25
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date: Tue Oct 28 21:29:27 2014 +0100
build-sys: remove unnecessary BUILT_SOURCES rule
diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index e19aefc..568007d 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -11,7 +11,6 @@ dist_vapi_DATA = \
spice-client-glib-2.0.deps \
$(NULL)
-BUILT_SOURCES = $(vapi_DATA)
EXTRA_DIST = \
spice-client-gtk-2.0.deps \
spice-client-gtk-3.0.deps \
commit d006db824d0afca22161945388fed5187cf29ee6
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date: Tue Oct 28 21:11:20 2014 +0100
build-sys: add extra dependencies on symbols files
Whenever the symbols files are modified, rebuild the library.
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 2868cc4..1430354 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -61,10 +61,14 @@ endif
if HAVE_LD_VERSION_SCRIPT
GLIB_SYMBOLS_LDFLAGS = -Wl,--version-script=${srcdir}/map-file
+GLIB_SYMBOLS_FILE = map-file
GTK_SYMBOLS_LDFLAGS = $(GLIB_SYMBOLS_LDFLAGS)
+GTK_SYMBOLS_FILE = $(GLIB_SYMBOLS_FILE)
else
GLIB_SYMBOLS_LDFLAGS = -export-symbols ${srcdir}/spice-glib-sym-file
+GLIB_SYMBOLS_FILE = spice-glib-sym-file
GTK_SYMBOLS_LDFLAGS = -export-symbols ${srcdir}/spice-gtk-sym-file
+GTK_SYMBOLS_FILE = spice-gtk-sym-file
endif
KEYMAP_GEN = $(srcdir)/keymap-gen.pl
@@ -153,11 +157,13 @@ SPICE_GTK_SOURCES_COMMON += \
endif
if HAVE_GTK_2
+libspice_client_gtk_2_0_la_DEPEDENCIES = $(GTK_SYMBOLS_FILE)
libspice_client_gtk_2_0_la_LDFLAGS = $(SPICE_GTK_LDFLAGS_COMMON)
libspice_client_gtk_2_0_la_LIBADD = $(SPICE_GTK_LIBADD_COMMON)
libspice_client_gtk_2_0_la_SOURCES = $(SPICE_GTK_SOURCES_COMMON)
nodist_libspice_client_gtk_2_0_la_SOURCES = $(nodist_SPICE_GTK_SOURCES_COMMON)
else
+libspice_client_gtk_3_0_la_DEPEDENCIES = $(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)
@@ -177,6 +183,8 @@ nodist_libspice_client_gtkinclude_HEADERS = \
spice-widget-enums.h \
$(NULL)
+libspice_client_glib_2_0_la_DEPENDENCIES = $(GLIB_SYMBOLS_FILE)
+
libspice_client_glib_2_0_la_LDFLAGS = \
-version-info 13:0:5 \
-no-undefined \
commit 42412783286b53bb6115d00f7dc0ede4857ae274
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date: Wed Oct 29 11:38:38 2014 +0100
build-sys: s/GLIB_VERSION/GLIB_SYMBOLS
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 3d87958..2868cc4 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -60,11 +60,11 @@ lib_LTLIBRARIES += libspice-client-gtk-3.0.la
endif
if HAVE_LD_VERSION_SCRIPT
-GLIB_VERSION_LDFLAGS = -Wl,--version-script=${srcdir}/map-file
-GTK_VERSION_LDFLAGS = $(GLIB_VERSION_LDFLAGS)
+GLIB_SYMBOLS_LDFLAGS = -Wl,--version-script=${srcdir}/map-file
+GTK_SYMBOLS_LDFLAGS = $(GLIB_SYMBOLS_LDFLAGS)
else
-GLIB_VERSION_LDFLAGS = -export-symbols ${srcdir}/spice-glib-sym-file
-GTK_VERSION_LDFLAGS = -export-symbols ${srcdir}/spice-gtk-sym-file
+GLIB_SYMBOLS_LDFLAGS = -export-symbols ${srcdir}/spice-glib-sym-file
+GTK_SYMBOLS_LDFLAGS = -export-symbols ${srcdir}/spice-gtk-sym-file
endif
KEYMAP_GEN = $(srcdir)/keymap-gen.pl
@@ -107,7 +107,7 @@ AM_CPPFLAGS = \
SPICE_GTK_LDFLAGS_COMMON = \
-version-info 4:0:0 \
-no-undefined \
- $(GTK_VERSION_LDFLAGS) \
+ $(GTK_SYMBOLS_LDFLAGS) \
$(NULL)
SPICE_GTK_LIBADD_COMMON = \
@@ -180,7 +180,7 @@ nodist_libspice_client_gtkinclude_HEADERS = \
libspice_client_glib_2_0_la_LDFLAGS = \
-version-info 13:0:5 \
-no-undefined \
- $(GLIB_VERSION_LDFLAGS) \
+ $(GLIB_SYMBOLS_LDFLAGS) \
$(NULL)
libspice_client_glib_2_0_la_LIBADD = \
More information about the Spice-commits
mailing list