[lasem: 3/3] Merge branch 'introspection'

[Emmanuel Pacaud <emmanuel src gnome org>]

commit 899c7abe545dc1b102ff5cb3b7361d4692917218
Merge: 5bc27cb 3b096bd
Author: Emmanuel Pacaud <emmanuel gnome org>
Date:   Mon Feb 15 23:52:26 2010 +0100

    Merge branch 'introspection'

 Makefile.am         |    4 +++-
 configure.ac        |    7 +++++--
 src/.gitignore      |    2 ++
 src/Makefile.am     |   31 ++++++++++++++++++++++++++++++-
 src/lsmattributes.h |    2 +-
 5 files changed, 41 insertions(+), 5 deletions(-)
---
diff --cc Makefile.am
index 8559401,970f5e4..ee2e383
--- a/Makefile.am
+++ b/Makefile.am
@@@ -1,8 -1,10 +1,10 @@@
  ACLOCAL_AMFLAGS = -I m4
  
+ DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
+ 
  SUBDIRS = itex2mml src po
  
 -lasemdocdir = ${prefix}/doc/lasem
 +lasemdocdir = ${prefix}/doc/lasem- LASEM_API_VERSION@
  lasemdoc_DATA = 	\
  	README		\
  	COPYING		\
diff --cc configure.ac
index 1fa71c7,9da22d8..bcc0cbc
--- a/configure.ac
+++ b/configure.ac
@@@ -33,16 -29,9 +34,16 @@@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GE
  AM_GLIB_GNU_GETTEXT
  IT_PROG_INTLTOOL([0.35.0])
  
- LT_INIT
+ LT_INIT()
  
 -PKG_CHECK_MODULES(LASEM, [gobject-2.0 glib-2.0 gio-2.0 gdk-pixbuf-2.0 >= 2.16 gdk-2.0 >= 2.16 cairo >= 1.2 pangocairo >= 1.16.0 libxml-2.0])
 +PKG_CHECK_MODULES(LASEM, [gobject-2.0
 +			  glib-2.0
 +			  gio-2.0
 +			  gdk-pixbuf-2.0 >= 2.16
 +			  gdk-2.0 >= 2.16
 +			  cairo >= 1.2
 +			  pangocairo >= 1.16.0
 +			  libxml-2.0])
  AC_SUBST(LASEM_CFLAGS)
  AC_SUBST(LASEM_LIBS)
  
diff --cc src/Makefile.am
index f95757b,e227470..1fc8a7f
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -216,6 -220,30 +221,30 @@@ lasemtest_SOURCES = 				
  
  lasemtest_LDFLAGS =
  
 -lasemtest_LDADD = $(LASEM_LIBS) liblasem.la ../itex2mml/libitex2mml.la
 +lasemtest_LDADD = $(LASEM_LIBS) liblasem- LASEM_API_VERSION@.la ../itex2mml/libitex2mml.la
  
- CLEAN_FILES = $(BUILT_SOURCES)
+ CLEANFILES = $(BUILT_SOURCES)
+ 
+ if HAVE_INTROSPECTION
+ 
 -introspection_files = $(liblasem_la_SOURCES) \
 -		      $(liblasem_la_HEADERS)
++introspection_files = $(liblasem_ LASEM_API_VERSION@_la_SOURCES) \
++		      $(liblasem_ LASEM_API_VERSION@_la_HEADERS)
+ 
 -Lasem-1.0.gir: $(INTROSPECTION_SCANNER)
 -Lasem_1_0_gir_INCLUDES = GObject-2.0 cairo-1.0 Pango-1.0 GdkPixbuf-2.0
 -Lasem_1_0_gir_SCANNERFLAGS = --strip-prefix=Lsm
 -Lasem_1_0_gir_CFLAGS = $(INCLUDES)
 -Lasem_1_0_gir_LIBS = liblasem.la
 -Lasem_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files))
++Lasem- LASEM_API_VERSION@.gir: $(INTROSPECTION_SCANNER)
++Lasem_0_4_gir_INCLUDES = GObject-2.0 cairo-1.0 Pango-1.0 GdkPixbuf-2.0
++Lasem_0_4_gir_SCANNERFLAGS = --strip-prefix=Lsm
++Lasem_0_4_gir_CFLAGS = $(INCLUDES)
++Lasem_0_4_gir_LIBS = liblasem- LASEM_API_VERSION@.la
++Lasem_0_4_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files))
+ 
 -INTROSPECTION_GIRS += Lasem-1.0.gir
++INTROSPECTION_GIRS += Lasem- LASEM_API_VERSION@.gir
+ 
+ girdir = $(datadir)/gir-1.0
+ dist_gir_DATA = $(INTROSPECTION_GIRS)
+ 
+ typelibdir = $(libdir)/girepositry-1.0
+ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+ 
+ CLEANFILES += $(dist_gir_DATA) $(typelib_DATA)
+ 
+ endif