[anjuta] libanjuta: bgo#624660 introspection build order problem

[Johannes Schmid <jhs src gnome org>]

commit 6148153c3b3678f2245e9374d1a63b79d7156379
Author: Johannes Schmid <jhs gnome org>
Date:   Tue Jul 20 22:11:47 2010 +0200

    libanjuta: bgo#624660 introspection build order problem

 libanjuta/Makefile.am                  |   12 ++++++++-
 libanjuta/interfaces/Makefile.am.iface |   39 +++++++++++--------------------
 2 files changed, 24 insertions(+), 27 deletions(-)
---
diff --git a/libanjuta/Makefile.am b/libanjuta/Makefile.am
index 18b5478..892b453 100644
--- a/libanjuta/Makefile.am
+++ b/libanjuta/Makefile.am
@@ -225,15 +225,23 @@ INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
 INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 
 if HAVE_INTROSPECTION
-introspection_sources = $(libanjuta_la_SOURCES)
+anjuta_introspection_sources = $(libanjuta_la_SOURCES)
+ianjuta_introspection_sources = interfaces/*.c interfaces/*.h
 
 Anjuta-1_0.gir: libanjuta.la
 Anjuta_1_0_gir_INCLUDES = GObject-2.0 Gtk-2.0
 Anjuta_1_0_gir_CFLAGS = $(ANJUTA_CFLAGS) -I$(top_srcdir)
 Anjuta_1_0_gir_LIBS = libanjuta.la
-Anjuta_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
+Anjuta_1_0_gir_FILES = $(addprefix $(srcdir)/,$(anjuta_introspection_sources))
 INTROSPECTION_GIRS += Anjuta-1.0.gir
 
+IAnjuta-1_0.gir: interfaces/libanjuta-interfaces.la  libanjuta.la
+IAnjuta_1_0_gir_INCLUDES = GObject-2.0 Gtk-2.0 Anjuta-1.0
+IAnjuta_1_0_gir_CFLAGS = $(LIBANJUTA_CFLAGS) -I$(top_srcdir)
+IAnjuta_1_0_gir_LIBS = interfaces/libanjuta-interfaces.la libanjuta.la
+IAnjuta_1_0_gir_FILES = $(addprefix $(srcdir)/,$(ianjuta_introspection_sources))
+INTROSPECTION_GIRS += IAnjuta-1.0.gir
+
 girdir = $(datadir)/gir-1.0
 dist_gir_DATA = $(INTROSPECTION_GIRS)
 
diff --git a/libanjuta/interfaces/Makefile.am.iface b/libanjuta/interfaces/Makefile.am.iface
index 0781625..9bb2e43 100644
--- a/libanjuta/interfaces/Makefile.am.iface
+++ b/libanjuta/interfaces/Makefile.am.iface
@@ -28,38 +28,27 @@ iface-built.stamp: libanjuta.idl Makefile.am.iface anjuta-idl-compiler.pl
 	echo "changing to $$savedir" && \
 	cd $$savedir && \
 	make
-	
+
 files_idl = libanjuta.idl
 idldir = $(MODULE_INCLUDEDIR)
 idl_HEADERS = $(files_idl)
 
+anjuta-marshal.h: anjuta-marshal.list
+	$(AM_V_GEN)@GLIB_GENMARSHAL@ \
+	        --prefix=anjuta_cclosure_marshal $(srcdir)/anjuta-marshal.list --header > xgen-gmc \
+	&& cp xgen-gmc $(@F) \
+	&& rm -f xgen-gmc
+
+anjuta-marshal.c: anjuta-marshal.h anjuta-marshal.list
+	$(AM_V_GEN)echo "#include \"anjuta-marshal.h\"" > xgenc-gmc \
+	&& @GLIB_GENMARSHAL@ \
+	        --prefix=anjuta_cclosure_marshal $(srcdir)/anjuta-marshal.list --body >> xgenc-gmc \
+	&& cp xgenc-gmc $(@F) \
+	&& rm -f xgenc-gmc
+
 EXTRA_DIST = \
 	iface-built.stamp \
 	$(libanjuta_interfaces_include) \
 	$(files_idl) \
 	Makefile.am.iface \
 	anjuta-idl-compiler.pl
-
--include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
-
-if HAVE_INTROSPECTION
-introspection_sources = $(libanjuta_interfaces_la_SOURCES)
-
-IAnjuta-1_0.gir: libanjuta-interfaces.la
-IAnjuta_1_0_gir_INCLUDES = GObject-2.0 Gtk-2.0 Anjuta-1.0
-IAnjuta_1_0_gir_CFLAGS = $(LIBANJUTA_CFLAGS) -I$(top_srcdir)
-IAnjuta_1_0_gir_LIBS = libanjuta-interfaces.la
-IAnjuta_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
-INTROSPECTION_GIRS += IAnjuta-1.0.gir
-
-girdir = $(datadir)/gir-1.0
-dist_gir_DATA = $(INTROSPECTION_GIRS)
-
-typelibdir = $(libdir)/girepository-1.0
-typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-
-CLEANFILES = $(dist_gir_DATA) $(typelib_DATA)
-endif