Revert "build: Don’t build Vala headers in a subdirectory unnecessarily"

This reverts commit 4c06ecc26bfde7397357ef4ae7ad83a5925db43d
because it caused build failures when building folks for the first time
without a system-installed copy of the development headers.

diff --git a/backends/eds/lib/Makefile.am b/backends/eds/lib/Makefile.am
index 67fb7ae..e37a7cc 100644 (file)
--- 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-eds.h \
+       -H folks/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-eds.h \
+       folks/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-eds.h \
+        folks/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 3673822..bf9fffd 100644 (file)
--- 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-libsocialweb.h \
+       -H folks/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-libsocialweb.h \
+       folks/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-libsocialweb.h \
+        folks/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 d992393..47a6a8f 100644 (file)
--- a/backends/telepathy/lib/Makefile.am
+++ b/backends/telepathy/lib/Makefile.am
@@ -221,7 +221,7 @@ libfolks_telepathy_la_VALAFLAGS = \
        --includedir folks \
        --library folks-telepathy \
        --vapi folks-telepathy.vapi \
-       -H folks-telepathy.h \
+       -H folks/folks-telepathy.h \
        $(NULL)
 
 if ENABLE_ZEITGEIST
@@ -266,7 +266,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
@@ -357,7 +357,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-telepathy.h \
+        folks/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 859d235..d7ec293 100644 (file)
--- 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-tracker.h \
+       -H folks/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-tracker.h \
+       folks/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-tracker.h \
+        folks/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