GNOME.org
 

[libgda] Corrections in the build system

commit 2aad5c4e730b414732c9c83ec310a136c24395ac
Author: Vivien Malerba <malerba gnome-db org>
Date:   Thu Jan 14 16:22:17 2010 +0100

    Corrections in the build system

 doc/C/Makefile.am                     |    2 +-
 doc/C/tmpl/gda-data-proxy.sgml        |    8 ++-
 doc/C/tmpl/gda-sql-statement.sgml     |  102 ++++++++++-----------------------
 doc/C/tmpl/gdaui-raw-grid.sgml        |   12 ++--
 doc/C/tmpl/gdaui-set.sgml             |   37 ++++++------
 libgda-report/Makefile.am             |    6 +-
 libgda-ui/Makefile.am                 |    6 +-
 libgda/Makefile.am                    |   33 ++++++-----
 providers/reuseable/mysql/Makefile.am |    2 +-
 9 files changed, 86 insertions(+), 122 deletions(-)
---
diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
index f0c865e..5a982dc 100644
--- a/doc/C/Makefile.am
+++ b/doc/C/Makefile.am
@@ -82,7 +82,7 @@ EXTRA_DIST += examples/full_example.c installation.xml limitations.xml migration
 	architecture.svg parts.svg stmt-unknown.svg stmt-select.svg stmt-insert1.svg stmt-insert2.svg \
 	stmt-update.svg stmt-compound.svg information_schema.svg howto-exec.svg thread-wrapper.svg \
 	version.xml.in \
-	visual_index.xml
+	visual_index.xml prov-notes.xml
 
 # Files not to distribute
 # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
diff --git a/doc/C/tmpl/gda-data-proxy.sgml b/doc/C/tmpl/gda-data-proxy.sgml
index d531d7e..fb35f46 100644
--- a/doc/C/tmpl/gda-data-proxy.sgml
+++ b/doc/C/tmpl/gda-data-proxy.sgml
@@ -169,9 +169,11 @@ Proxy to hold modifications for any #GdaDataModel, and provides the #GdaDataMode
 
 </para>
 
- gdadataproxy: the object which received the signal.
- arg1: 
- arg2: 
+@:
+
+ Param2: 
+ Param3: 
+ Returns: 
 @Returns: 
 
 <!-- ##### ARG GdaDataProxy:defer-sync ##### -->
diff --git a/doc/C/tmpl/gda-sql-statement.sgml b/doc/C/tmpl/gda-sql-statement.sgml
index 1eac851..d313b4d 100644
--- a/doc/C/tmpl/gda-sql-statement.sgml
+++ b/doc/C/tmpl/gda-sql-statement.sgml
@@ -36,13 +36,12 @@ which can be manipulated directly. The structure is a tree composed of several k
 
 <!-- ##### STRUCT GdaSqlStatement ##### -->
 <para>
-Container structure for an SQL statement.
+
 </para>
 
