Re: [gnome-db] Circular dependency between libgda-3 and libgda_handlers-3

["Gustavo R. Montesino" <grmontesino gmail com>]

Em Qua, 2007-03-14 às 11:43 +0100, Vivien Malerba escreveu: 
> On 3/14/07, Gustavo R. Montesino <grmontesino gmail com> wrote:
> > Em Seg, 2007-03-12 às 09:19 +0100, Vivien Malerba escreveu:
> > > On 3/12/07, Gustavo R. Montesino <grmontesino gmail com> wrote:
> >
> > Just wondering... should I merge some of the other libs on libgda while
> > I'm at it? I'm not sure about which ones have use without also using the
> > (main) libgda lib...
> >
> 
[...]
> 
> So to summarize, There should only be two libs left in libgda/:
> libgda-3.0.la and libgda_sql_delimiter-3.0.la. If it's OK for
> everyone, then please merge them too.

The attached patch seems to do the trick... Hope I didn't forget
anything.

Index: libgda-3.0.pc.in
===================================================================
--- libgda-3.0.pc.in	(revisão 2865)
+++ libgda-3.0.pc.in	(cópia de trabalho)
@@ -7,5 +7,5 @@
 Description: GDA (GNOME Data Access) library
 Requires: glib-2.0 libxml-2.0
 Version: @VERSION@
-Libs: -L${libdir} -lgda-3.0 -lgda_handlers-3.0 -lgda_graph-3.0 -lgda_sql_transaction-3.0 -lgda_sql_delimiter-3.0 -lgda-report-3.0 -lgdasql-3.0
+Libs: -L${libdir} -lgda-3.0 -lgda_sql_delimiter-3.0 -lgda-report-3.0 -lgdasql-3.0
 Cflags: -I${includedir}/libgda- GDA_ABI_MAJOR_VERSION@  GDA_ABI_MINOR_VERSION@ @GDA_DEBUG_FLAGS@
Index: libgda/sql-transaction/Makefile.am
===================================================================
--- libgda/sql-transaction/Makefile.am	(revisão 2865)
+++ libgda/sql-transaction/Makefile.am	(cópia de trabalho)
@@ -5,7 +5,7 @@
 	-I$(top_builddir) \
 	$(LIBGDA_CFLAGS)
 
-lib_LTLIBRARIES = libgda_sql_transaction-3.0.la
+noinst_LTLIBRARIES = libgda_sql_transaction-3.0.la
 noinst_PROGRAMS = sql_parser_test
 
 libgda_sql_transaction_3_0_la_SOURCES = \
@@ -17,7 +17,6 @@
 	gda-sql-transaction-tree.c \
 	gda-sql-transaction-tree.h
 
-libgda_sql_transaction_3_0_la_LDFLAGS = -version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE) $(NO_UNDEFINED)
 libgda_sql_transaction_3_0_la_LIBADD = $(LIBGDA_LIBS)
 
 parser.c: parser.y
Index: libgda/Makefile.am
===================================================================
--- libgda/Makefile.am	(revisão 2865)
+++ libgda/Makefile.am	(cópia de trabalho)
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libgda-3.0.la
 
-SUBDIRS = sql-delimiter sql-transaction . graph handlers
+SUBDIRS = sql-delimiter sql-transaction handlers graph
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
@@ -220,6 +220,8 @@
 libgda_3_0_la_LDFLAGS = -version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE) $(NO_UNDEFINED)
 libgda_3_0_la_LIBADD = sql-transaction/libgda_sql_transaction-3.0.la \
 	sql-delimiter/libgda_sql_delimiter-3.0.la \
+	handlers/libgda_handlers-3.0.la \
+	graph/libgda_graph-3.0.la \
 	$(top_builddir)/libsql/libgdasql-3.0.la \
 	$(WIN32_BOOTSTRAP_LIBS) $(LIBGDA_LIBS) $(FAM_LIBS)
 
Index: libgda/graph/Makefile.am
===================================================================
--- libgda/graph/Makefile.am	(revisão 2865)
+++ libgda/graph/Makefile.am	(cópia de trabalho)
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libgda_graph-3.0.la
+noinst_LTLIBRARIES = libgda_graph-3.0.la
 
 AM_CPPFLAGS = \
         -I$(top_srcdir) -I$(srcdir)/.. \
@@ -21,5 +21,4 @@
         gda-graph-query.c \
 	gda-dict-reg-graphs.c
 
-libgda_graph_3_0_la_LDFLAGS = -version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE) $(NO_UNDEFINED)
-libgda_graph_3_0_la_LIBADD = ../libgda-3.0.la $(LIBGDA_LIBS)
+libgda_graph_3_0_la_LIBADD = $(LIBGDA_LIBS)
Index: libgda/handlers/Makefile.am
===================================================================
--- libgda/handlers/Makefile.am	(revisão 2865)
+++ libgda/handlers/Makefile.am	(cópia de trabalho)
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libgda_handlers-3.0.la
+noinst_LTLIBRARIES = libgda_handlers-3.0.la
 
 AM_CPPFLAGS = \
         -I$(top_srcdir) -I$(srcdir)/.. \
@@ -25,5 +25,4 @@
 	gda-handler-time.c \
 	gda-handler-type.c
 
-libgda_handlers_3_0_la_LDFLAGS = -version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE) $(NO_UNDEFINED)
-libgda_handlers_3_0_la_LIBADD = ../libgda-3.0.la $(LIBGDA_LIBS)
+libgda_handlers_3_0_la_LIBADD = $(LIBGDA_LIBS)
Index: ChangeLog
===================================================================
--- ChangeLog	(revisão 2865)
+++ ChangeLog	(cópia de trabalho)
@@ -1,3 +1,10 @@
+2007-03-14 Gustavo R. Montesino <grmontesino gmail com>
+
+	* libgda-3.0.pc.in, libgda/Makefile.am, libgda/handlers/Makefile.am,
+	  libgda/graph/Makefile.am, libgda/sql-transaction/Makefile.am:
+	  Merge libgda_handlers, libgda_graph and libgda_sql_transaction
+	  in the main library.
+
 2007-03-12  Vivien Malerba <malerba gnome-db org>
 
 	* libgda/gda-data-proxy.c: corrected a bug leading to a non refreshed