From: Philip Withnall <philip@tecnocode.co.uk>
Date: Thu, 20 Jun 2013 16:27:24 +0000 (+0100)
Subject: build: Don’t build Vala headers in a subdirectory unnecessarily
X-Git-Tag: FOLKS_0_9_4~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4c06ecc26bfde7397357ef4ae7ad83a5925db43d;p=platform%2Fupstream%2Ffolks.git

build: Don’t build Vala headers in a subdirectory unnecessarily
---

diff --git a/backends/eds/lib/Makefile.am b/backends/eds/lib/Makefile.am
index e37a7cc..67fb7ae 100644
--- a/backends/eds/lib/Makefile.am
+++ b/backends/eds/lib/Makefile.am
@@ -50,7 +50,7 @@ libfolks_eds_la_VALAFLAGS = \
 	--pkg libxml-2.0 \
 	--includedir folks \
 	--vapi folks-eds.vapi \
-	-H folks/folks-eds.h \
+	-H folks-eds.h \
 	$(NULL)
 
 libfolks_eds_la_CFLAGS = \
@@ -88,7 +88,7 @@ libfolks_eds_la_LDFLAGS = \
 
 folks_eds_includedir = $(includedir)/folks
 folks_eds_include_HEADERS = \
-	folks/folks-eds.h \
+	folks-eds.h \
 	$(NULL)
 
 vapidir = $(datadir)/vala/vapi
@@ -146,7 +146,7 @@ FolksEds_@API_VERSION_MAJOR@_@API_VERSION_MINOR@_gir_LIBS = \
 	$(NULL)
 FolksEds_@API_VERSION_MAJOR@_@API_VERSION_MINOR@_gir_FILES = \
 $(libfolks_eds_la_SOURCES) \
-        folks/folks-eds.h \
+        folks-eds.h \
         $(NULL)
 FolksEds_@API_VERSION_MAJOR@_@API_VERSION_MINOR@_gir_NAMESPACE = FolksEds
 FolksEds_@API_VERSION_MAJOR@_@API_VERSION_MINOR@_gir_SCANNERFLAGS = --identifier-prefix=Edsf
diff --git a/backends/libsocialweb/lib/Makefile.am b/backends/libsocialweb/lib/Makefile.am
index 37c27ff..4511d3f 100644
--- a/backends/libsocialweb/lib/Makefile.am
+++ b/backends/libsocialweb/lib/Makefile.am
@@ -46,7 +46,7 @@ libfolks_libsocialweb_la_VALAFLAGS = \
 	--includedir folks \
 	--library folks-libsocialweb \
 	--vapi folks-libsocialweb.vapi \
-	-H folks/folks-libsocialweb.h \
+	-H folks-libsocialweb.h \
 	$(NULL)
 
 libfolks_libsocialweb_la_CFLAGS = \
@@ -76,7 +76,7 @@ libfolks_libsocialweb_la_LDFLAGS = \
 
 folks_libsocialweb_includedir = $(includedir)/folks
 folks_libsocialweb_include_HEADERS = \
-	folks/folks-libsocialweb.h \
+	folks-libsocialweb.h \
 	$(NULL)
 
 vapidir = $(datadir)/vala/vapi
@@ -130,7 +130,7 @@ FolksLibsocialweb_@API_VERSION_MAJOR@_@API_VERSION_MINOR@_gir_LIBS = \
 	$(NULL)
 FolksLibsocialweb_@API_VERSION_MAJOR@_@API_VERSION_MINOR@_gir_FILES = \
 $(libfolks_libsocialweb_la_SOURCES) \
-        folks/folks-libsocialweb.h \
+        folks-libsocialweb.h \
         $(NULL)
 FolksLibsocialweb_@API_VERSION_MAJOR@_@API_VERSION_MINOR@_gir_NAMESPACE = FolksLibsocialweb
 FolksLibsocialweb_@API_VERSION_MAJOR@_@API_VERSION_MINOR@_gir_SCANNERFLAGS = --identifier-prefix=Swf
diff --git a/backends/telepathy/lib/Makefile.am b/backends/telepathy/lib/Makefile.am
index 3002f5a..f4e93b4 100644
--- a/backends/telepathy/lib/Makefile.am
+++ b/backends/telepathy/lib/Makefile.am
@@ -110,7 +110,7 @@ libfolks_telepathy_la_VALAFLAGS = \
 	--includedir folks \
 	--library folks-telepathy \
 	--vapi folks-telepathy.vapi \
-	-H folks/folks-telepathy.h \
+	-H folks-telepathy.h \
 	$(NULL)
 
 libfolks_telepathy_la_CFLAGS = \
@@ -145,7 +145,7 @@ libfolks_telepathy_la_LDFLAGS = \
 
 folks_telepathy_includedir = $(includedir)/folks
 folks_telepathy_include_HEADERS = \
-	folks/folks-telepathy.h \
+	folks-telepathy.h \
 	$(NULL)
 
 vapidir = $(datadir)/vala/vapi
@@ -235,7 +235,7 @@ FolksTelepathy_@API_VERSION_MAJOR@_@API_VERSION_MINOR@_gir_LIBS = \
         $(NULL)
 FolksTelepathy_@API_VERSION_MAJOR@_@API_VERSION_MINOR@_gir_FILES = \
         $(libfolks_telepathy_la_SOURCES) \
-        folks/folks-telepathy.h \
+        folks-telepathy.h \
         $(NULL)
 FolksTelepathy_@API_VERSION_MAJOR@_@API_VERSION_MINOR@_gir_NAMESPACE = FolksTelepathy
 FolksTelepathy_@API_VERSION_MAJOR@_@API_VERSION_MINOR@_gir_SCANNERFLAGS = --identifier-prefix=Tpf
diff --git a/backends/tracker/lib/Makefile.am b/backends/tracker/lib/Makefile.am
index d7ec293..859d235 100644
--- a/backends/tracker/lib/Makefile.am
+++ b/backends/tracker/lib/Makefile.am
@@ -29,7 +29,7 @@ libfolks_tracker_la_VALAFLAGS = \
 	--includedir folks \
 	--library folks-tracker \
 	--vapi folks-tracker.vapi \
-	-H folks/folks-tracker.h \
+	-H folks-tracker.h \
 	$(NULL)
 
 libfolks_tracker_la_CPPFLAGS = \
@@ -72,7 +72,7 @@ libfolks_tracker_la_LDFLAGS = \
 
 folks_tracker_includedir = $(includedir)/folks
 folks_tracker_include_HEADERS = \
-	folks/folks-tracker.h \
+	folks-tracker.h \
 	$(NULL)
 
 vapidir = $(datadir)/vala/vapi
@@ -126,7 +126,7 @@ FolksTracker_@API_VERSION_MAJOR@_@API_VERSION_MINOR@_gir_LIBS = \
         $(NULL)
 FolksTracker_@API_VERSION_MAJOR@_@API_VERSION_MINOR@_gir_FILES = \
 $(libfolks_tracker_la_SOURCES) \
-        folks/folks-tracker.h \
+        folks-tracker.h \
         $(NULL)
 FolksTracker_@API_VERSION_MAJOR@_@API_VERSION_MINOR@_gir_NAMESPACE = FolksTracker
 FolksTracker_@API_VERSION_MAJOR@_@API_VERSION_MINOR@_gir_SCANNERFLAGS = --identifier-prefix=Trf