[gedit-code-assistance] Export llvm version in main config

[Jesse van den Kieboom <jessevdk src gnome org>]

commit ed1ddd3442162809d7f418e9b8841e56412ca336
Author: Jesse van den Kieboom <jesse vandenkieboom epfl ch>
Date:   Mon Oct 15 20:19:10 2012 +0200

    Export llvm version in main config
    
    This avoids distcheck problems when configure would generate a vala
    file newer then the timestamp (which would cause an attempted rebuild
    of c files from vala files, which in case would make distcheck fail).

 backends/c/Makefile.am             |   12 ++++++++++--
 backends/c/gcp-c-compile-args.vala |    2 +-
 backends/c/gcp-c-config.vala.in    |   10 ----------
 configure.ac                       |    1 -
 vapi/config.vapi                   |    1 +
 5 files changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/backends/c/Makefile.am b/backends/c/Makefile.am
index c4b77eb..ea73dc3 100644
--- a/backends/c/Makefile.am
+++ b/backends/c/Makefile.am
@@ -4,7 +4,6 @@ plugin_LTLIBRARIES = libgcpbackendc.la
 
 SOURCES = \
 	gcp-c-backend.vala \
-	gcp-c-config.vala \
 	gcp-c-document.vala \
 	gcp-c-compile-args.vala \
 	gcp-c-translation-unit.vala \
@@ -16,7 +15,16 @@ libgcpbackendc_la_SOURCES = $(SOURCES)
 libgcpbackendc_la_CFLAGS = $(GCP_CFLAGS) $(LLVM_CFLAGS) $(GEDIT_CFLAGS) -I$(top_srcdir)/src -w
 libgcpbackendc_la_LDFLAGS = -module -shared -avoid-version $(GCP_LIBS) $(LLVM_LIBS)
 
-valapkgs = gio-2.0 gee-1.0 clang gcp gtk+-3.0 gtksourceview-3.0 gedit-3.0 libpeas-1.0
+valapkgs = 			\
+	gio-2.0 		\
+	gee-1.0 		\
+	clang 			\
+	gcp 			\
+	gtk+-3.0 		\
+	gtksourceview-3.0 	\
+	gedit-3.0 		\
+	libpeas-1.0 		\
+	config
 
 AM_VALAFLAGS = \
 	--vapidir $(top_srcdir)/src \
diff --git a/backends/c/gcp-c-compile-args.vala b/backends/c/gcp-c-compile-args.vala
index 44c9a44..38cb1b7 100644
--- a/backends/c/gcp-c-compile-args.vala
+++ b/backends/c/gcp-c-compile-args.vala
@@ -470,7 +470,7 @@ namespace Gcp.C
 				// Note: this is a hack but it seems clang 2.8 will not properly
 				// add its default include search directories
 				args += "-I";
-				args += "/usr/lib/clang/%s/include".printf(Config.llvm_version());
+				args += "/usr/lib/clang/%s/include".printf(Gcp.Config.LLVM_VERSION);
 
 				Log.debug("Compile flags for `%s': `%s'",
 				          file.get_path(),
diff --git a/configure.ac b/configure.ac
index 4a7156e..8390735 100644
--- a/configure.ac
+++ b/configure.ac
@@ -218,7 +218,6 @@ data/gcp.plugin
 src/Makefile
 backends/Makefile
 backends/c/Makefile
-backends/c/gcp-c-config.vala
 backends/c/gcpbackendc.plugin
 backends/python/Makefile
 backends/python/gcpbackendpython/Makefile
diff --git a/vapi/config.vapi b/vapi/config.vapi
index 70216bb..29880c9 100644
--- a/vapi/config.vapi
+++ b/vapi/config.vapi
@@ -6,6 +6,7 @@ namespace Gcp.Config
 	public const string GCP_LIBS_DIR;
 	public const string GCP_DATA_DIR;
 	public const string VERSION;
+	public const string LLVM_VERSION;
 }
 
 // ex:ts=4 noet