From ed1790eec652d6154022d8b0ce5045c9d1f53d63 Mon Sep 17 00:00:00 2001 From: Imran Zaman Date: Wed, 12 Jun 2013 16:45:45 +0300 Subject: [PATCH] fixed issues reported by make distcheck --- Makefile.am | 2 +- configure.ac | 7 +++++-- libgsignon-glib/Makefile.am | 16 ++++++++++++---- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index 624be76..bea270e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ ACLOCAL_AMFLAGS = -I m4 -DISTCHECK_CONFIGURE_FLAGS = \ +AM_DISTCHECK_CONFIGURE_FLAGS = \ --enable-gtk-doc \ --enable-introspection=yes SUBDIRS = libgsignon-glib docs diff --git a/configure.ac b/configure.ac index f90946b..16fa5f0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.64]) AC_INIT([libgsignon-glib], - [2.0], + [2.0.0], [http://code.google.com/p/accounts-sso/issues/entry], [libgsignon-glib], [http://code.google.com/p/accounts-sso/]) @@ -11,7 +11,7 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR([libgsignon-glib.pc.in]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([1.11 check-news nostdinc silent-rules subdir-objects -Wno-portability]) +AM_INIT_AUTOMAKE([1.11 nostdinc silent-rules subdir-objects -Wno-portability]) AC_PROG_CC AC_PROG_CC_STDC @@ -63,6 +63,9 @@ elif test "x$enable_dbus_type" = "xsession" ; then elif test "x$enable_dbus_type" = "xsystem" ; then AC_DEFINE(SIGNOND_BUS_TYPE, [G_BUS_TYPE_SYSTEM], [Use system bus]) fi +if test "x$enable_dbus_type" != "xp2p" ; then + DBUS_INTERFACES_DIR="`pkg-config --variable interfaces_dir dbus-1`" +fi AM_CONDITIONAL(HAVE_GTESTDBUS, [test x$gtestdbus = xyes]) diff --git a/libgsignon-glib/Makefile.am b/libgsignon-glib/Makefile.am index 9263685..78e1c96 100644 --- a/libgsignon-glib/Makefile.am +++ b/libgsignon-glib/Makefile.am @@ -80,23 +80,23 @@ libgsignon_glib_headers_with_enums = \ # This should come from `pkg-config --variable=interfaces_dir dbus-1` # default is /usr/share/dbus-1/interfaces -DBUS_INTERFACES_DIR = interfaces +INTERFACES_DIR = $(top_srcdir)/libgsignon-glib/interfaces -sso-auth-service-gen.h sso-auth-service-gen.c: $(DBUS_INTERFACES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.AuthService.xml +sso-auth-service-gen.h sso-auth-service-gen.c: $(INTERFACES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.AuthService.xml $(AM_V_GEN)gdbus-codegen \ --generate-c-code sso-auth-service-gen \ --generate-docbook sso-auth-service-gen-doc \ --annotate "com.google.code.AccountsSSO.gSingleSignOn.AuthService" org.gtk.GDBus.C.Name SsoAuthService \ $< -sso-auth-session-gen.h sso-auth-session-gen.c: $(DBUS_INTERFACES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.AuthSession.xml +sso-auth-session-gen.h sso-auth-session-gen.c: $(INTERFACES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.AuthSession.xml $(AM_V_GEN)gdbus-codegen \ --generate-c-code sso-auth-session-gen \ --generate-docbook sso-auth-session-gen-doc \ --annotate "com.google.code.AccountsSSO.gSingleSignOn.AuthSession" org.gtk.GDBus.C.Name SsoAuthSession \ $< -sso-identity-gen.h sso-identity-gen.c: $(DBUS_INTERFACES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.Identity.xml +sso-identity-gen.h sso-identity-gen.c: $(INTERFACES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.Identity.xml $(AM_V_GEN)gdbus-codegen \ --generate-c-code sso-identity-gen \ --generate-docbook sso-identity-gen-doc \ @@ -209,6 +209,14 @@ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) CLEANFILES += $(gir_DATA) $(typelib_DATA) endif +dbusinterfacesdir = $(DBUS_INTERFACES_DIR) +dbusinterfaces_DATA = \ + $(INTERFACES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.AuthService.xml\ + $(INTERFACES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.AuthSession.xml\ + $(INTERFACES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.Identity.xml + +EXTRA_DIST = interfaces + # Vala bindings #vapidir = $(datadir)/vala/vapi #dist_vapi_DATA = \ -- 2.34.1