[ease/introspection] Attempting to introspect flutter - getting linker errors

[Nate Stedman <natesm src gnome org>]

commit 24dda82a1d4a9a066b2ea4103a11e6c20f2fe58b
Author: Nate Stedman <natesm gmail com>
Date:   Sat Sep 18 13:48:11 2010 -0400

    Attempting to introspect flutter - getting linker errors

 configure.ac          |   16 ++++++++++++-
 ease-core/Makefile.am |   28 +++++++++++++++++++++++++
 flutter/Makefile.am   |   55 +++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 95 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c396ca2..d69a0b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,7 @@ GNOME_COMPILE_WARNINGS([maximum])
 GNOME_MAINTAINER_MODE_DEFINES
 
 dnl packages
-pkg_modules="\
+EASE_VERSIONED_PKGCONFIG_PACKAGES="\
  clutter-gst-1.0\
  clutter-gtk-0.10 >= 0.10\
  gee-1.0\
@@ -63,7 +63,18 @@ pkg_modules="\
  rest-extras-0.6\
  unique-1.0"
  
-PKG_CHECK_MODULES(EASE, [$pkg_modules])
+EASE_PKGCONFIG_PACKAGES="\
+ clutter-gst-1.0\
+ clutter-gtk-0.10\
+ gee-1.0\
+ gmodule-2.0\
+ json-glib-1.0\
+ libarchive\
+ poppler-glib\
+ rest-extras-0.6\
+ unique-1.0"
+ 
+PKG_CHECK_MODULES(EASE, [$EASE_VERSIONED_PKGCONFIG_PACKAGES])
 
 EASE_PACKAGES="\
  --pkg clutter-gst-1.0\
@@ -79,6 +90,7 @@ EASE_PACKAGES="\
 AC_SUBST(EASE_CFLAGS)
 AC_SUBST(EASE_LIBS)
 AC_SUBST(EASE_PACKAGES)
+AC_SUBST(EASE_PKGCONFIG_PACKAGES)
 
 AC_DEFINE(EASE_VERSION, ease_version, [Ease Version])
 AC_SUBST(EASE_VERSION, ease_version)
diff --git a/ease-core/Makefile.am b/ease-core/Makefile.am
index 177fb1f..07aa759 100644
--- a/ease-core/Makefile.am
+++ b/ease-core/Makefile.am
@@ -1,5 +1,7 @@
 lib_LTLIBRARIES = libease-core- EASE_CORE_VERSION@.la
 
+DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
+
 # source files
 libease_core_ EASE_CORE_VERSION@_la_SOURCES = \
 	ease-actor.vala \
@@ -112,3 +114,29 @@ EXTRA_DIST = \
 	$(top_srcdir)/vapi/ease-core- EASE_CORE_VERSION@.vapi \
 	$(top_srcdir)/vapi/ease-core- EASE_CORE_VERSION@.deps
 
+
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+
+if HAVE_INTROSPECTION
+introspection_sources = $(libease_core_ EASE_CORE_VERSION@_la_SOURCES)
+
+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)
+INTROSPECTION_GIRS += EaseCore- EASE_CORE_VERSION@.gir
+
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+CLEANFILES += $(gir_DATA) $(typelib_DATA)
+endif
+
diff --git a/flutter/Makefile.am b/flutter/Makefile.am
index 5f7c216..461dc51 100644
--- a/flutter/Makefile.am
+++ b/flutter/Makefile.am
@@ -1,10 +1,10 @@
 lib_LTLIBRARIES = libflutter- FLUTTER_VERSION@.la
 
+DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
+
 INCLUDES = \
 	$(EASE_CFLAGS)
 
-EASE_CFLAGS += -w
-
 AM_CPPFLAGS = \
 	$(EASE_CFLAGS) \
 	-include $(CONFIG_HEADER) \
@@ -46,3 +46,54 @@ 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 =
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+
+if HAVE_INTROSPECTION
+introspection_sources = flutter.c flutter.h
+
+Flutter_0_3_gir: libflutter- FLUTTER_VERSION@.la
+Flutter_0_3_gir_INCLUDES = Clutter-1.0
+Flutter_0_3_gir_CFLAGS = $(INCLUDES)
+Flutter_0_3_gir_LIBS = libflutter- FLUTTER_VERSION@.la 
+Flutter_0_3_gir_FILES = $(introspection_sources)
+INTROSPECTION_GIRS += Flutter- FLUTTER_VERSION@.gir
+
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+CLEANFILES += $(gir_DATA) $(typelib_DATA)
+endif