[libgda/LIBGDA_4.0] Corrections for bug #587435

[Vivien Malerba <vivien src gnome org>]

commit b7d3fa42ab12f6e1bfc04ff1f87a3398385a985f
Author: Vivien Malerba <malerba gnome-db org>
Date:   Tue Jun 30 21:42:53 2009 +0200

    Corrections for bug #587435

 ChangeLog                            |    9 +++++++++
 doc/C/libgda-4.0-sections.txt        |   10 +++++-----
 libgda-4.0.pc.in                     |    2 +-
 libgda/providers-support/Makefile.am |    2 +-
 libgda/sql-parser/Makefile.am        |    2 +-
 libgda/sqlite/virtual/Makefile.am    |    2 +-
 providers/sqlite/Makefile.am         |    3 ---
 7 files changed, 18 insertions(+), 12 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 7c4760e..16cdaee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-06-30  Vivien Malerba <malerba gnome-db org>
+	
+	* doc/C/libgda-4.0-sections.txt:
+	* libgda-4.0.pc.in:
+	* libgda/providers-support/Makefile.am:
+	* libgda/sql-parser/Makefile.am:
+	* libgda/sqlite/virtual/Makefile.am:
+	* providers/sqlite/Makefile.am: correction for bug #587435
+
 2009-06-08  Vivien Malerba <malerba gnome-db org>
 
 	* libgda-report/RML/trml2html/Makefile.am:
diff --git a/doc/C/libgda-4.0-sections.txt b/doc/C/libgda-4.0-sections.txt
index b3a25a7..a58863e 100644
--- a/doc/C/libgda-4.0-sections.txt
+++ b/doc/C/libgda-4.0-sections.txt
@@ -917,7 +917,7 @@ gda_get_default_handler
 <SECTION>
 <FILE>gda-report-engine</FILE>
 <TITLE>GdaReportEngine</TITLE>
-<INCLUDE>gda-report-engine.h</INCLUDE>
+<INCLUDE>libgda-report/gda-report-engine.h</INCLUDE>
 GdaReportEngine
 gda_report_engine_new
 gda_report_engine_new_from_string
@@ -1100,7 +1100,7 @@ gda_batch_get_type
 <SECTION>
 <FILE>gda-sql-parser</FILE>
 <TITLE>GdaSqlParser</TITLE>
-<INCLUDE>sql-parser/gda-sql-parser.h</INCLUDE>
+<INCLUDE>libgda/sql-parser/gda-sql-parser.h</INCLUDE>
 GdaSqlParser
 GdaSqlParserMode
 gda_sql_parser_new
@@ -1124,7 +1124,7 @@ gda_sql_parser_get_type
 <SECTION>
 <FILE>gda-sql-statement</FILE>
 <TITLE>GdaSqlStatement</TITLE>
-<INCLUDE>sql-parser/gda-sql-statement.h</INCLUDE>
+<INCLUDE>libgda/sql-parser/gda-sql-statement.h</INCLUDE>
 GdaSqlStatement
 GdaSqlStatementType
 gda_sql_statement_new
@@ -1367,7 +1367,7 @@ gda_data_select_get_type
 <SECTION>
 <FILE>gda-data-select-priv</FILE>
 <TITLE>Subclassing GdaDataSelect</TITLE>
-<INCLUDE>providers-support/gda-data-select-priv.h</INCLUDE>
+<INCLUDE>libgda/providers-support/gda-data-select-priv.h</INCLUDE>
 GdaDataSelectClass
 gda_data_select_take_row
 gda_data_select_get_stored_row
@@ -1395,7 +1395,7 @@ gda_row_value_is_valid
 <SECTION>
 <FILE>gda-pstmt</FILE>
 <TITLE>GdaPStmt</TITLE>
-<INCLUDE>providers-support/gda-pstmt.h</INCLUDE>
+<INCLUDE>libgda/providers-support/gda-pstmt.h</INCLUDE>
 GdaPStmt
 gda_pstmt_set_gda_statement
 gda_pstmt_get_gda_statement
