From c8d1babd0e9eeac6ec2d1b1c1a7cf113278b17e8 Mon Sep 17 00:00:00 2001 From: Travis Reitter Date: Fri, 13 May 2011 09:35:13 -0700 Subject: [PATCH] Generate backend library headers in folks/ subdirs. This is to allow in-tree building, since we changed the includedir, which makes the vapi files include headers as . Outputting our headers in a folks/ subdir works around this issue by making the backend/*/lib dir match the expected includedir layout. --- backends/libsocialweb/Makefile.am | 1 + backends/libsocialweb/lib/Makefile.am | 6 +++--- backends/telepathy/Makefile.am | 1 + backends/telepathy/lib/Makefile.am | 6 +++--- backends/tracker/Makefile.am | 1 + backends/tracker/lib/Makefile.am | 6 +++--- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/backends/libsocialweb/Makefile.am b/backends/libsocialweb/Makefile.am index 1448e2e..a611974 100644 --- a/backends/libsocialweb/Makefile.am +++ b/backends/libsocialweb/Makefile.am @@ -5,6 +5,7 @@ BACKEND_NAME = "libsocialweb" AM_CPPFLAGS = \ -I$(top_srcdir)/folks \ -I$(top_srcdir)/backends/libsocialweb/lib \ + -I$(top_srcdir)/backends/libsocialweb/lib/folks \ -include $(CONFIG_HEADER) \ -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ -DBACKEND_NAME=\"$(BACKEND_NAME)\" \ diff --git a/backends/libsocialweb/lib/Makefile.am b/backends/libsocialweb/lib/Makefile.am index 25f7a74..5b323f7 100644 --- a/backends/libsocialweb/lib/Makefile.am +++ b/backends/libsocialweb/lib/Makefile.am @@ -48,7 +48,7 @@ libfolks_libsocialweb_la_VALAFLAGS = \ --pkg libsocialweb-client \ --includedir folks \ --vapi folks-libsocialweb.vapi \ - -H folks-libsocialweb.h \ + -H folks/folks-libsocialweb.h \ $(NULL) folks_backend_libsocialweb_deps = \ @@ -82,7 +82,7 @@ libfolks_libsocialweb_la_LDFLAGS = \ folks_libsocialweb_includedir = $(includedir)/folks folks_libsocialweb_include_HEADERS = \ - folks-libsocialweb.h \ + folks/folks-libsocialweb.h \ $(NULL) vapidir = $(datadir)/vala/vapi @@ -103,7 +103,7 @@ CLEANFILES += \ MAINTAINERCLEANFILES = \ $(folks_libsocialweb_valasources:.vala=.c) \ libfolks_libsocialweb_la_vala.stamp \ - folks-libsocialweb.h \ + folks/folks-libsocialweb.h \ folks-libsocialweb.vapi \ $(NULL) diff --git a/backends/telepathy/Makefile.am b/backends/telepathy/Makefile.am index 78419ad..93c2f52 100644 --- a/backends/telepathy/Makefile.am +++ b/backends/telepathy/Makefile.am @@ -5,6 +5,7 @@ BACKEND_NAME = "telepathy" AM_CPPFLAGS = \ -I$(top_srcdir)/folks \ -I$(top_srcdir)/backends/telepathy/lib \ + -I$(top_srcdir)/backends/telepathy/lib/folks \ -include $(CONFIG_HEADER) \ -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ -DBACKEND_NAME=\"$(BACKEND_NAME)\" \ diff --git a/backends/telepathy/lib/Makefile.am b/backends/telepathy/lib/Makefile.am index 9e9073e..13af8b6 100644 --- a/backends/telepathy/lib/Makefile.am +++ b/backends/telepathy/lib/Makefile.am @@ -114,7 +114,7 @@ libfolks_telepathy_la_VALAFLAGS = \ --pkg telepathy-glib \ --includedir folks \ --vapi folks-telepathy.vapi \ - -H folks-telepathy.h \ + -H folks/folks-telepathy.h \ $(NULL) libfolks_telepathy_la_CFLAGS = \ @@ -144,7 +144,7 @@ libfolks_telepathy_la_LDFLAGS = \ folks_telepathy_includedir = $(includedir)/folks folks_telepathy_include_HEADERS = \ - folks-telepathy.h \ + folks/folks-telepathy.h \ $(NULL) vapidir = $(datadir)/vala/vapi @@ -166,7 +166,7 @@ MAINTAINERCLEANFILES = \ $(folks_telepathy_valasources:.vala=.c) \ libfolks_telepathy_la_vala.stamp \ libtp_lowlevel_la_vala.stamp \ - folks-telepathy.h \ + folks/folks-telepathy.h \ folks-telepathy.vapi \ $(dist_noinst_DATA) \ $(NULL) diff --git a/backends/tracker/Makefile.am b/backends/tracker/Makefile.am index 80e9ae8..f78316a 100644 --- a/backends/tracker/Makefile.am +++ b/backends/tracker/Makefile.am @@ -5,6 +5,7 @@ BACKEND_NAME = "tracker" AM_CPPFLAGS = \ -I$(top_srcdir)/folks \ -I$(top_srcdir)/backends/tracker/lib \ + -I$(top_srcdir)/backends/tracker/lib/folks \ -include $(CONFIG_HEADER) \ -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ -DBACKEND_NAME=\"$(BACKEND_NAME)\" \ diff --git a/backends/tracker/lib/Makefile.am b/backends/tracker/lib/Makefile.am index 1e13698..7ceaa3f 100644 --- a/backends/tracker/lib/Makefile.am +++ b/backends/tracker/lib/Makefile.am @@ -47,7 +47,7 @@ libfolks_tracker_la_VALAFLAGS = \ --pkg tracker-sparql-0.10 \ --includedir folks \ --vapi folks-tracker.vapi \ - -H folks-tracker.h \ + -H folks/folks-tracker.h \ $(NULL) folks_backend_tracker_deps = \ @@ -83,7 +83,7 @@ libfolks_tracker_la_LDFLAGS = \ folks_tracker_includedir = $(includedir)/folks folks_tracker_include_HEADERS = \ - folks-tracker.h \ + folks/folks-tracker.h \ $(NULL) vapidir = $(datadir)/vala/vapi @@ -104,7 +104,7 @@ CLEANFILES += \ MAINTAINERCLEANFILES = \ $(folks_tracker_valasources:.vala=.c) \ libfolks_tracker_la_vala.stamp \ - folks-tracker.h \ + folks/folks-tracker.h \ folks-tracker.vapi \ $(NULL) -- 2.7.4