diff options
author | Ray Strode <rstrode@redhat.com> | 2013-06-12 13:19:26 -0400 |
---|---|---|
committer | Ray Strode <rstrode@redhat.com> | 2013-06-12 13:19:26 -0400 |
commit | 17af4612e877c3a5c6bff67064d648f0eb2ea0cc (patch) | |
tree | df20a637f57310fda977776e328dde0c2c4a58d9 | |
parent | c3ca1e3c7837d8277bcd0b9932710ce1df9311b9 (diff) |
vala: drop .vapi file
It's caused various problems with distcheck, vala projects don't
actually need it (they can just use gobject-introspection instead),
and the Vala FAQ recommends shipping .vapi files in the consumer
source, not provider source:
Is having a local copy of a .vapi in my project
good practice?
Yes, it certainly is. There are a number of
reasons why you want to do this.
1. Sometimes fixing bindings may lead to breakage in
projects using such bindings. So having a local
copy means that your project will not break
whenever a bindings is updated system-wide.
2. If your project works with such bindings,
there's no need to upgrade the bindings just for
the sake of being up-to-date. It works, that's
what matters.
3. It's you that decide when to upgrade the
bindings, not the system. Thus it's you that
decide when to break your own project in order to
have more up-to-date bindings. Your project will
keep compiling fine, even if system-wide bindings
change.
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | m4/vapigen.m4 | 88 | ||||
-rw-r--r-- | src/libaccountsservice/Makefile.am | 19 |
3 files changed, 0 insertions, 109 deletions
diff --git a/configure.ac b/configure.ac index 147ca68..c43f364 100644 --- a/configure.ac +++ b/configure.ac @@ -38,8 +38,6 @@ AC_SUBST(LIBACCOUNTSSERVICE_CFLAGS) GOBJECT_INTROSPECTION_CHECK([0.9.12]) -VAPIGEN_CHECK - dnl --------------------------------------------------------------------------- dnl - Core configuration dnl --------------------------------------------------------------------------- diff --git a/m4/vapigen.m4 b/m4/vapigen.m4 deleted file mode 100644 index 4805107..0000000 --- a/m4/vapigen.m4 +++ /dev/null @@ -1,88 +0,0 @@ -dnl vala.m4 -dnl -dnl Copyright 2012 Evan Nemerson -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -# VAPIGEN_CHECK([VERSION], [API_VERSION], [FOUND-INTROSPECTION]) -# -------------------------------------- -# Check that vapigen existence and version -# -# See http://live.gnome.org/Vala/UpstreamGuide for detailed documentation -AC_DEFUN([VAPIGEN_CHECK], -[ - AC_BEFORE([GOBJECT_INTROSPECTION_CHECK],[$0]) - AC_BEFORE([GOBJECT_INTROSPECTION_REQUIRE],[$0]) - - AC_ARG_ENABLE([vala], - AS_HELP_STRING([--enable-vala[=@<:@no/auto/yes@:>@]], - [build Vala bindings [[default=auto]]]),, - [enable_vala=auto]) - - AS_CASE([$enable_vala], [no], [], - [yes], [ - AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [ - AC_MSG_ERROR([Vala bindings require GObject Introspection]) - ]) - ], [auto], [ - AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [ - enable_vala=no - ]) - ], [ - AC_MSG_ERROR([Invalid argument passed to --enable-vala, should be one of @<:@no/auto/yes@:>@]) - ]) - - AS_IF([test "x$2" = "x"], [ - vapigen_pkg_name=vapigen - ], [ - vapigen_pkg_name=vapigen-$2 - ]) - AS_IF([test "x$1" = "x"], [ - vapigen_pkg="$vapigen_pkg_name" - ], [ - vapigen_pkg="$vapigen_pkg_name >= $1" - ]) - - PKG_PROG_PKG_CONFIG - - PKG_CHECK_EXISTS([$vapigen_pkg], [ - AS_IF([test "$enable_vala" = "auto"], [ - enable_vala=yes - ]) - ], [ - AS_CASE([$enable_vala], [yes], [ - AC_MSG_ERROR([$vapigen_pkg not found]) - ], [auto], [ - enable_vala=no - ]) - ]) - - AS_CASE([$enable_vala], - [yes], [ - VAPIGEN=`$PKG_CONFIG --variable=vapigen vapigen` - VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir vapigen`/vala/Makefile.vapigen - AS_IF([test "x$2" = "x"], [ - VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir vapigen` - ], [ - VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned vapigen` - ]) - ]) - - AC_SUBST([VAPIGEN]) - AC_SUBST([VAPIGEN_VAPIDIR]) - AC_SUBST([VAPIGEN_MAKEFILE]) - - AM_CONDITIONAL(ENABLE_VAPIGEN, test "x$enable_vala" = "xyes") -]) diff --git a/src/libaccountsservice/Makefile.am b/src/libaccountsservice/Makefile.am index 7b1f658..5c1684e 100644 --- a/src/libaccountsservice/Makefile.am +++ b/src/libaccountsservice/Makefile.am @@ -131,22 +131,3 @@ endif MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = org.freedesktop.ConsoleKit.Manager.xml org.freedesktop.ConsoleKit.Seat.xml org.freedesktop.ConsoleKit.Session.xml - -if ENABLE_VAPIGEN --include $(VAPIGEN_MAKEFILE) - -accountsservice.vapi: AccountsService-1.0.gir accountsservice.deps - -VAPIGEN_VAPIS = accountsservice.vapi - -accountsservice_vapi_METADATADIRS = $(srcdir) -accountsservice_vapi_FILES = AccountsService-1.0.gir - -vapidir = $(VAPIGEN_VAPIDIR) -vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps) - -EXTRA_DIST += accountsservice.deps accountsservice.vapi -CLEANFILES += accountsservice.vapi - - -endif |