[ease/introspection] Introspection bindings build.

[Nate Stedman <natesm src gnome org>]

commit 31754d6071873fe35d0f31961a58801f85014e8d
Author: Nate Stedman <natesm gmail com>
Date:   Sat Sep 18 17:23:43 2010 -0400

    Introspection bindings build.

 .gitignore            |    3 ++-
 ease-core/Makefile.am |    7 +++++--
 flutter/Makefile.am   |   32 ++------------------------------
 3 files changed, 9 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ae5a2a0..c05cfc0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,8 +12,9 @@
 *DS_Store
 
 # introspection noise
-libease/tmp-introspect*
+tmp-introspect*
 *.gir
+*.typelib
 
 # build files
 ease/ease
diff --git a/ease-core/Makefile.am b/ease-core/Makefile.am
index 07aa759..3f9738c 100644
--- a/ease-core/Makefile.am
+++ b/ease-core/Makefile.am
@@ -79,6 +79,7 @@ libease_core_ EASE_CORE_VERSION@_la_VALAFLAGS = \
 	$(NULL)
 
 libease_core_ EASE_CORE_VERSION@_la_LIBADD = \
+	$(EASE_LIBS) \
 	$(top_builddir)/flutter/libflutter- FLUTTER_VERSION@.la
 
 libease_core_ EASE_CORE_VERSION@_la_CFLAGS = \
@@ -121,14 +122,16 @@ INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
 INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 
 if HAVE_INTROSPECTION
-introspection_sources = $(libease_core_ EASE_CORE_VERSION@_la_SOURCES)
+introspection_sources = \
+	$(libease_core_ EASE_CORE_VERSION@_la_SOURCES:.vala=.c) \
+	$(top_builddir)/ease-core/ease-core.h
 
 EaseCore_0_4_gir: libease-core- EASE_CORE_VERSION@.la
 EaseCore_0_4_gir_INCLUDES = GtkClutter-0.10 
 EaseCore_0_4_gir_CFLAGS = $(INCLUDES)
 EaseCore_0_4_gir_LIBS = libease-core- EASE_CORE_VERSION@.la 
-EaseCore_0_4_gir_PACKAGES = $(EASE_PKGCONFIG_PACKAGES)
 EaseCore_0_4_gir_FILES = $(introspection_sources)
+EaseCore_0_4_gir_SCANNERFLAGS = --strip-prefix=Ease
 INTROSPECTION_GIRS += EaseCore- EASE_CORE_VERSION@.gir
 
 girdir = $(datadir)/gir-1.0
diff --git a/flutter/Makefile.am b/flutter/Makefile.am
index 461dc51..4ba75df 100644
--- a/flutter/Makefile.am
+++ b/flutter/Makefile.am
@@ -2,11 +2,9 @@ lib_LTLIBRARIES = libflutter- FLUTTER_VERSION@.la
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
 
-INCLUDES = \
-	$(EASE_CFLAGS)
+INCLUDES = `pkg-config --cflags clutter-1.0`
 
 AM_CPPFLAGS = \
-	$(EASE_CFLAGS) \
 	-include $(CONFIG_HEADER) \
 	$(NULL)
 
@@ -24,6 +22,7 @@ libflutter_ FLUTTER_VERSION@_la_VALAFLAGS = \
 
 libflutter_ FLUTTER_VERSION@_la_CFLAGS = $(EASE_CFLAGS)
 libflutter_ FLUTTER_VERSION@_la_LDFLAGS = $(EASE_LDFLAGS)
+libflutter_ FLUTTER_VERSION@_la_LIBADD = $(EASE_LIBS)
 
 # header installation
 flutter_includedir=$(includedir)/flutter/
@@ -46,33 +45,6 @@ EXTRA_DIST = \
 	$(top_srcdir)/vapi/flutter- FLUTTER_VERSION@.vapi \
 	$(top_srcdir)/vapi/flutter- FLUTTER_VERSION@.deps
 
-#if HAVE_INTROSPECTION
-
-#BUILT_GIRSOURCES = Flutter-0.3.gir
-
-#Flutter-0.3.gir: $(INTROSPECTION_SCANNER) libflutter-0.3.la \
-#	g-ir-scanner -v \
-#	--namespace Flutter --nsversion=0.3 \
-#	--strip-prefix=flutter \
-#	--include=Clutter-1.0 \
-#	--library=flutter-0.3 \
-#	--libtool="$(LIBTOOL)" \
-#	--output $@ \
-#	--pkg clutter-1.0 \
-#	$(top_srcdir)/flutter/flutter.h
-
-#girdir = $(datadir)/gir-1.0
-#gir_DATA = $(BUILT_GIRSOURCES)
-
-#typelibsdir = $(libdir)/girepository-1.0
-#typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
-
-#%.typelib: %.gir $(INTROSPECTION_COMPILER)
-#	$(AM_V_GEN) $(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=.$(INTROSPECTION_COMPILER_OPTS) $< -o $@
-
-#CLEANFILES += Flutter-0.3.gir $(typelibs_DATA)
-
-#endif
 
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =