From 8a86366b7a49e4d31e13f717bc679ad0ac146727 Mon Sep 17 00:00:00 2001 From: Imran Zaman Date: Wed, 12 Jun 2013 15:12:35 +0300 Subject: [PATCH] fixed issues reported by 'make distcheck' --- Makefile.am | 2 ++ configure.ac | 2 +- src/common/Makefile.am | 10 +++++++++- src/common/db/Makefile.am | 7 ++++++- src/daemon/Makefile.am | 7 ++++--- src/daemon/db/Makefile.am | 6 ++++-- src/daemon/dbus/Makefile.am | 7 ++++--- src/daemon/plugins/Makefile.am | 11 ++++++++--- src/daemon/plugins/plugind/Makefile.am | 10 ++++++---- src/extensions/test/Makefile.am | 12 ++++++++---- src/extensions/tizen/Makefile.am | 14 +++++++++----- src/plugins/digest/Makefile.am | 3 ++- src/plugins/password/Makefile.am | 3 ++- src/plugins/ssotest/Makefile.am | 3 ++- test/Makefile.am | 6 +++++- test/common/Makefile.am | 10 ++++++---- test/daemon/Makefile.am | 3 ++- test/db/Makefile.am | 2 +- test/plugins/Makefile.am | 8 ++++---- 19 files changed, 85 insertions(+), 41 deletions(-) diff --git a/Makefile.am b/Makefile.am index 23411d7..56541ab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 +AM_DISTCHECK_CONFIGURE_FLAGS = "--enable-debug" + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gsignond.pc diff --git a/configure.ac b/configure.ac index ec2c4a9..245f0f7 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.60]) -AC_INIT([gsignond], [0.1],[],[],[http://code.google.com/p/accounts-sso/]) +AC_INIT([gsignond], [0.0.1],[],[],[http://code.google.com/p/accounts-sso/]) AC_CONFIG_SRCDIR([src/daemon/main.c]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 66d4fb3..38ac909 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -27,7 +27,7 @@ gsignond-plugin-enum-types.c: gsignond-enum.c.template $(GSIGNOND_INCLUDE_DIR)/g libgsignond_common_la_CPPFLAGS = \ - -I$(top_srcdir) \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/include \ $(GSIGNOND_CFLAGS) \ @@ -51,6 +51,7 @@ libgsignond_common_la_SOURCES = \ gsignond-access-control-manager.c \ gsignond-extension-interface.c \ gsignond-storage-manager.c \ + gsignond-identity-info-internal.h \ gsignond-identity-info.c \ gsignond-credentials.c \ gsignond-config.c \ @@ -59,13 +60,20 @@ libgsignond_common_la_SOURCES = \ gsignond-dictionary.c \ gsignond-session-data.c \ gsignond-signonui-data.c \ + gsignond-plugin-loader.h \ gsignond-plugin-loader.c \ gsignond-utils.c \ + gsignond-pipe-stream.h \ gsignond-pipe-stream.c \ gsignond-disposable.h \ gsignond-disposable.c \ $(BUILT_SOURCES) \ $(NULL) +dist_libgsignond_common_la_SOURCES = \ + gsignond-enum.c.template \ + gsignond-enum.h.template \ + $(NULL) + CLEANFILES = diff --git a/src/common/db/Makefile.am b/src/common/db/Makefile.am index 6fab49e..c132817 100644 --- a/src/common/db/Makefile.am +++ b/src/common/db/Makefile.am @@ -2,7 +2,7 @@ noinst_LTLIBRARIES = libgsignond-common-db.la NULL= libgsignond_common_db_la_CPPFLAGS = \ - -I$(top_srcdir) \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/include \ $(GSIGNOND_CFLAGS) @@ -11,10 +11,15 @@ libgsignond_common_db_la_LIBS = \ $(GSIGNOND_LIBS) libgsignond_common_db_la_SOURCES = \ + gsignond-db-defines.h \ + gsignond-db-error.h \ gsignond-db-error.c \ + gsignond-db-sql-database.h \ gsignond-db-sql-database.c \ + gsignond-db-secret-database.h \ gsignond-db-secret-database.c \ gsignond-secret-storage.c \ + gsignond-db-sql-database-private.h \ $(NULL) diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index 3a90b9a..9d45622 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -54,13 +54,14 @@ gsignond_SOURCES = \ gsignond-identity.h \ gsignond-signonui-proxy.c \ gsignond-signonui-proxy.h \ + gsignond-types.h \ $(BUILT_SOURCES) \ $(NULL) gsignond_CFLAGS = \ - -I$(top_srcdir) \ - -I$(top_builddir)/include/ \ - -I$(top_builddir)/src/ \ + -I$(top_builddir) \ + -I$(top_srcdir)/include/ \ + -I$(top_srcdir)/src/ \ $(GSIGNOND_CFLAGS) \ $(NULL) diff --git a/src/daemon/db/Makefile.am b/src/daemon/db/Makefile.am index 80dee4b..3bb7fac 100644 --- a/src/daemon/db/Makefile.am +++ b/src/daemon/db/Makefile.am @@ -1,17 +1,19 @@ lib_LTLIBRARIES = libgsignond-db.la libgsignond_db_la_CPPFLAGS = \ - -I$(top_srcdir) \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/include \ $(GSIGNOND_CFLAGS) libgsignond_db_la_LIBADD = \ - $(top_srcdir)/src/common/libgsignond-common.la \ + $(top_builddir)/src/common/libgsignond-common.la \ $(GSIGNOND_LIBS) libgsignond_db_la_SOURCES = \ + gsignond-db-credentials-database.h \ gsignond-db-credentials-database.c \ + gsignond-db-metadata-database.h \ gsignond-db-metadata-database.c CLEANFILES = diff --git a/src/daemon/dbus/Makefile.am b/src/daemon/dbus/Makefile.am index a24b8de..a5f9596 100644 --- a/src/daemon/dbus/Makefile.am +++ b/src/daemon/dbus/Makefile.am @@ -1,6 +1,6 @@ NULL= INTERFACES_DIR = $(top_srcdir)/src/daemon/dbus/interfaces -SERVICES_DIR = $(top_srcdir)/src/daemon/dbus/services +SERVICES_DIR = $(top_builddir)/src/daemon/dbus/services DBUS_BUILT_SOURCES = \ gsignond-dbus-auth-service-gen.c \ gsignond-dbus-auth-service-gen.h \ @@ -66,7 +66,7 @@ gsignond-dbus-remote-plugin-gen.c gsignond-dbus-remote-plugin-gen.h : $(INTERFAC lib_LTLIBRARIES = libgsignond-dbus-glue.la libgsignond_dbus_glue_la_CPPFLAGS = \ - -I$(top_srcdir) \ + -I$(top_builddir) \ $(GSIGNOND_CFLAGS) \ $(NULL) @@ -79,9 +79,10 @@ libgsignond_dbus_glue_la_SOURCES = $(DBUS_BUILT_SOURCES) lib_LTLIBRARIES += libgsignond-dbus.la libgsignond_dbus_la_CPPFLAGS = \ - -I$(top_srcdir) \ + -I$(top_builddir) \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src \ + -I$(top_builddir)/src/daemon/dbus \ $(GSIGNOND_CFLAGS) \ $(NULL) diff --git a/src/daemon/plugins/Makefile.am b/src/daemon/plugins/Makefile.am index 3ae2d61..1892a6a 100644 --- a/src/daemon/plugins/Makefile.am +++ b/src/daemon/plugins/Makefile.am @@ -3,19 +3,24 @@ SUBDIRS = plugind lib_LTLIBRARIES = libgsignond-plugins.la libgsignond_plugins_la_CPPFLAGS = \ - -I$(top_srcdir) \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/include \ + -I$(top_builddir)/src \ $(GSIGNOND_CFLAGS) libgsignond_plugins_la_LIBADD = \ - $(top_srcdir)/src/common/libgsignond-common.la \ - $(top_srcdir)/src/daemon/dbus/libgsignond-dbus-glue.la \ + $(top_builddir)/src/common/libgsignond-common.la \ + $(top_builddir)/src/daemon/dbus/libgsignond-dbus-glue.la \ $(GSIGNOND_LIBS) libgsignond_plugins_la_SOURCES = \ + gsignond-plugin-proxy.h \ gsignond-plugin-proxy.c \ + gsignond-plugin-proxy-factory.h \ gsignond-plugin-proxy-factory.c \ + gsignond-plugin-remote-private.h \ + gsignond-plugin-remote.h \ gsignond-plugin-remote.c CLEANFILES = diff --git a/src/daemon/plugins/plugind/Makefile.am b/src/daemon/plugins/plugind/Makefile.am index 06e13ac..c48eb15 100644 --- a/src/daemon/plugins/plugind/Makefile.am +++ b/src/daemon/plugins/plugind/Makefile.am @@ -4,17 +4,19 @@ NULL= lib_LTLIBRARIES = libgsignond-plugind-daemon.la libgsignond_plugind_daemon_la_CPPFLAGS = \ - -I$(top_srcdir) \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/include \ + -I$(top_builddir)/src \ $(GSIGNOND_CFLAGS) libgsignond_plugind_daemon_la_LIBADD = \ - $(top_srcdir)/src/common/libgsignond-common.la \ - $(top_srcdir)/src/daemon/dbus/libgsignond-dbus-glue.la \ + $(top_builddir)/src/common/libgsignond-common.la \ + $(top_builddir)/src/daemon/dbus/libgsignond-dbus-glue.la \ $(GSIGNOND_LIBS) libgsignond_plugind_daemon_la_SOURCES = \ + gsignond-plugin-daemon.h \ gsignond-plugin-daemon.c bin_PROGRAMS = gsignond-plugind @@ -24,7 +26,7 @@ gsignond_plugind_SOURCES = \ $(NULL) gsignond_plugind_CFLAGS = \ - -I$(top_srcdir) \ + -I$(top_builddir) \ -I$(top_srcdir)/include/ \ -I$(top_srcdir)/src/ \ $(GSIGNOND_CFLAGS) \ diff --git a/src/extensions/test/Makefile.am b/src/extensions/test/Makefile.am index 95bb93e..16ac00d 100644 --- a/src/extensions/test/Makefile.am +++ b/src/extensions/test/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/common.mk extensions_LTLIBRARIES = libextension-test.la libextension_test_la_CPPFLAGS = \ - -I$(top_srcdir) \ + -I$(top_builddir) \ -I$(top_srcdir)/include \ $(GSIGNOND_CFLAGS) @@ -10,8 +10,12 @@ libextension_test_la_LIBS = \ $(GSIGNOND_LIBS) libextension_test_la_SOURCES = \ + test-access-control-manager.h \ test-access-control-manager.c \ - test-extension.c \ - test-secret-storage.c \ - test-storage-manager.c + test-extension.h \ + test-extension.c \ + test-secret-storage.h \ + test-secret-storage.c \ + test-storage-manager.h \ + test-storage-manager.c diff --git a/src/extensions/tizen/Makefile.am b/src/extensions/tizen/Makefile.am index f2c483a..bab7a13 100644 --- a/src/extensions/tizen/Makefile.am +++ b/src/extensions/tizen/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/common.mk extensions_LTLIBRARIES = libextension-tizen.la libextension_tizen_la_CPPFLAGS = \ - -I$(top_srcdir) \ + -I$(top_builddir) \ -I$(top_srcdir)/include \ $(GSIGNOND_CFLAGS) \ $(LIBSMACK_CFLAGS) \ @@ -14,8 +14,12 @@ libextension_tizen_la_LIBADD = \ $(LIBECRYPTFS_LIBS) libextension_tizen_la_SOURCES = \ - tizen-access-control-manager.c \ - tizen-extension.c \ - tizen-secret-storage.c \ - tizen-storage-manager.c + tizen-access-control-manager.h \ + tizen-access-control-manager.c \ + tizen-extension.h \ + tizen-extension.c \ + tizen-secret-storage.h \ + tizen-secret-storage.c \ + tizen-storage-manager.h \ + tizen-storage-manager.c diff --git a/src/plugins/digest/Makefile.am b/src/plugins/digest/Makefile.am index 81ee198..2274ae4 100644 --- a/src/plugins/digest/Makefile.am +++ b/src/plugins/digest/Makefile.am @@ -3,7 +3,7 @@ plugins_LTLIBRARIES = libdigest.la NULL= libdigest_la_CPPFLAGS = \ - -I$(top_srcdir) \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/include \ $(GSIGNOND_CFLAGS) \ @@ -15,6 +15,7 @@ libdigest_la_LIBADD = \ $(NULL) libdigest_la_SOURCES = \ + gsignond-digest-plugin.h \ gsignond-digest-plugin.c \ $(NULL) diff --git a/src/plugins/password/Makefile.am b/src/plugins/password/Makefile.am index 3c83302..3cd660a 100644 --- a/src/plugins/password/Makefile.am +++ b/src/plugins/password/Makefile.am @@ -3,7 +3,7 @@ plugins_LTLIBRARIES = libpassword.la NULL= libpassword_la_CPPFLAGS = \ - -I$(top_srcdir) \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/include \ $(GSIGNOND_CFLAGS) \ @@ -15,6 +15,7 @@ libpassword_la_LIBADD = \ $(NULL) libpassword_la_SOURCES = \ + gsignond-password-plugin.h \ gsignond-password-plugin.c \ $(NULL) diff --git a/src/plugins/ssotest/Makefile.am b/src/plugins/ssotest/Makefile.am index c1e8493..e84d648 100644 --- a/src/plugins/ssotest/Makefile.am +++ b/src/plugins/ssotest/Makefile.am @@ -3,7 +3,7 @@ plugins_LTLIBRARIES = libssotest.la NULL= libssotest_la_CPPFLAGS = \ - -I$(top_srcdir) \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/include \ $(GSIGNOND_CFLAGS) \ @@ -15,6 +15,7 @@ libssotest_la_LIBADD = \ $(NULL) libssotest_la_SOURCES = \ + gsignond-ssotest-plugin.h \ gsignond-ssotest-plugin.c \ $(NULL) diff --git a/test/Makefile.am b/test/Makefile.am index 00098b7..4656410 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,7 +1,11 @@ SUBDIRS = common daemon db plugins -VALGRIND_TESTS_DISABLE = +VALGRIND_TESTS_DISABLE = common db plugins valgrind: $(SUBDIRS) for t in $(filter-out $(VALGRIND_TESTS_DISABLE),$(SUBDIRS)); do \ cd $$t; $(MAKE) valgrind; cd ..;\ done; + +EXTRA_DIST = \ + valgrind.supp \ + valgrind_common.mk \ No newline at end of file diff --git a/test/common/Makefile.am b/test/common/Makefile.am index 3c7eb6e..a6c6885 100644 --- a/test/common/Makefile.am +++ b/test/common/Makefile.am @@ -1,7 +1,9 @@ TESTS = commontest TESTS_ENVIRONMENT= SSO_PLUGINS_DIR=$(top_builddir)/src/plugins/.libs \ + SSO_BIN_DIR=$(top_builddir)/src/daemon/.libs \ SSO_STORAGE_PATH=/tmp/gsignond \ - SSO_SECRET_PATH=/tmp/gsignond + SSO_SECRET_PATH=/tmp/gsignond \ + LD_LIBRARY_PATH="$(top_builddir)/src/daemon/plugins/plugind/.libs:$(top_builddir)/src/common/.libs:$(top_builddir)/src/common/db/.libs:$(top_builddir)/src/daemon/.libs:$(top_builddir)/src/daemon/db/.libs:$(top_builddir)/src/daemon/dbus/.libs:$(top_builddir)/src/daemon/plugins/.libs" VALGRIND_TESTS_DISABLE= @@ -11,9 +13,9 @@ commontest_SOURCES = commontest.c commontest_CFLAGS = \ $(GSIGNOND_CFLAGS) \ $(CHECK_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_builddir)/include/ \ - -I$(top_builddir)/src/ + -I$(top_builddir) \ + -I$(top_srcdir)/include/ \ + -I$(top_srcdir)/src/ commontest_LDADD = \ $(top_builddir)/src/common/libgsignond-common.la \ diff --git a/test/daemon/Makefile.am b/test/daemon/Makefile.am index 87d53e1..cc7d789 100644 --- a/test/daemon/Makefile.am +++ b/test/daemon/Makefile.am @@ -3,6 +3,7 @@ TESTS = daemontest TESTS_ENVIRONMENT= SSO_PLUGINS_DIR=$(top_builddir)/src/plugins/.libs \ SSO_BIN_DIR=$(top_builddir)/src/daemon/.libs \ LD_LIBRARY_PATH="$(top_builddir)/src/daemon/plugins/plugind/.libs:$(top_builddir)/src/common/.libs:$(top_builddir)/src/common/db/.libs:$(top_builddir)/src/daemon/.libs:$(top_builddir)/src/daemon/db/.libs:$(top_builddir)/src/daemon/dbus/.libs:$(top_builddir)/src/daemon/plugins/.libs" + VALGRIND_TESTS_DISABLE= check_PROGRAMS = daemontest @@ -15,7 +16,7 @@ daemontest_CFLAGS = \ $(CHECK_CFLAGS) \ -U G_LOG_DOMAIN \ -DG_LOG_DOMAIN=\"gsignond-test-server\" \ - -I$(top_srcdir) \ + -I$(top_builddir) \ -I$(top_srcdir)/src/ \ -I$(top_srcdir)/include/ diff --git a/test/db/Makefile.am b/test/db/Makefile.am index 2d7270d..94574f2 100644 --- a/test/db/Makefile.am +++ b/test/db/Makefile.am @@ -11,7 +11,7 @@ dbtest_SOURCES = dbtest.c dbtest_CFLAGS = \ $(GSIGNOND_CFLAGS) \ $(CHECK_CFLAGS) \ - -I$(top_srcdir) \ + -I$(top_builddir) \ -I$(top_srcdir)/src/ \ -I$(top_srcdir)/include/ diff --git a/test/plugins/Makefile.am b/test/plugins/Makefile.am index 6dbea77..90b02ea 100644 --- a/test/plugins/Makefile.am +++ b/test/plugins/Makefile.am @@ -15,7 +15,7 @@ digestplugintest_SOURCES = digestplugintest.c digestplugintest_CFLAGS = \ $(GSIGNOND_CFLAGS) \ $(CHECK_CFLAGS) \ - -I$(top_srcdir) \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/plugins/digest \ -I$(top_srcdir)/include @@ -30,7 +30,7 @@ passwordplugintest_SOURCES = passwordplugintest.c passwordplugintest_CFLAGS = \ $(GSIGNOND_CFLAGS) \ $(CHECK_CFLAGS) \ - -I$(top_srcdir) \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/plugins/password \ -I$(top_srcdir)/include/ @@ -45,7 +45,7 @@ pluginproxytest_SOURCES = pluginproxytest.c pluginproxytest_CFLAGS = \ $(GSIGNOND_CFLAGS) \ $(CHECK_CFLAGS) \ - -I$(top_srcdir) \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/daemon/plugins \ -I$(top_srcdir)/include @@ -60,7 +60,7 @@ pluginremotetest_SOURCES = pluginremotetest.c pluginremotetest_CFLAGS = \ $(GSIGNOND_CFLAGS) \ $(CHECK_CFLAGS) \ - -I$(top_srcdir) \ + -I$(top_builddir) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/daemon/plugins \ -I$(top_srcdir)/src/daemon/plugins/plugind \ -- 2.7.4