diff --git a/libgda-4.0.pc.in b/libgda-4.0.pc.in
index fda12dc..55ef73f 100644
--- a/libgda-4.0.pc.in
+++ b/libgda-4.0.pc.in
@@ -8,4 +8,4 @@ Description: GDA (GNOME Data Access) library
 Requires: gobject-2.0 gthread-2.0 libxml-2.0
 Version: @VERSION@
 Libs: -L${libdir} -lgda- GDA_ABI_MAJOR_VERSION@  GDA_ABI_MINOR_VERSION@
-Cflags: -I${includedir}/libgda- GDA_ABI_MAJOR_VERSION@  GDA_ABI_MINOR_VERSION@ @GDA_DEBUG_FLAGS@
+Cflags: -I${includedir}/libgda- GDA_ABI_MAJOR_VERSION@  GDA_ABI_MINOR_VERSION@ -I${includedir}/libgda- GDA_ABI_MAJOR_VERSION@  GDA_ABI_MINOR_VERSION@/libgda @GDA_DEBUG_FLAGS@
diff --git a/libgda/providers-support/Makefile.am b/libgda/providers-support/Makefile.am
index c3402e9..b17737a 100644
--- a/libgda/providers-support/Makefile.am
+++ b/libgda/providers-support/Makefile.am
@@ -17,5 +17,5 @@ libgda_psupport_la_SOURCES = \
 libgda_psupport_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
 libgda_psupport_la_LIBADD = $(LIBGDA_LIBS)
 
-psupportincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/providers-support
+psupportincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda/providers-support
 psupportinclude_HEADERS=$(psupport_headers)
diff --git a/libgda/sql-parser/Makefile.am b/libgda/sql-parser/Makefile.am
index ad30bdf..f6055d1 100644
--- a/libgda/sql-parser/Makefile.am
+++ b/libgda/sql-parser/Makefile.am
@@ -74,7 +74,7 @@ libgda_sql_parser_built_headers = gda-sql-parser-enum-types.h
 libgda_sql_parser_built_cfiles = gda-sql-parser-enum-types.c
 
 $(OBJECTS) $(libgda_sql_parser_4_0_la_OBJECTS): token_types.h
-libgda_sql_parserincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/sql-parser
+libgda_sql_parserincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda/sql-parser
 libgda_sql_parserinclude_HEADERS=$(libgda_sql_parser_headers) $(libgda_sql_parser_built_headers)
 
 libgda_sql_parser_4_0_la_SOURCES = \
diff --git a/libgda/sqlite/virtual/Makefile.am b/libgda/sqlite/virtual/Makefile.am
index b5f6abe..d0d363e 100644
--- a/libgda/sqlite/virtual/Makefile.am
+++ b/libgda/sqlite/virtual/Makefile.am
@@ -38,7 +38,7 @@ libgda_virtual_4_0_la_SOURCES = \
 	gda-virtual-connection.c \
 	gda-virtual-provider.c 
 
-gdaincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/virtual
+gdaincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda/virtual
 gdainclude_HEADERS=$(virtual_headers)
 
 xmldir   = $(datadir)/libgda-4.0
diff --git a/providers/sqlite/Makefile.am b/providers/sqlite/Makefile.am
index 8822caa..88a347b 100644
--- a/providers/sqlite/Makefile.am
+++ b/providers/sqlite/Makefile.am
@@ -34,9 +34,6 @@ xml_in_files = sqlite_specs_create_db.xml.in \
 	sqlite_specs_create_view.xml.in \
 	sqlite_specs_drop_view.xml.in
 
-gdaincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/virtual
-gdainclude_HEADERS=$(virtualheaders)
-
 @INTLTOOL_XML_RULE@
 
 xml_DATA = $(xml_in_files:.xml.in=.xml)