dist: fix distribution tarball and out-of-tree build

diff --git a/src/daemon/dbus/Makefile.am b/src/daemon/dbus/Makefile.am
index bfc2982..9d1f927 100644 (file)
--- a/src/daemon/dbus/Makefile.am
+++ b/src/daemon/dbus/Makefile.am
@@ -16,7 +16,7 @@ DBUS_BUILT_DOCS = \
     gsignond-dbus-auth-service-doc-gen-com.google.code.AccountsSSO.gSingleSignOn.AuthService.xml \
     gsignond-dbus-auth-session-doc-gen-com.google.code.AccountsSSO.gSingleSignOn.AuthSession.xml \
     gsignond-dbus-identity-doc-gen-com.google.code.AccountsSSO.gSingleSignOn.Identity.xml \
-    gsignond-dbus-remote-plugin-doc-gen-com.google.code.AccountsSSO.gSingleSignOn.RemotePlugin.xml \
+    gsignond-dbus-remote-plugin-doc-gen-com.google.code.AccountsSSO.gSingleSignOn.RemotePlugin.V1.xml \
     $(NULL)
 
 DBUS_INTERFACE_PREFIX="com.google.code.AccountsSSO.gSingleSignOn."
@@ -63,7 +63,7 @@ libgsignond_dbus_glue_la_LIBADD = \
     $(GSIGNOND_LIBS) \
     $(NULL)
 
-libgsignond_dbus_glue_la_SOURCES = $(DBUS_BUILT_SOURCES)
+nodist_libgsignond_dbus_glue_la_SOURCES = $(DBUS_BUILT_SOURCES)
 
 noinst_LTLIBRARIES += libgsignond-dbus.la
 
@@ -81,7 +81,6 @@ libgsignond_dbus_la_LIBADD = \
     $(NULL)
 
 libgsignond_dbus_la_SOURCES = \
-   $(DBUS_BUILT_SOURCES) \
    gsignond-dbus.h \
    gsignond-dbus-server.c \
    gsignond-dbus-server.h \
@@ -95,6 +94,10 @@ libgsignond_dbus_la_SOURCES = \
    gsignond-dbus-signonui-adapter.h \
    $(NULL)
 
+nodist_libgsignond_dbus_la_SOURCES = \
+   $(DBUS_BUILT_SOURCES) \
+   $(NULL)
+
 dbusservicedir = $(DBUS_SERVICES_DIR)
 dbusservice_DATA = \
     $(SERVICES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.service

diff --git a/test/common/Makefile.am b/test/common/Makefile.am
index d98f3c9..71112d4 100644 (file)
--- a/test/common/Makefile.am
+++ b/test/common/Makefile.am
@@ -13,6 +13,7 @@ commontest_CFLAGS = \
     $(GSIGNOND_CFLAGS) \
     $(CHECK_CFLAGS) \
     -I$(top_builddir) \
+    -I$(top_builddir)/src/ \
     -I$(top_srcdir)/include/ \
     -I$(top_srcdir)/src/
 

diff --git a/test/daemon/Makefile.am b/test/daemon/Makefile.am
index d2230e9..1ca7ae1 100644 (file)
--- a/test/daemon/Makefile.am
+++ b/test/daemon/Makefile.am
@@ -17,6 +17,7 @@ daemontest_CFLAGS = \
     -U G_LOG_DOMAIN \
     -DG_LOG_DOMAIN=\"gsignond-test-server\" \
     -I$(top_builddir) \
+    -I$(top_builddir)/src/ \
     -I$(top_srcdir)/src/ \
     -I$(top_srcdir)/include/
 

diff --git a/test/db/Makefile.am b/test/db/Makefile.am
index 5301171..73174bf 100644 (file)
--- a/test/db/Makefile.am
+++ b/test/db/Makefile.am
@@ -11,6 +11,7 @@ dbtest_CFLAGS = \
     $(GSIGNOND_CFLAGS) \
     $(CHECK_CFLAGS) \
     -I$(top_builddir) \
+    -I$(top_builddir)/src/ \
     -I$(top_srcdir)/src/ \
     -I$(top_srcdir)/include/ 
 

diff --git a/test/plugins/Makefile.am b/test/plugins/Makefile.am
index d45c02e..12ea54e 100644 (file)
--- a/test/plugins/Makefile.am
+++ b/test/plugins/Makefile.am
@@ -15,6 +15,7 @@ digestplugintest_CFLAGS = \
     $(GSIGNOND_CFLAGS) \
     $(CHECK_CFLAGS) \
     -I$(top_builddir) \
+    -I$(top_builddir)/src/ \
     -I$(top_srcdir)/src \
     -I$(top_srcdir)/src/plugins/digest \
     -I$(top_srcdir)/include
@@ -30,6 +31,7 @@ passwordplugintest_CFLAGS = \
     $(GSIGNOND_CFLAGS) \
     $(CHECK_CFLAGS) \
     -I$(top_builddir) \
+    -I$(top_builddir)/src/ \
     -I$(top_srcdir)/src \
     -I$(top_srcdir)/src/plugins/password \
     -I$(top_srcdir)/include/
@@ -45,6 +47,7 @@ pluginproxytest_CFLAGS = \
     $(GSIGNOND_CFLAGS) \
     $(CHECK_CFLAGS) \
     -I$(top_builddir) \
+    -I$(top_builddir)/src/ \
     -I$(top_srcdir)/src \
     -I$(top_srcdir)/src/daemon/plugins \
     -I$(top_srcdir)/include
@@ -60,6 +63,7 @@ pluginremotetest_CFLAGS = \
     $(GSIGNOND_CFLAGS) \
     $(CHECK_CFLAGS) \
     -I$(top_builddir) \
+    -I$(top_builddir)/src/ \
     -I$(top_srcdir)/src \
     -I$(top_srcdir)/src/daemon/plugins \
     -I$(top_srcdir)/include