[libgda] Build corrections

[Vivien Malerba <vivien src gnome org>]

commit 694a705c07fefd27568b9605fe4166691b094408
Author: Vivien Malerba <malerba gnome-db org>
Date:   Fri Sep 28 19:18:40 2012 +0200

    Build corrections

 libgda-ui/Makefile.am                   |   10 +++++-----
 providers/firebird/Makefile.am          |    2 +-
 tools/browser/doc/gda-browser-docs.sgml |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/libgda-ui/Makefile.am b/libgda-ui/Makefile.am
index 0165eb7..f33685f 100644
--- a/libgda-ui/Makefile.am
+++ b/libgda-ui/Makefile.am
@@ -5,8 +5,7 @@ lib_LTLIBRARIES = libgda-ui-5.0.la
 SUBDIRS = marshallers data-entries internal data . data-entries/plugins demos
 
 GLOBAL_CFLAGS = \
-	-I$(top_builddir)/ui \
-	-I$(top_srcdir)/ui \
+	-I$(top_builddir)/libgda-ui \
 	-I$(top_builddir) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libgda \
@@ -68,13 +67,13 @@ ui_sources = \
 	gdaui-set.h \
 	gdaui-set.c \
 	gdaui-tree-store.c \
-	gdaui-resources.h \
-	gdaui-resources.c \
 	gdaui-init.c
 
 libgda_ui_5_0_la_SOURCES = \
 	$(libgda_ui_built_cfiles) \
-	$(ui_sources)
+	$(ui_sources) \
+	gdaui-resources.h \
+	gdaui-resources.c
 
 gdaui-enum-types.h: s-enum-types-h
 	@true
@@ -175,6 +174,7 @@ if ENABLE_GDAUI_GI
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
                              --add-include-path=$(top_builddir)/libgda \
+                             --add-include-path=$(top_builddir)/libgda-ui \
                              --namespace Gdaui \
 			     --warn-all
 ui_data_entries_sources = \
diff --git a/providers/firebird/Makefile.am b/providers/firebird/Makefile.am
index a524690..c136486 100644
--- a/providers/firebird/Makefile.am
+++ b/providers/firebird/Makefile.am
@@ -20,7 +20,7 @@ parser.c parser.h: parser.y $(top_builddir)/libgda/sql-parser/lemon$(EXEEXT_FOR_
 	- $(top_builddir)/libgda/sql-parser/lemon$(EXEEXT_FOR_BUILD) -q -d -T$(top_srcdir)/libgda/sql-parser/lempar.c $(srcdir)/parser.y
 
 gen_def$(EXEEXT_FOR_BUILD): gen_def.c
-	$(CC_FOR_BUILD) -o gen_def$(EXEEXT_FOR_BUILD) -DIMPOSED_HEADER=\""$(top_srcdir)/libgda/sql-parser/token_types.h"\" $(srcdir)/gen_def.c
+	$(CC_FOR_BUILD) -o gen_def$(EXEEXT_FOR_BUILD) -DIMPOSED_HEADER=\""$(top_builddir)/libgda/sql-parser/token_types.h"\" $(srcdir)/gen_def.c
 
 firebird_token_types.h: gen_def$(EXEEXT_FOR_BUILD) parser.h
 	./gen_def$(EXEEXT_FOR_BUILD) > firebird_token_types.h
diff --git a/tools/browser/doc/gda-browser-docs.sgml b/tools/browser/doc/gda-browser-docs.sgml
index 346d35d..b8243c7 100644
--- a/tools/browser/doc/gda-browser-docs.sgml
+++ b/tools/browser/doc/gda-browser-docs.sgml
@@ -161,7 +161,7 @@
 
   <part id="part_index">
     <title>Appendix</title>
-      <xi:include href="fdl-appendix.xml"/>
+      <xi:include href="fdl-appendix.sgml"/>
   </part>
 </book>