[gtksourceview] Makefile clean up and fix introspection build error

[Garrett Regier <gregier src gnome org>]

commit 0c3f2c23d7dd8ca20a8a43269c6493d143716032
Author: Garrett Regier <alias301 gmail com>
Date:   Mon May 31 10:59:39 2010 -0700

    Makefile clean up and fix introspection build error

 gtksourceview/Makefile.am                          |   97 +++++++++++---------
 .../completion-providers/words/Makefile.am         |    4 +-
 2 files changed, 54 insertions(+), 47 deletions(-)
---
diff --git a/gtksourceview/Makefile.am b/gtksourceview/Makefile.am
index 6e1dfd7..cb59e3d 100644
--- a/gtksourceview/Makefile.am
+++ b/gtksourceview/Makefile.am
@@ -22,29 +22,30 @@ lib_LTLIBRARIES = libgtksourceview-2.0.la
 
 libgtksourceview_headers =			\
 	gtksourcebuffer.h			\
+	gtksourcecompletioncontext.h		\
+	gtksourcecompletion.h			\
+	gtksourcecompletioninfo.h		\
+	gtksourcecompletionitem.h		\
+	gtksourcecompletionproposal.h		\
+	gtksourcecompletionprovider.h		\
+	gtksourcegutter.h			\
 	gtksourceiter.h				\
-	gtksourceview.h				\
 	gtksourcelanguage.h			\
 	gtksourcelanguagemanager.h		\
-	gtksourcestyle.h			\
-	gtksourcestyleschememanager.h		\
-	gtksourcestylescheme.h			\
 	gtksourcemark.h				\
 	gtksourceprintcompositor.h		\
-	gtksourcegutter.h			\
+	gtksourcestyle.h			\
+	gtksourcestylescheme.h			\
+	gtksourcestyleschememanager.h		\
 	gtksourceundomanager.h			\
-	gtksourcecompletion.h			\
-	gtksourcecompletioninfo.h		\
-	gtksourcecompletionitem.h		\
-	gtksourcecompletionproposal.h		\
-	gtksourcecompletionprovider.h		\
-	gtksourcecompletioncontext.h
+	gtksourceview.h
 
 NOINST_H_FILES = \
+	gseal-gtk-compat.h		\
 	gtksourcecompletionmodel.h	\
 	gtksourcecompletion-private.h	\
-	gtksourcecompletionutils.h	\
 	gtksourcecompletionui.h		\
+	gtksourcecompletionutils.h	\
 	gtksourcecontextengine.h	\
 	gtksourceengine.h		\
 	gtksourcegutter-private.h	\
@@ -53,38 +54,37 @@ NOINST_H_FILES = \
 	gtksourceundomanagerdefault.h	\
 	gtksourceview-i18n.h		\
 	gtksourceview-utils.h		\
-	gtktextregion.h			\
-	gseal-gtk-compat.h
+	gtktextregion.h
 
 libgtksourceview_c_files = \
 	gtksourcebuffer.c 		\
+	gtksourcecompletion.c		\
+	gtksourcecompletioncontext.c	\
+	gtksourcecompletioninfo.c	\
+	gtksourcecompletionitem.c	\
+	gtksourcecompletionmodel.c	\
+	gtksourcecompletionproposal.c	\
+	gtksourcecompletionprovider.c	\
+	gtksourcecompletionutils.c	\
+	gtksourcecontextengine.c	\
+	gtksourceengine.c		\
+	gtksourcegutter.c		\
 	gtksourceiter.c			\
-	gtksourceview.c 		\
-	gtksourceundomanager.c 		\
-	gtksourceundomanagerdefault.c	\
-	gtktextregion.c 		\
 	gtksourcelanguage.c 		\
 	gtksourcelanguagemanager.c 	\
 	gtksourcelanguage-parser-1.c	\
 	gtksourcelanguage-parser-2.c	\
-	gtksourceview-i18n.c		\
-	gtksourceview-utils.c 		\
-	gtksourcestyle.c		\
-	gtksourcestyleschememanager.c	\
-	gtksourcestylescheme.c		\
-	gtksourceengine.c		\
-	gtksourcecontextengine.c	\
 	gtksourcemark.c			\
 	gtksourceprintcompositor.c	\