- sql: the actual SQL string which corresponds to the statement, or %NULL
- stmt_type: the type of statement (SELECT, INSERT, etc) as a #GdaSqlStatementType enum
- contents: the actual contents of the statement, depends on @stmt_type (can be a pointer to a
-#GdaSqlStatementSelect, #GdaSqlStatementInsert, etc)
+ sql: 
+ stmt_type: 
+ contents: 
 @validity_meta_struct: 
 @_gda_reserved1: 
 @_gda_reserved2: 
@@ -306,32 +305,20 @@ Specifies the type of functions passed to gda_sql_any_part_foreach().
 
 <!-- ##### STRUCT GdaSqlStatementSelect ##### -->
 <para>
-  The statement is a SELECT statement, any kind of SELECT statement can be represented using this structure 
-  (if this is not the case
-  then report a bug).
-  <mediaobject>
-    <imageobject role="html">
-      <imagedata fileref="stmt-select.png" format="PNG"/>
-    </imageobject>
-    <caption>
-      <para>
-	Example of a #GdaSqlStatement having a #GdaSqlStatementSelect as its contents.
-      </para>
-    </caption>
-  </mediaobject>
+
 </para>
 
- any: inheritance structure
- distinct: TRUE if a DISTINCT clause applies
- distinct_expr: expression on which the distinct applies, or %NULL
- expr_list: list of expressions (as #GdaSqlSelectField pointers), one for each column in the data set returned by the execution of the statement
- from: target(s) of the SELECT statement
- where_cond: condition expression filtering the resulting data set (WHERE condition)
- group_by: grouping expressions (as #GdaSqlExpr pointers)
- having_cond: condition expression filtering the grouped expressions (HAVING condition)
- order_by: ordering expressions (as #GdaSqlSelectOrder pointers)
- limit_count: size limiting expression (LIMIT clause)
- limit_offset: when @limit_count is defined, the start offset for the limit
+ any: 
+ distinct: 
+ distinct_expr: 
+ expr_list: 
+ from: 
+ where_cond: 
+ group_by: 
+ having_cond: 
+ order_by: 
+ limit_count: 
+ limit_offset: 
 @_gda_reserved1: 
 @_gda_reserved2: 
 
@@ -503,14 +490,12 @@ Specifies the type of functions passed to gda_sql_any_part_foreach().
 
 <!-- ##### STRUCT GdaSqlStatementDelete ##### -->
 <para>
-  The statement is a DELETE statement, any kind of DELETE statement can be represented using this structure 
-  (if this is not the case
-  then report a bug).
+
 </para>
 
- any: inheritance structure
- table: name of the table from which data is deleted
- cond: WHERE clause for the DELETE
+ any: 
+ table: 
+ cond: 
 @_gda_reserved1: 
 @_gda_reserved2: 
 
@@ -534,27 +519,15 @@ Specifies the type of functions passed to gda_sql_any_part_foreach().
 
 <!-- ##### STRUCT GdaSqlStatementUpdate ##### -->
 <para>
-  The statement is an UPDATE statement, any kind of UPDATE statement can be represented using this structure 
-  (if this is not the case
-  then report a bug).
-  <mediaobject>
-    <imageobject role="html">
-      <imagedata fileref="stmt-update.png" format="PNG"/>
-    </imageobject>
-    <caption>
-      <para>
-	Example of a #GdaSqlStatement having a #GdaSqlStatementUpdate as its contents.
-      </para>
-    </caption>
-  </mediaobject>
+
 </para>
 
- any: inheritance structure
- on_conflict: conflict resolution clause if there is one (such as "OR REPLACE")
- table: name of the table to which data is updated
- fields_list: list of #GdaSqlField fields which are updated
- expr_list: list of #GdaSqlExpr expressions containing the new values
- cond: WHERE clause for the UPDATE
+ any: 
+ on_conflict: 
+ table: 
+ fields_list: 
+ expr_list: 
+ cond: 
 @_gda_reserved1: 
 @_gda_reserved2: 
 
@@ -597,25 +570,12 @@ Specifies the type of functions passed to gda_sql_any_part_foreach().
 
 <!-- ##### STRUCT GdaSqlStatementCompound ##### -->
 <para>
-  The statement is a compound selection statement: multiple SELECT or compound statements composed together with UNION, EXCEPT or
-  INTERSECT operations. Any kind of compound statement can be represented using this structure 
-  (if this is not the case
-  then report a bug).
-  <mediaobject>
-    <imageobject role="html">
-      <imagedata fileref="stmt-compound.png" format="PNG"/>
-    </imageobject>
-    <caption>
-      <para>
-	Example of a #GdaSqlStatement having a #GdaSqlStatementCompound as its contents.
-      </para>
-    </caption>
-  </mediaobject>
+
 </para>
 
- any: inheritance structure
- compound_type: the type of operation to compose the selection or compound statements making this statement
- stmt_list: a list of #GdaSqlStatement making this statement
+ any: 
+ compound_type: 
+ stmt_list: 
 @_gda_reserved1: 
 @_gda_reserved2: 
 
diff --git a/doc/C/tmpl/gdaui-raw-grid.sgml b/doc/C/tmpl/gdaui-raw-grid.sgml
index 3fe4842..ac86d38 100644
--- a/doc/C/tmpl/gdaui-raw-grid.sgml
+++ b/doc/C/tmpl/gdaui-raw-grid.sgml
@@ -40,22 +40,22 @@ Grid widget to manipulate data in a #GdaDataModel
 @gdauirawgrid: the object which received the signal.
 @arg1: 
 
-<!-- ##### ARG GdauiRawGrid:data-layout ##### -->
+<!-- ##### ARG GdauiRawGrid:global-actions-visible ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GdauiRawGrid:global-actions-visible ##### -->
+<!-- ##### ARG GdauiRawGrid:info-cell-visible ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GdauiRawGrid:info-cell-visible ##### -->
+<!-- ##### ARG GdauiRawGrid:model ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG GdauiRawGrid:model ##### -->
+<!-- ##### ARG GdauiRawGrid:xml-layout ##### -->
 <para>
 
 </para>
@@ -87,13 +87,13 @@ Grid widget to manipulate data in a #GdaDataModel
 @sample_start: 
 
 
-<!-- ##### FUNCTION gdaui_raw_grid_set_data_layout_from_file ##### -->
+<!-- ##### FUNCTION gdaui_raw_grid_set_layout_from_file ##### -->
 <para>
 
 </para>
 
 @grid: 
 @file_name: 
- parent_table: 
+ grid_name: 
 
 
diff --git a/doc/C/tmpl/gdaui-set.sgml b/doc/C/tmpl/gdaui-set.sgml
index 213ce75..06a6003 100644
--- a/doc/C/tmpl/gdaui-set.sgml
+++ b/doc/C/tmpl/gdaui-set.sgml
@@ -17,51 +17,52 @@ GdauiSet
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### STRUCT GdauiSet ##### -->
+<!-- ##### STRUCT GdauiSetPriv ##### -->
 <para>
 
 </para>
 
- sources_list: 
- groups_list: 
 
-<!-- ##### SIGNAL GdauiSet::public-data-changed ##### -->
+<!-- ##### STRUCT GdauiSetGroup ##### -->
 <para>
 
 </para>
 
- gdauiset: the object which received the signal.
+ group: 
+ source: 
 
-<!-- ##### ARG GdauiSet:set ##### -->
+<!-- ##### STRUCT GdauiSetSource ##### -->
 <para>
 
 </para>
 
-<!-- ##### FUNCTION gdaui_set_new ##### -->
+ source: 
+ shown_n_cols: 
+ shown_cols_index: 
+ ref_n_cols: 
+ ref_cols_index: 
+
+<!-- ##### MACRO GDAUI_SET_GROUP ##### -->
 <para>
 
 </para>
 
- set: 
- Returns: 
+ x: 
 
 
-<!-- ##### STRUCT GdauiSetGroup ##### -->
+<!-- ##### MACRO GDAUI_SET_SOURCE ##### -->
 <para>
 
 </para>
 
- group: 
- source: 
+ x: 
 
-<!-- ##### STRUCT GdauiSetSource ##### -->
+
+<!-- ##### STRUCT GdauiSet ##### -->
 <para>
 
 </para>
 
- source: 
- shown_n_cols: 
- shown_cols_index: 
- ref_n_cols: 
- ref_cols_index: 
+ sources_list: 
+ groups_list: 
 
diff --git a/libgda-report/Makefile.am b/libgda-report/Makefile.am
index b3f6cf7..eef3d05 100644
--- a/libgda-report/Makefile.am
+++ b/libgda-report/Makefile.am
@@ -26,7 +26,7 @@ libgda_report_4_0_la_LIBADD = engine/libgda-report-engine-4.0.la \
 	$(LIBGDA_LIBS)
 
 if PLATFORM_WIN32
-libgda_report_4_0_la_LDFLAGS += -export-symbols $(srcdir)/libgda-report.def
+libgda_report_4_0_la_LDFLAGS += -export-symbols $(builddir)/libgda-report.def
 libgda_report_4_0_la_DEPENDENCIES = libgda-report.def
 
 libgda-report.def: libgda-report.symbols
@@ -39,8 +39,8 @@ install-data-local: install-def-files
 uninstall-local: uninstall-def-files
 
 install-def-files: libgda-report.def libgda-report-$(GDA_ABI_VERSION).lib
-	$(INSTALL) $(srcdir)/libgda-report.def $(DESTDIR)$(libdir)/libgda-report-$(GDA_ABI_VERSION).def
-	$(INSTALL) $(srcdir)/libgda-report-$(GDA_ABI_VERSION).lib $(DESTDIR)$(libdir)/
+	$(INSTALL) $(builddir)/libgda-report.def $(DESTDIR)$(libdir)/libgda-report-$(GDA_ABI_VERSION).def
+	$(INSTALL) $(builddir)/libgda-report-$(GDA_ABI_VERSION).lib $(DESTDIR)$(libdir)/
 
 uninstall-def-files:
 	-rm $(DESTDIR)$(libdir)/libgda-report-$(GDA_ABI_VERSION).def
diff --git a/libgda-ui/Makefile.am b/libgda-ui/Makefile.am
index b487a21..db2e2db 100644
--- a/libgda-ui/Makefile.am
+++ b/libgda-ui/Makefile.am
@@ -111,7 +111,7 @@ libgda_ui_4_0_la_LIBADD = \
 	$(GIO_LIBS)
 
 if PLATFORM_WIN32
-libgda_ui_4_0_la_LDFLAGS += -export-symbols $(srcdir)/libgda-ui.def
+libgda_ui_4_0_la_LDFLAGS += -export-symbols $(builddir)/libgda-ui.def
 libgda_ui_4_0_la_DEPENDENCIES = libgda-ui.def
 
 libgda-ui.def: libgda-ui.symbols
@@ -124,8 +124,8 @@ install-data-local: install-def-files
 uninstall-local: uninstall-def-files
 
 install-def-files: libgda-ui.def libgda-ui-$(GDA_ABI_VERSION).lib
-	$(INSTALL) $(srcdir)/libgda-ui.def $(DESTDIR)$(libdir)/libgda-ui-$(GDA_ABI_VERSION).def
-	$(INSTALL) $(srcdir)/libgda-ui-$(GDA_ABI_VERSION).lib $(DESTDIR)$(libdir)/
+	$(INSTALL) $(builddir)/libgda-ui.def $(DESTDIR)$(libdir)/libgda-ui-$(GDA_ABI_VERSION).def
+	$(INSTALL) $(builddir)/libgda-ui-$(GDA_ABI_VERSION).lib $(DESTDIR)$(libdir)/
 
 uninstall-def-files:
 	-rm $(DESTDIR)$(libdir)/libgda-ui-$(GDA_ABI_VERSION).def
diff --git a/libgda/Makefile.am b/libgda/Makefile.am
index e0a8395..86a6f37 100644
--- a/libgda/Makefile.am
+++ b/libgda/Makefile.am
@@ -91,8 +91,7 @@ gda_headers = \
 	gda-tree-mgr-select.h \
 	gda-util.h \
 	gda-value.h \
-	gda-xa-transaction.h \
-	libgda.h 
+	gda-xa-transaction.h
 
 libgda_sources =  \
 	csv.h \
@@ -102,6 +101,7 @@ libgda_sources =  \
 	dir-blob-op.h \
 	dir-blob-op.c \
 	$(gda_headers) \
+	libgda.h \
 	gda-blob-op.c \
 	gda-column.c \
 	gda-config.c \
@@ -176,7 +176,7 @@ s-enum-types-h: @REBUILD@ $(gda_headers) Makefile
 			--fprod "/* enumerations from \"@filename \" */\n" \
 			--vhead "GType @enum_name _get_type (void);\n#define GDA_TYPE_ ENUMSHORT@ (@enum_name _get_type())\n" 	\
 			--ftail "G_END_DECLS\n\n#endif /* __LIBGDA_ENUM_TYPES_H__ */" \
-		$(gda_headers) ) > tmp-gda-enum-types.h \
+		$(gda_headers)) > tmp-gda-enum-types.h \
 	&& (cmp -s tmp-gda-enum-types.h gda-enum-types.h || cp tmp-gda-enum-types.h gda-enum-types.h ) \
 	&& rm -f tmp-gda-enum-types.h	\
 	&& echo timestamp > $(@F)
@@ -192,7 +192,7 @@ s-enum-types-c: @REBUILD@ $(gda_headers) Makefile
 			--vhead "GType\n enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G Type@Value values[] = {" 	\
 			--vprod "      { @VALUENAME@, \"@VALUENAME \", \"@valuenick \" }," \
 			--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_ type@_register_static (\"@EnumName \", values);\n  }\n  return etype;\n}\n" \
-		$(gda_headers) ) > tmp-gda-enum-types.c \
+		$(gda_headers)) > tmp-gda-enum-types.c \
 	&& (cmp -s tmp-gda-enum-types.c gda-enum-types.c || cp tmp-gda-enum-types.c gda-enum-types.c ) \
 	&& rm -f tmp-gda-enum-types.c \
 	&& echo timestamp > $(@F)
@@ -225,7 +225,7 @@ libgda_4_0_la_LIBADD = \
 	$(GIO_LIBS) $(GNOMEVFS_LIBS) 
 
 if PLATFORM_WIN32
-libgda_4_0_la_LDFLAGS += -export-symbols $(srcdir)/libgda.def
+libgda_4_0_la_LDFLAGS += -export-symbols $(builddir)/libgda.def
 libgda_4_0_la_DEPENDENCIES = libgda.def
 
 libgda.def: libgda.symbols
@@ -238,8 +238,8 @@ install-data-local: install-def-files
 uninstall-local: uninstall-def-files
 
 install-def-files: libgda.def libgda-$(GDA_ABI_VERSION).lib
-	$(INSTALL) $(srcdir)/libgda.def $(DESTDIR)$(libdir)/libgda-$(GDA_ABI_VERSION).def
-	$(INSTALL) $(srcdir)/libgda-$(GDA_ABI_VERSION).lib $(DESTDIR)$(libdir)/
+	$(INSTALL) $(builddir)/libgda.def $(DESTDIR)$(libdir)/libgda-$(GDA_ABI_VERSION).def
+	$(INSTALL) $(builddir)/libgda-$(GDA_ABI_VERSION).lib $(DESTDIR)$(libdir)/
 
 uninstall-def-files:
 	-rm $(DESTDIR)$(libdir)/libgda-$(GDA_ABI_VERSION).def
@@ -288,7 +288,6 @@ threadwrapper = \
 
 sqlparser = \
 	sql-parser/gda-sql-parser.h \
-	sql-parser/gda-sql-parser-enum-types.c \
 	sql-parser/gda-sql-statement.h \
 	sql-parser/gda-statement-struct-decl.h \
 	sql-parser/gda-statement-struct.h \
@@ -303,7 +302,6 @@ sqlparser = \
 	sql-parser/gda-statement-struct-unknown.h \
 	sql-parser/gda-statement-struct-util.h \
 	sql-parser/gda-sql-parser.c \
-	sql-parser/gda-sql-parser-enum-types.c \
 	sql-parser/gda-statement-struct.c \
 	sql-parser/gda-statement-struct-compound.c \
 	sql-parser/gda-statement-struct-delete.c \
@@ -333,7 +331,7 @@ handlers = \
 Gda- GDA_ABI_VERSION@.gir: $(INTROSPECTION_SCANNER) libgda- GDA_ABI_VERSION@.la
 	$(INTROSPECTION_SCANNER) -v \
 		--namespace Gda --nsversion= GDA_ABI_VERSION@ \
-		-I$(top_srcdir) \
+		-I$(top_srcdir) -I$(top_srcdir)/libgda \
 		$(LIBGDA_CFLAGS) \
 		--add-include-path=providers-support \
 		--add-include-path=sql-parser \
@@ -346,12 +344,15 @@ Gda- GDA_ABI_VERSION@.gir: $(INTROSPECTION_SCANNER) libgda- GDA_ABI_VERSION@.la
 		--library=gda- GDA_ABI_VERSION@ \
 	    $(INCLUDE_CFLAGS) \
 	    --output $@ \
-		$(gda_headers) gda-types.h \
-		$(gda_sources) \
-		$(psupport) \
-		$(sqlparser) \
-		$(threadwraper) \
-		$(handlers)
+		$(addprefix $(srcdir)/, $(gda_headers)) \
+	        $(srcdir)/gda-types.h \
+		libgda.h \
+		$(addprefix $(srcdir)/, $(gda_sources)) \
+		$(addprefix $(srcdir)/, $(psupport)) \
+		$(addprefix $(srcdir)/, $(sqlparser)) \
+		sql-parser/gda-sql-parser-enum-types.c \
+		$(addprefix $(srcdir)/, $(threadwraper)) \
+		$(addprefix $(srcdir)/, $(handlers))
 
 BUILT_GIRSOURCES += Gda- GDA_ABI_VERSION@.gir
 
diff --git a/providers/reuseable/mysql/Makefile.am b/providers/reuseable/mysql/Makefile.am
index 6f387f0..d7bd0ea 100644
--- a/providers/reuseable/mysql/Makefile.am
+++ b/providers/reuseable/mysql/Makefile.am
@@ -45,7 +45,7 @@ libgda_mysql_la_LIBADD = \
 	$(top_builddir)/libgda/libgda-4.0.la \
 	$(LIBGDA_LIBS)
 
-EXTRA_DIST = $(xml_in_files) libgda-mysql-4.0.pc.in parser.y gen_def.c $(keyword_files)
+EXTRA_DIST = $(xml_in_files) parser.y gen_def.c $(keyword_files)
 
 CLEANFILES = parser.h parser.c parser.out mysql_token_types.h gen_def$(EXEEXT_FOR_BUILD) \
 	mkkeywordhash$(EXEEXT_FOR_BUILD) keywords_hash.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]