-	gtksourcegutter.c		\
-	gtksourcecompletion.c		\
-	gtksourcecompletioninfo.c	\
-	gtksourcecompletionitem.c	\
-	gtksourcecompletionproposal.c	\
-	gtksourcecompletionprovider.c	\
-	gtksourcecompletionmodel.c	\
-	gtksourcecompletionutils.c	\
-	gtksourcecompletioncontext.c
+	gtksourcestyle.c		\
+	gtksourcestylescheme.c		\
+	gtksourcestyleschememanager.c	\
+	gtksourceundomanager.c 		\
+	gtksourceundomanagerdefault.c	\
+	gtksourceview.c 		\
+	gtksourceview-i18n.c		\
+	gtksourceview-utils.c 		\
+	gtktextregion.c
 
 libgtksourceview_2_0_la_SOURCES = 	\
 	$(libgtksourceview_c_files)	\
@@ -150,11 +150,19 @@ stamp-gtksourceview-typebuiltins.h: Makefile.am $(libgtksourceview_headers)
 	&& (cmp -s xgen-gth gtksourceview-typebuiltins.h || cp xgen-gth gtksourceview-typebuiltins.h) \
 	&& rm -f xgen-gth && echo stamp > $(@F)
 
-CLEANFILES =
+EXTRA_DIST = 					\
+	gtksourceview-marshal.list
+
+CLEANFILES = 					\
+	$(BUILT_SOURCES)			\
+	stamp-gtksourceview-typebuiltins.h	\
+	stamp-gtksourceview-typebuiltins.c
 
 if HAVE_INTROSPECTION
-include $(INTROSPECTION_MAKEFILE)
+-include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS = GtkSource-2.0.gir
+
+GtkSource-2.0.gir: libgtksourceview-2.0.la
 INTROSPECTION_SCANNER_ARGS = -I$(top_srcdir)
 GtkSource_2_0_gir_NAMESPACE = GtkSource
 GtkSource_2_0_gir_VERSION = 2.0
@@ -162,17 +170,16 @@ GtkSource_2_0_gir_LIBS = libgtksourceview-2.0.la
 GtkSource_2_0_gir_FILES = $(libgtksourceview_headers) $(libgtksourceview_c_files)
 GtkSource_2_0_gir_INCLUDES = $(GTK_TYPELIB)
 GtkSource_2_0_gir_PACKAGES = gtksourceview-2.0
+
 girdir = $(INTROSPECTION_GIRDIR)
-dist_gir_DATA = GtkSource-2.0.gir
-typelibdir = $(INTROSPECTION_TYPELIBDIR)
-typelib_DATA = GtkSource-2.0.typelib
-CLEANFILES += $(dist_gir_DATA) $(typelib_DATA)
-endif
+dist_gir_DATA = $(INTROSPECTION_GIRS)
 
-EXTRA_DIST = \
-	gtksourceview-marshal.list \
-	$(ui_DATA)
+typelibdir = $(INTROSPECTION_TYPELIBDIR)
+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
-CLEANFILES += $(BUILT_SOURCES) stamp-gtksourceview-typebuiltins.h stamp-gtksourceview-typebuiltins.c
+CLEANFILES +=			\
+	$(dist_gir_DATA)	\
+	$(typelib_DATA)
+endif
 
 -include $(top_srcdir)/git.mk
diff --git a/gtksourceview/completion-providers/words/Makefile.am b/gtksourceview/completion-providers/words/Makefile.am
index 3c9e07f..48c8d5d 100644
--- a/gtksourceview/completion-providers/words/Makefile.am
+++ b/gtksourceview/completion-providers/words/Makefile.am
@@ -9,19 +9,19 @@ INCLUDES = 				\
 noinst_LTLIBRARIES = libgtksourcecompletionwords.la
 
 NOINST_H_FILES =				\
+	gtksourcecompletionwordsbuffer.h	\
 	gtksourcecompletionwordslibrary.h	\
 	gtksourcecompletionwordsproposal.h	\
-	gtksourcecompletionwordsbuffer.h	\
 	gtksourcecompletionwordsutils.h
 
 libgtksourcecompletionwords_headers = 		\
 	gtksourcecompletionwords.h
 
 libgtksourcecompletionwords_la_SOURCES =	\
+	gtksourcecompletionwordsbuffer.c	\
 	gtksourcecompletionwords.c		\
 	gtksourcecompletionwordslibrary.c	\
 	gtksourcecompletionwordsproposal.c	\
-	gtksourcecompletionwordsbuffer.c	\
 	gtksourcecompletionwordsutils.c		\
 	$(libgtksourcecompletionwords_headers)	\
 	$(NOINST_H_FILES)