[libgda] Configure script: renamed "LIBGDA" test to "COREDEPS" to avoid ambiguity
- From: Vivien Malerba <vivien src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] Configure script: renamed "LIBGDA" test to "COREDEPS" to avoid ambiguity
- Date: Wed, 16 Mar 2011 14:09:53 +0000 (UTC)
commit b03a3df4c1df39a5278bd37a15dbf1484e4c518c
Author: Vivien Malerba <malerba gnome-db org>
Date: Wed Mar 16 14:29:00 2011 +0100
Configure script: renamed "LIBGDA" test to "COREDEPS" to avoid ambiguity
configure.ac | 14 +++++++-------
control-center/Makefile.am | 6 +++---
doc/C/Makefile.am | 4 ++--
libgda-report/DocBook/Makefile.am | 6 +++---
libgda-report/Makefile.am | 6 +++---
libgda-report/RML/Makefile.am | 6 +++---
libgda-report/engine/Makefile.am | 6 +++---
libgda-ui/Makefile.am | 6 +++---
libgda-ui/data-entries/Makefile.am | 4 ++--
libgda-ui/data-entries/plugins/Makefile.am | 6 +++---
libgda-ui/demos/Makefile.am | 6 +++---
libgda-ui/internal/Makefile.am | 4 ++--
libgda-ui/marshallers/Makefile.am | 4 ++--
libgda-xslt/Makefile.am | 4 ++--
libgda/Makefile.am | 6 +++---
libgda/binreloc/Makefile.am | 4 ++--
libgda/handlers/Makefile.am | 4 ++--
libgda/providers-support/Makefile.am | 6 +++---
libgda/sql-parser/Makefile.am | 2 +-
libgda/sqlite/Makefile.am | 6 +++---
libgda/sqlite/virtual/Makefile.am | 4 ++--
libgda/thread-wrapper/Makefile.am | 4 ++--
providers/bdb/Makefile.am | 8 ++++----
providers/bdbsql/Makefile.am | 4 ++--
providers/firebird/Makefile.am | 4 ++--
providers/jdbc/Makefile.am | 8 ++++----
providers/mdb/Makefile.am | 6 +++---
providers/mdb/libmdb-src/Makefile.am | 4 ++--
providers/mysql/Makefile.am | 4 ++--
providers/oracle/Makefile.am | 6 +++---
providers/postgres/Makefile.am | 4 ++--
providers/reuseable/Makefile.am | 4 ++--
providers/reuseable/mysql/Makefile.am | 4 ++--
providers/reuseable/postgres/Makefile.am | 4 ++--
providers/skel-implementation/capi/Makefile.am | 4 ++--
providers/skel-implementation/models/Makefile.am | 6 +++---
providers/sqlcipher/Makefile.am | 4 ++--
providers/sqlite/Makefile.am | 6 +++---
providers/web/Makefile.am | 4 ++--
testing/Makefile.am | 22 +++++++++++-----------
tests/Makefile.am | 20 ++++++++++----------
tests/data-models/Makefile.am | 20 ++++++++++----------
tests/meta-store/Makefile.am | 12 ++++++------
tests/multi-threading/Makefile.am | 14 +++++++-------
tests/parser/Makefile.am | 16 ++++++++--------
tests/providers/Makefile.am | 18 +++++++++---------
tests/value-holders/Makefile.am | 10 +++++-----
tools/Makefile.am | 14 +++++++-------
tools/browser/Makefile.am | 8 ++++----
tools/browser/canvas/Makefile.am | 6 +++---
tools/browser/common/Makefile.am | 6 +++---
tools/browser/data-manager/Makefile.am | 4 ++--
tools/browser/doc/Makefile.am | 6 +++---
tools/browser/dummy-perspective/Makefile.am | 4 ++--
tools/browser/query-exec/Makefile.am | 4 ++--
tools/browser/schema-browser/Makefile.am | 4 ++--
56 files changed, 195 insertions(+), 195 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6686d8b..c465aba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,15 +147,15 @@ dnl ******************************
dnl Checks for required libraries
dnl ******************************
-PKG_CHECK_MODULES(LIBGDA, [
+PKG_CHECK_MODULES(COREDEPS, [
glib-2.0 >= req_ver_glib
gobject-2.0 >= req_ver_glib
gthread-2.0 >= req_ver_glib
gmodule-no-export-2.0 >= req_ver_glib
libxml-2.0
])
-TST_CFLAGS="$LIBGDA_CFLAGS"
-LIBGDA_CFLAGS="$LIBGDA_CFLAGS -DLIBGDA_ABI_NAME=$LIBGDA_ABI_NAME"
+TST_CFLAGS="$COREDEPS_CFLAGS"
+COREDEPS_CFLAGS="$COREDEPS_CFLAGS -DLIBGDA_ABI_NAME=$LIBGDA_ABI_NAME"
dnl ******************************
@@ -338,7 +338,7 @@ case "$host" in
LIBTOOL_PROV_EXPORT_OPTIONS=$EXPORT_PROV_SYM_REGEX
LIBTOOL_UI_EXPORT_OPTIONS=$EXPORT_UI_SYM_REGEX
AC_DEFINE(HAVE_CARBON)
- LIBGDA_LIBS="$LIBGDA_LIBS -framework Carbon"
+ COREDEPS_LIBS="$COREDEPS_LIBS -framework Carbon"
;;
*)
AC_MSG_RESULT([Unix])
@@ -753,13 +753,13 @@ AC_ARG_ENABLE(default-binary,
AM_CONDITIONAL(DEFAULT_BINARY, test "x$enable_default_binary" = xyes)
-DK_ARG_ENABLE_WARNINGS([LIBGDA_WFLAGS],
+DK_ARG_ENABLE_WARNINGS([COREDEPS_WFLAGS],
[-Wall],
[-Wall -Wextra],
[PANGO G GDK GDK_PIXBUF GTK])
-AC_SUBST(LIBGDA_CFLAGS)
-AC_SUBST(LIBGDA_LIBS)
+AC_SUBST(COREDEPS_CFLAGS)
+AC_SUBST(COREDEPS_LIBS)
AC_OUTPUT([
Makefile
diff --git a/control-center/Makefile.am b/control-center/Makefile.am
index 4a709f9..9c1d314 100644
--- a/control-center/Makefile.am
+++ b/control-center/Makefile.am
@@ -6,8 +6,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS) \
$(GTK_CFLAGS) \
-DPREFIX=\""$(prefix)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
@@ -53,7 +53,7 @@ gda_control_center_5_0_LDADD=\
$(top_builddir)/libgda-ui/internal/libgda-ui-internal.la \
$(top_builddir)/libgda/libgda-5.0.la \
$(top_builddir)/libgda-ui/libgda-ui-5.0.la \
- $(LIBGDA_LIBS) $(GTK_LIBS)
+ $(COREDEPS_LIBS) $(GTK_LIBS)
@INTLTOOL_DESKTOP_RULE@
diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
index 2011500..ac80cd1 100644
--- a/doc/C/Makefile.am
+++ b/doc/C/Makefile.am
@@ -37,12 +37,12 @@ GTKDOC_CFLAGS = -I$(top_srcdir) \
-I$(top_builddir)/libgda/sqlite \
-I$(top_srcdir)/libgda-report \
-I$(top_srcdir)/libgda \
- $(LIBGDA_CFLAGS) \
+ $(COREDEPS_CFLAGS) \
-DGETTEXT_PACKAGE=\""$(GETTEXT_PACKAGE)"\"
GTKDOC_LIBS = $(top_builddir)/libgda/libgda-5.0.la \
$(top_builddir)/libgda-report/libgda-report-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
if HAVE_UI
GTKDOC_CFLAGS += $(GTK_CFLAGS)
diff --git a/libgda-report/DocBook/Makefile.am b/libgda-report/DocBook/Makefile.am
index 3b6523e..fb7c174 100644
--- a/libgda-report/DocBook/Makefile.am
+++ b/libgda-report/DocBook/Makefile.am
@@ -6,8 +6,8 @@ AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS)
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS)
gda_report_headers = \
gda-report-docbook-document.h
@@ -16,7 +16,7 @@ libgda_report_docbook_5_0_la_SOURCES = \
$(gda_report_headers) \
gda-report-docbook-document.c
-libgda_report_docbook_5_0_la_LIBADD = $(LIBGDA_LIBS) \
+libgda_report_docbook_5_0_la_LIBADD = $(COREDEPS_LIBS) \
$(top_builddir)/libgda/libgda-5.0.la
gdareportincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda-report
diff --git a/libgda-report/Makefile.am b/libgda-report/Makefile.am
index 89957ad..74fdef5 100644
--- a/libgda-report/Makefile.am
+++ b/libgda-report/Makefile.am
@@ -8,8 +8,8 @@ AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS)
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS)
report_headers = \
gda-report-document.h
@@ -24,7 +24,7 @@ libgda_report_5_0_la_LDFLAGS = -version-info $(GDA_CURRENT):$(GDA_REVISION):$(GD
libgda_report_5_0_la_LIBADD = engine/libgda-report-engine-5.0.la \
DocBook/libgda-report-docbook-5.0.la \
RML/libgda-report-rml-5.0.la \
- $(LIBGDA_LIBS) \
+ $(COREDEPS_LIBS) \
$(GDKPIXBUF_LIBS)
if PLATFORM_WIN32
diff --git a/libgda-report/RML/Makefile.am b/libgda-report/RML/Makefile.am
index 354d8f7..21f9ece 100644
--- a/libgda-report/RML/Makefile.am
+++ b/libgda-report/RML/Makefile.am
@@ -8,8 +8,8 @@ AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS)
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS)
gda_report_headers = \
gda-report-rml-document.h
@@ -18,7 +18,7 @@ libgda_report_rml_5_0_la_SOURCES = \
$(gda_report_headers) \
gda-report-rml-document.c
-libgda_report_rml_5_0_la_LIBADD = $(LIBGDA_LIBS) \
+libgda_report_rml_5_0_la_LIBADD = $(COREDEPS_LIBS) \
$(top_builddir)/libgda/libgda-5.0.la
gdareportincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda-report
diff --git a/libgda-report/engine/Makefile.am b/libgda-report/engine/Makefile.am
index 2d231a5..8d34633 100644
--- a/libgda-report/engine/Makefile.am
+++ b/libgda-report/engine/Makefile.am
@@ -8,9 +8,9 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
-I$(top_srcdir)/libgda/sqlite \
- $(LIBGDA_CFLAGS) \
+ $(COREDEPS_CFLAGS) \
$(GDKPIXBUF_CFLAGS) \
- $(LIBGDA_WFLAGS)
+ $(COREDEPS_WFLAGS)
gda_report_headers = \
gda-report-engine.h
@@ -21,7 +21,7 @@ libgda_report_engine_5_0_la_SOURCES = \
rt-parser.c \
gda-report-engine.c
-libgda_report_engine_5_0_la_LIBADD = $(LIBGDA_LIBS) \
+libgda_report_engine_5_0_la_LIBADD = $(COREDEPS_LIBS) \
$(top_builddir)/libgda/libgda-5.0.la
test_rt_parser_SOURCES = \
diff --git a/libgda-ui/Makefile.am b/libgda-ui/Makefile.am
index 4b3b107..8879225 100644
--- a/libgda-ui/Makefile.am
+++ b/libgda-ui/Makefile.am
@@ -12,13 +12,13 @@ GLOBAL_CFLAGS = \
-I$(top_srcdir)/libgda \
-DPLUGINSDIR=\""$(top_builddir)/libgda-ui/plugins/.libs"\" \
-DGDA_ABI_VERSION=\""$(GDA_ABI_VERSION)"\" \
- $(LIBGDA_CFLAGS) \
+ $(COREDEPS_CFLAGS) \
$(GTK_CFLAGS) \
$(GIO_CFLAGS)
AM_CPPFLAGS = \
$(GLOBAL_CFLAGS) \
- $(LIBGDA_WFLAGS)
+ $(COREDEPS_WFLAGS)
ui_headers = \
gdaui-basic-form.h \
@@ -119,7 +119,7 @@ libgda_ui_5_0_la_LIBADD = \
internal/libgda-ui-internal.la \
data-entries/libgda-ui-data-entries.la \
../libgda/libgda-5.0.la \
- $(LIBGDA_LIBS) \
+ $(COREDEPS_LIBS) \
$(GTK_LIBS) \
$(GIO_LIBS)
diff --git a/libgda-ui/data-entries/Makefile.am b/libgda-ui/data-entries/Makefile.am
index db7a942..c74c1c1 100644
--- a/libgda-ui/data-entries/Makefile.am
+++ b/libgda-ui/data-entries/Makefile.am
@@ -5,8 +5,8 @@ SUBDIRS =
AM_CPPFLAGS = \
-I$(top_srcdir) -I$(top_srcdir)/libgda -I$(srcdir)/.. \
-I$(top_builddir) -I$(top_builddir)/libgda-ui \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS) \
$(GTK_CFLAGS) \
$(GIO_CFLAGS) \
-DPREFIX=\""$(prefix)"\" \
diff --git a/libgda-ui/data-entries/plugins/Makefile.am b/libgda-ui/data-entries/plugins/Makefile.am
index a05ba33..96ef981 100644
--- a/libgda-ui/data-entries/plugins/Makefile.am
+++ b/libgda-ui/data-entries/plugins/Makefile.am
@@ -4,8 +4,8 @@ plugindir = $(libdir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/p
AM_CPPFLAGS = \
-I$(top_srcdir) -I$(top_srcdir)/libgda -I$(srcdir)/.. \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS) \
$(GTK_CFLAGS) \
$(LIBGCRYPT_CFLAGS) \
$(GTKSOURCEVIEW_CFLAGS) \
@@ -55,7 +55,7 @@ libgda_ui_plugins_la_LIBADD = \
$(top_builddir)/libgda-ui/libgda-ui-5.0.la \
$(top_builddir)/libgda/libgda-5.0.la \
$(LIBGCRYPT_LIBS) \
- $(LIBGDA_LIBS) \
+ $(COREDEPS_LIBS) \
$(GTK_LIBS) \
$(GTKSOURCEVIEW_LIBS)
diff --git a/libgda-ui/demos/Makefile.am b/libgda-ui/demos/Makefile.am
index 00f409c..ef7cd8f 100644
--- a/libgda-ui/demos/Makefile.am
+++ b/libgda-ui/demos/Makefile.am
@@ -37,8 +37,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libgda \
-I$(top_builddir) \
-I$(top_builddir)/libgda \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS) \
$(GTK_CFLAGS) \
-DPREFIX=\""$(prefix)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
@@ -63,7 +63,7 @@ gdaui_demo_5_0_LDFLAGS = $(EXTRALDFLAGS)
gdaui_demo_5_0_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
$(top_builddir)/libgda-ui/libgda-ui-5.0.la \
- $(LIBGDA_LIBS) $(GTK_LIBS)
+ $(COREDEPS_LIBS) $(GTK_LIBS)
democode_DATA = $(demos) $(demofiles)
diff --git a/libgda-ui/internal/Makefile.am b/libgda-ui/internal/Makefile.am
index 5ce02b8..6f90b60 100644
--- a/libgda-ui/internal/Makefile.am
+++ b/libgda-ui/internal/Makefile.am
@@ -4,8 +4,8 @@ AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS) \
$(GTK_CFLAGS)
libgda_ui_internal_la_SOURCES = \
diff --git a/libgda-ui/marshallers/Makefile.am b/libgda-ui/marshallers/Makefile.am
index aa70013..4c6675c 100644
--- a/libgda-ui/marshallers/Makefile.am
+++ b/libgda-ui/marshallers/Makefile.am
@@ -6,8 +6,8 @@ AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS)
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS)
gdaui-marshal.h: gdaui-marshal.list $(GLIB_GENMARSHAL)
$(GLIB_GENMARSHAL) $< --header --prefix=_gdaui_marshal > $@
diff --git a/libgda-xslt/Makefile.am b/libgda-xslt/Makefile.am
index e5f8589..70dbfba 100644
--- a/libgda-xslt/Makefile.am
+++ b/libgda-xslt/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda/sqlite \
-I$(top_srcdir)/libgda \
- $(LIBGDA_CFLAGS) $(LIBGDA_WFLAGS) $(LIBXSLT_CFLAGS)
+ $(COREDEPS_CFLAGS) $(COREDEPS_WFLAGS) $(LIBXSLT_CFLAGS)
gda_xslt_headers = \
libgda-xslt.h
@@ -20,7 +20,7 @@ libgda_xslt_5_0_la_SOURCES = \
sql_backend.c
libgda_xslt_5_0_la_LDFLAGS = -version-info $(GDA_CURRENT):$(GDA_REVISION):$(GDA_AGE) $(NO_UNDEFINED)
-libgda_xslt_5_0_la_LIBADD = $(LIBGDA_LIBS) $(LIBXSLT_LIBS)\
+libgda_xslt_5_0_la_LIBADD = $(COREDEPS_LIBS) $(LIBXSLT_LIBS)\
$(top_builddir)/libgda/libgda-5.0.la
gdaxsltincludedir=$(includedir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/libgda-xslt
diff --git a/libgda/Makefile.am b/libgda/Makefile.am
index 8fe6529..3763eee 100644
--- a/libgda/Makefile.am
+++ b/libgda/Makefile.am
@@ -16,14 +16,14 @@ GLOBAL_CFLAGS = \
-I$(top_srcdir)/libgda/sqlite \
-I$(top_srcdir)/libgda \
-DABI_VERSION=\""$(GDA_ABI_VERSION)"\" \
- $(LIBGDA_CFLAGS) \
+ $(COREDEPS_CFLAGS) \
$(BDB_CFLAGS) \
-DBDB_LIB=\""$(BDB_LIB)"\" \
$(GIO_CFLAGS) $(GNOME_KEYRING_CFLAGS)
AM_CPPFLAGS = \
$(GLOBAL_CFLAGS) \
- $(LIBGDA_WFLAGS)
+ $(COREDEPS_WFLAGS)
_gda_marshal_built_files = gda-marshal.h gda-marshal.c
@@ -231,7 +231,7 @@ libgda_5_0_la_LIBADD = \
binreloc/libgda_binreloc-5.0.la \
sqlite/libgda-sqlite.la \
thread-wrapper/libgda_threadwrapper-5.0.la \
- $(LIBGDA_LIBS) \
+ $(COREDEPS_LIBS) \
$(GIO_LIBS) $(GNOME_KEYRING_LIBS)
if PLATFORM_WIN32
diff --git a/libgda/binreloc/Makefile.am b/libgda/binreloc/Makefile.am
index c5e5aa3..2511514 100644
--- a/libgda/binreloc/Makefile.am
+++ b/libgda/binreloc/Makefile.am
@@ -3,8 +3,8 @@
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS) \
$(BINRELOC_CFLAGS) \
-DLIBGDAPREFIX=\""$(prefix)"\" \
-DLIBGDADATA=\""$(datadir)"\" \
diff --git a/libgda/handlers/Makefile.am b/libgda/handlers/Makefile.am
index eaf040d..d5e89dd 100644
--- a/libgda/handlers/Makefile.am
+++ b/libgda/handlers/Makefile.am
@@ -3,8 +3,8 @@ noinst_LTLIBRARIES = libgda_handlers-5.0.la
AM_CPPFLAGS = \
-I$(top_srcdir) -I$(srcdir)/.. \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS)
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS)
libgda_handlers_headers = \
gda-handler-bin.h \
diff --git a/libgda/providers-support/Makefile.am b/libgda/providers-support/Makefile.am
index 1727fcf..0d46549 100644
--- a/libgda/providers-support/Makefile.am
+++ b/libgda/providers-support/Makefile.am
@@ -4,8 +4,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS)
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS)
psupport_headers = \
gda-data-select-priv.h \
@@ -17,7 +17,7 @@ libgda_psupport_la_SOURCES = \
gda-pstmt.c
libgda_psupport_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
-libgda_psupport_la_LIBADD = $(LIBGDA_LIBS)
+libgda_psupport_la_LIBADD = $(COREDEPS_LIBS)
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 12aee64..f259141 100644
--- a/libgda/sql-parser/Makefile.am
+++ b/libgda/sql-parser/Makefile.am
@@ -4,7 +4,7 @@ noinst_PROGRAMS =
AM_CPPFLAGS = \
-I$(top_srcdir) -I$(srcdir)/.. \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS) \
+ $(COREDEPS_CFLAGS) \
$(LIBGDA_WFLAGDS)
lemon$(EXEEXT_FOR_BUILD): lemon.c
diff --git a/libgda/sqlite/Makefile.am b/libgda/sqlite/Makefile.am
index cfa6d96..4061477 100644
--- a/libgda/sqlite/Makefile.am
+++ b/libgda/sqlite/Makefile.am
@@ -19,8 +19,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS) \
$(SQLITE_CFLAGS) \
$(sqliteinc)
@@ -69,7 +69,7 @@ libgda_sqlite_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED
libgda_sqlite_la_LIBADD = \
virtual/libgda-virtual-5.0.la \
$(sqlitelibs) \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
libgda_bdbsqlite_la_SOURCES = $(sqlitesources)
libgda_bdbsqlite_la_CFLAGS = $(BDBSQL_CFLAGS) -DPNAME=\""BDBSql"\" -DCLASS_PREFIX=\""GdaDBDSql"\" -DWITH_BDBSQLITE -DSEARCH_LIB_PATH=\""$(BDBSQL_PATH)"\"
diff --git a/libgda/sqlite/virtual/Makefile.am b/libgda/sqlite/virtual/Makefile.am
index 8b6a90a..225e5e4 100644
--- a/libgda/sqlite/virtual/Makefile.am
+++ b/libgda/sqlite/virtual/Makefile.am
@@ -12,8 +12,8 @@ noinst_LTLIBRARIES = libgda-virtual-5.0.la
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS) \
$(SQLITE_CFLAGS) \
-I$(top_srcdir)/libgda/sqlite \
-I$(top_builddir)/libgda/sqlite \
diff --git a/libgda/thread-wrapper/Makefile.am b/libgda/thread-wrapper/Makefile.am
index 25b8a65..92f7d07 100644
--- a/libgda/thread-wrapper/Makefile.am
+++ b/libgda/thread-wrapper/Makefile.am
@@ -4,8 +4,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir) -I$(srcdir)/.. \
-I$(top_srcdir)/libgda/sqlite \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS)
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS)
libgda_threadwrapper_headers = \
gda-thread-wrapper.h
diff --git a/providers/bdb/Makefile.am b/providers/bdb/Makefile.am
index 6b7200f..51033f8 100644
--- a/providers/bdb/Makefile.am
+++ b/providers/bdb/Makefile.am
@@ -6,8 +6,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libgda/sqlite \
-I$(top_srcdir)/libgda \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS) \
$(BDB_CFLAGS)
libgda_bdb_la_SOURCES = \
@@ -19,13 +19,13 @@ libgda_bdb_la_SOURCES = \
libgda_bdb_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED) $(LIBTOOL_PROV_EXPORT_OPTIONS)
libgda_bdb_la_LIBADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
noinst_PROGRAMS = gda-bdb-test
gda_bdb_test_SOURCES = gda-bdb-test.c
gda_bdb_test_LDADD = \
- $(LIBGDA_LIBS) \
+ $(COREDEPS_LIBS) \
$(BDB_LIBS) \
$(top_builddir)/libgda/libgda-5.0.la
diff --git a/providers/bdbsql/Makefile.am b/providers/bdbsql/Makefile.am
index 884a664..0b1a154 100644
--- a/providers/bdbsql/Makefile.am
+++ b/providers/bdbsql/Makefile.am
@@ -6,8 +6,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libgda \
-I$(top_srcdir)/libgda/sqlite \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS) \
$(BDBSQL_CFLAGS) \
$(sqliteinc)
diff --git a/providers/firebird/Makefile.am b/providers/firebird/Makefile.am
index db6fc4a..c9fcd82 100644
--- a/providers/firebird/Makefile.am
+++ b/providers/firebird/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS) $(LIBGDA_WFLAGS) #$(FIREBIRD_CFLAGS)
+ $(COREDEPS_CFLAGS) $(COREDEPS_WFLAGS) #$(FIREBIRD_CFLAGS)
# parser generation
parser.c parser.h: parser.y $(top_builddir)/libgda/sql-parser/lemon$(EXEEXT_FOR_BUILD)
@@ -48,7 +48,7 @@ libgda_firebird_la_SOURCES = \
libgda_firebird_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED) $(LIBTOOL_PROV_EXPORT_OPTIONS)
libgda_firebird_la_LIBADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS) #$(FIREBIRD_LIBS)
+ $(COREDEPS_LIBS) #$(FIREBIRD_LIBS)
xmldir = $(datadir)/libgda-5.0
xml_in_files = \
diff --git a/providers/jdbc/Makefile.am b/providers/jdbc/Makefile.am
index c8d4943..f4498f2 100644
--- a/providers/jdbc/Makefile.am
+++ b/providers/jdbc/Makefile.am
@@ -10,7 +10,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS) $(LIBGDA_WFLAGS) $(JAVA_CFLAGS) \
+ $(COREDEPS_CFLAGS) $(COREDEPS_WFLAGS) $(JAVA_CFLAGS) \
-DJVM_PATH=\""$(JAVA_LD_PATH)"\" \
-DTOP_BUILD_DIR=\""$(top_builddir)"\"
@@ -59,7 +59,7 @@ libgda_jdbc_la_SOURCES = \
libgda_jdbc_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED) $(LIBTOOL_PROV_EXPORT_OPTIONS)
libgda_jdbc_la_LIBADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
# rem: don't link with JAVA_LIBS because we don't want the dependency on it
# (JVM runtime will be loaded when running)
@@ -120,12 +120,12 @@ DISTCLEANFILES = $(xml_DATA)
gda_jdbc_test_SOURCES = gda-jdbc-test.c
gda_jdbc_test_LDADD = \
- $(LIBGDA_LIBS) \
+ $(COREDEPS_LIBS) \
$(top_builddir)/libgda/libgda-5.0.la
gda_list_jdbc_providers_5_0_SOURCES = gda-list-jdbc-providers.c
gda_list_jdbc_providers_5_0_LDADD = \
- $(LIBGDA_LIBS) \
+ $(COREDEPS_LIBS) \
$(top_builddir)/libgda/libgda-5.0.la
diff --git a/providers/mdb/Makefile.am b/providers/mdb/Makefile.am
index 2fb39e6..5ee8be2 100644
--- a/providers/mdb/Makefile.am
+++ b/providers/mdb/Makefile.am
@@ -21,8 +21,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libgda \
-I$(top_srcdir)/libgda/sqlite \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS) \
$(extra_mdb_cflags) \
-DLIBGDA_DATA_DIR=\""$(datadir)/libgda-5.0"\"
@@ -35,7 +35,7 @@ libgda_mdb_la_SOURCES = \
libgda_mdb_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED) $(LIBTOOL_PROV_EXPORT_OPTIONS)
libgda_mdb_la_LIBADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS) \
+ $(COREDEPS_LIBS) \
$(extra_mdb_ldflags)
xmldir = $(datadir)/libgda-5.0
diff --git a/providers/mdb/libmdb-src/Makefile.am b/providers/mdb/libmdb-src/Makefile.am
index 3d89645..8ebd69e 100644
--- a/providers/mdb/libmdb-src/Makefile.am
+++ b/providers/mdb/libmdb-src/Makefile.am
@@ -2,8 +2,8 @@ noinst_LTLIBRARIES = libmdb.la
AM_CPPFLAGS = \
-I$(srcdir)/include \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS)
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS)
libmdb_la_SOURCES = \
catalog.c \
diff --git a/providers/mysql/Makefile.am b/providers/mysql/Makefile.am
index 73d5f6a..23912bd 100644
--- a/providers/mysql/Makefile.am
+++ b/providers/mysql/Makefile.am
@@ -9,7 +9,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libgda \
-I$(top_builddir) \
-I$(top_srcdir)/providers/reuseable/mysql \
- $(LIBGDA_CFLAGS) $(LIBGDA_WFLAGS) $(MYSQL_CFLAGS)
+ $(COREDEPS_CFLAGS) $(COREDEPS_WFLAGS) $(MYSQL_CFLAGS)
libgda_mysql_la_SOURCES = \
gda-mysql-blob-op.c \
@@ -33,7 +33,7 @@ libgda_mysql_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
libgda_mysql_la_LIBADD = \
$(top_builddir)/libgda/libgda-5.0.la \
$(top_builddir)/providers/reuseable/mysql/libgda-mysql.la \
- $(LIBGDA_LIBS) $(MYSQL_LIBS)
+ $(COREDEPS_LIBS) $(MYSQL_LIBS)
xmldir = $(datadir)/libgda-5.0
xml_in_files = \
diff --git a/providers/oracle/Makefile.am b/providers/oracle/Makefile.am
index c65e162..d76f20a 100644
--- a/providers/oracle/Makefile.am
+++ b/providers/oracle/Makefile.am
@@ -8,8 +8,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS) \
$(ORACLE_CFLAGS)
keyword_files=keywords_8.list keywords_9.list
@@ -59,7 +59,7 @@ libgda_oracle_la_SOURCES = \
libgda_oracle_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED) $(LIBTOOL_PROV_EXPORT_OPTIONS)
libgda_oracle_la_LIBADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS) $(ORACLE_LIBS)
+ $(COREDEPS_LIBS) $(ORACLE_LIBS)
xmldir = $(datadir)/libgda-5.0
xml_in_files = \
diff --git a/providers/postgres/Makefile.am b/providers/postgres/Makefile.am
index 88e54c8..8e69caa 100644
--- a/providers/postgres/Makefile.am
+++ b/providers/postgres/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libgda \
-I$(top_builddir) \
-I$(top_srcdir)/providers/reuseable/postgres \
- $(LIBGDA_CFLAGS) $(LIBGDA_WFLAGS) $(POSTGRES_CFLAGS)
+ $(COREDEPS_CFLAGS) $(COREDEPS_WFLAGS) $(POSTGRES_CFLAGS)
libgda_postgres_la_SOURCES = \
gda-postgres-blob-op.c \
@@ -30,7 +30,7 @@ libgda_postgres_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFIN
libgda_postgres_la_LIBADD = \
$(top_builddir)/libgda/libgda-5.0.la \
$(top_builddir)/providers/reuseable/postgres/libgda-postgres.la \
- $(LIBGDA_LIBS) $(POSTGRES_LIBS)
+ $(COREDEPS_LIBS) $(POSTGRES_LIBS)
xmldir = $(datadir)/libgda-5.0
xml_in_files = \
diff --git a/providers/reuseable/Makefile.am b/providers/reuseable/Makefile.am
index 4fe12d7..4bc43db 100644
--- a/providers/reuseable/Makefile.am
+++ b/providers/reuseable/Makefile.am
@@ -9,8 +9,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libgda \
-I$(top_srcdir)/libgda/sqlite \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS)
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS)
libreuseable_la_SOURCES = \
gda-provider-reuseable.h \
diff --git a/providers/reuseable/mysql/Makefile.am b/providers/reuseable/mysql/Makefile.am
index acb7c26..2838ecd 100644
--- a/providers/reuseable/mysql/Makefile.am
+++ b/providers/reuseable/mysql/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS)
+ $(COREDEPS_CFLAGS)
keyword_files=keywords_V50.list keywords_V51.list keywords_V54.list keywords_V60.list
pkeyword_files=$(addprefix $(top_srcdir)/providers/reuseable/mysql/,$(keyword_files))
@@ -43,7 +43,7 @@ libgda_mysql_la_SOURCES = \
libgda_mysql_la_LIBADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
EXTRA_DIST = $(xml_in_files) parser.y gen_def.c $(keyword_files)
diff --git a/providers/reuseable/postgres/Makefile.am b/providers/reuseable/postgres/Makefile.am
index 146a4a3..4427f42 100644
--- a/providers/reuseable/postgres/Makefile.am
+++ b/providers/reuseable/postgres/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS)
+ $(COREDEPS_CFLAGS)
keyword_files=keywords_82.list keywords_83.list keywords_84.list
pkeyword_files=$(addprefix $(top_srcdir)/providers/reuseable/postgres/,$(keyword_files))
@@ -42,7 +42,7 @@ libgda_postgres_la_SOURCES = \
libgda_postgres_la_LIBADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
EXTRA_DIST = parser.y gen_def.c $(keyword_files)
CLEANFILES = parser.h parser.c parser.out postgres_token_types.h gen_def$(EXEEXT_FOR_BUILD) \
diff --git a/providers/skel-implementation/capi/Makefile.am b/providers/skel-implementation/capi/Makefile.am
index b11f156..341c543 100644
--- a/providers/skel-implementation/capi/Makefile.am
+++ b/providers/skel-implementation/capi/Makefile.am
@@ -9,7 +9,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS) $(LIBGDA_WFLAGS) #$(CAPI_CFLAGS)
+ $(COREDEPS_CFLAGS) $(COREDEPS_WFLAGS) #$(CAPI_CFLAGS)
# SQL keywords HASH generation
keyword_files=keywords.list
@@ -57,7 +57,7 @@ libgda_capi_la_SOURCES = \
libgda_capi_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED) $(LIBTOOL_PROV_EXPORT_OPTIONS)
libgda_capi_la_LIBADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS) #$(CAPI_LIBS)
+ $(COREDEPS_LIBS) #$(CAPI_LIBS)
xmldir = $(datadir)/libgda-5.0
xml_in_files = \
diff --git a/providers/skel-implementation/models/Makefile.am b/providers/skel-implementation/models/Makefile.am
index f0e3031..c03322f 100644
--- a/providers/skel-implementation/models/Makefile.am
+++ b/providers/skel-implementation/models/Makefile.am
@@ -7,8 +7,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libgda/sqlite \
-I$(top_srcdir)/libgda \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_CFLAGS)
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_CFLAGS)
libgda_models_la_SOURCES = \
gda-models-provider.c \
@@ -19,7 +19,7 @@ libgda_models_la_SOURCES = \
libgda_models_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED) $(LIBTOOL_PROV_EXPORT_OPTIONS)
libgda_models_la_LIBADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
xmldir = $(datadir)/libgda-5.0
xml_in_files = models_specs_dsn.xml.in
diff --git a/providers/sqlcipher/Makefile.am b/providers/sqlcipher/Makefile.am
index 30e060d..207cc5a 100644
--- a/providers/sqlcipher/Makefile.am
+++ b/providers/sqlcipher/Makefile.am
@@ -6,8 +6,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libgda \
-I$(top_srcdir)/libgda/sqlite \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS) \
$(LIBCRYPTO_CFLAGS) \
$(sqliteinc) \
-DSQLITE_HAS_CODEC -DSQLITE_API= -DSQLITE_PRIVATE= -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_THREADSAFE=1 -DSQLITE_OMIT_LOAD_EXTENSION=1
diff --git a/providers/sqlite/Makefile.am b/providers/sqlite/Makefile.am
index 3d8b153..25dcc09 100644
--- a/providers/sqlite/Makefile.am
+++ b/providers/sqlite/Makefile.am
@@ -6,8 +6,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libgda \
-I$(top_srcdir)/libgda/sqlite \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS) \
$(SQLITE_CFLAGS) \
$(sqliteinc)
@@ -18,7 +18,7 @@ libgda_sqlite_la_SOURCES = \
libgda_sqlite_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED) $(LIBTOOL_PROV_EXPORT_OPTIONS)
libgda_sqlite_la_LIBADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
xmldir = $(datadir)/libgda-5.0
xml_in_files = \
diff --git a/providers/web/Makefile.am b/providers/web/Makefile.am
index cd37d6f..932cb45 100644
--- a/providers/web/Makefile.am
+++ b/providers/web/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS) $(LIBGDA_WFLAGS) $(LIBSOUP_CFLAGS)
+ $(COREDEPS_CFLAGS) $(COREDEPS_WFLAGS) $(LIBSOUP_CFLAGS)
libgda_web_la_SOURCES = \
gda-web-blob-op.c \
@@ -35,7 +35,7 @@ libgda_web_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED) $
libgda_web_la_LIBADD = \
$(top_builddir)/providers/reuseable/libreuseable.la \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS) $(LIBSOUP_LIBS)
+ $(COREDEPS_LIBS) $(LIBSOUP_LIBS)
xmldir = $(datadir)/libgda-5.0
xml_in_files = \
diff --git a/testing/Makefile.am b/testing/Makefile.am
index ec11025..2416150 100644
--- a/testing/Makefile.am
+++ b/testing/Makefile.am
@@ -3,8 +3,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libgda \
-I$(top_srcdir)/libgda/sqlite \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS)
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS)
bin_PROGRAMS = gda-test-connection-5.0
if HAVE_UI
@@ -17,7 +17,7 @@ gda_test_connection_5_0_SOURCES = \
gda_test_connection_5_0_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
gda_test_blob_SOURCES = \
@@ -25,7 +25,7 @@ gda_test_blob_SOURCES = \
gda_test_blob_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
gda_provider_status_SOURCES = \
@@ -35,21 +35,21 @@ gda_provider_status_SOURCES = \
gda_provider_status_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
virtual_test_SOURCES = \
virtual-test.c
virtual_test_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
virtual_test_2_SOURCES = \
virtual-test-2.c
virtual_test_2_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
gdaui_test_data_entries_CFLAGS = $(GTK_CFLAGS)
gdaui_test_data_entries_SOURCES = \
@@ -58,7 +58,7 @@ gdaui_test_data_entries_SOURCES = \
gdaui_test_data_entries_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
$(top_builddir)/libgda-ui/libgda-ui-5.0.la \
- $(LIBGDA_LIBS) \
+ $(COREDEPS_LIBS) \
$(GTK_LIBS)
gdaui_test_widget_entry_CFLAGS = $(GTK_CFLAGS)
@@ -68,7 +68,7 @@ gdaui_test_widget_entry_SOURCES = \
gdaui_test_widget_entry_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
$(top_builddir)/libgda-ui/libgda-ui-5.0.la \
- $(LIBGDA_LIBS) \
+ $(COREDEPS_LIBS) \
$(GTK_LIBS)
gdaui_test_errors_CFLAGS = $(GTK_CFLAGS)
@@ -79,7 +79,7 @@ gdaui_test_errors_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
$(top_builddir)/libgda-ui/libgda-ui-5.0.la \
$(top_builddir)/tests/libgda-test-5.0.la \
- $(LIBGDA_LIBS) \
+ $(COREDEPS_LIBS) \
$(GTK_LIBS)
gdaui_test_rt_editor_CFLAGS = $(GTK_CFLAGS)
@@ -89,7 +89,7 @@ gdaui_test_rt_editor_SOURCES = \
gdaui_test_rt_editor_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
$(top_builddir)/libgda-ui/libgda-ui-5.0.la \
- $(LIBGDA_LIBS) \
+ $(COREDEPS_LIBS) \
$(GTK_LIBS)
EXTRA_DIST =
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d68ca7c..750d656 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,8 +9,8 @@ AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS) \
-DCHECK_FILES=\""$(top_srcdir)"\" \
-DTOP_BUILD_DIR=\""$(top_builddir)"\"
@@ -28,7 +28,7 @@ libgda_test_5_0_la_SOURCES = \
libgda_test_5_0_la_LDFLAGS = $(NO_UNDEFINED)
libgda_test_5_0_la_LIBADD = \
- $(LIBGDA_LIBS) \
+ $(COREDEPS_LIBS) \
$(top_builddir)/libgda/libgda-5.0.la
test_ddl_creator_SOURCES = \
@@ -37,7 +37,7 @@ test_ddl_creator_SOURCES = \
test_ddl_creator_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
libgda-test-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
test_bin_converter_SOURCES = \
@@ -46,41 +46,41 @@ test_bin_converter_SOURCES = \
test_bin_converter_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
libgda-test-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
test_sql_identifier_SOURCES = \
test-sql-identifier.c
test_sql_identifier_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
test_identifiers_quotes_SOURCES = \
test-identifiers-quotes.c
test_identifiers_quotes_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
test_sql_builder_SOURCES = \
test-sql-builder.c
test_sql_builder_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
test_connection_string_split_SOURCES = \
test-connection-string-split.c
test_connection_string_split_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
test_input_parsers_SOURCES = \
test-input-parsers.c
test_input_parsers_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
EXTRA_DIST = dbstruct.xml
diff --git a/tests/data-models/Makefile.am b/tests/data-models/Makefile.am
index a22993b..7371546 100644
--- a/tests/data-models/Makefile.am
+++ b/tests/data-models/Makefile.am
@@ -2,8 +2,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS) \
-DCHECK_FILES=\""$(top_srcdir)"\" \
-DTOP_SRC_DIR=\""$(top_srcdir)"\" \
-DTOP_BUILD_DIR=\""$(top_builddir)"\"
@@ -16,7 +16,7 @@ common_sources =
check_model_import_SOURCES = $(common_sources) check_model_import.c
check_model_import_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
check_virtual_SOURCES = $(common_sources) check_virtual.c
check_virtual_CFLAGS = \
@@ -24,17 +24,17 @@ check_virtual_CFLAGS = \
-I$(top_srcdir)/libgda/sqlite/virtual
check_virtual_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
check_data_proxy_SOURCES = $(common_sources) check_data_proxy.c
check_data_proxy_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
check_model_copy_SOURCES = $(common_sources) check_model_copy.c
check_model_copy_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
check_pmodel_SOURCES = $(common_sources) check_pmodel.c
check_pmodel_CFLAGS = \
@@ -42,12 +42,12 @@ check_pmodel_CFLAGS = \
check_pmodel_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
$(top_builddir)/tests/libgda-test-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
check_empty_rs_SOURCES = $(common_sources) check_empty_rs.c
check_empty_rs_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
check_model_errors_SOURCES = $(common_sources) check_model_errors.c
check_model_errors_CFLAGS = \
@@ -55,7 +55,7 @@ check_model_errors_CFLAGS = \
check_model_errors_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
$(top_builddir)/tests/libgda-test-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
check_vcnc_SOURCES = $(common_sources) check_vcnc.c
check_vcnc_CFLAGS = \
@@ -63,7 +63,7 @@ check_vcnc_CFLAGS = \
-I$(top_srcdir)/libgda/sqlite/vcnc
check_vcnc_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
EXTRA_DIST = \
diff --git a/tests/meta-store/Makefile.am b/tests/meta-store/Makefile.am
index 992d964..6a47952 100644
--- a/tests/meta-store/Makefile.am
+++ b/tests/meta-store/Makefile.am
@@ -2,8 +2,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS) \
-DTOP_SRC_DIR=\""$(top_srcdir)"\" \
-DTOP_BUILD_DIR=\""$(top_builddir)"\"
@@ -15,22 +15,22 @@ common_sources = common.c common.h
check_meta_store_memory_SOURCES = check_meta_store_memory.c $(common_sources)
check_meta_store_memory_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
check_meta_store_sqlite_SOURCES = check_meta_store_sqlite.c $(common_sources)
check_meta_store_sqlite_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
check_meta_store_postgresql_SOURCES = check_meta_store_postgresql.c $(common_sources)
check_meta_store_postgresql_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
check_meta_store_mysql_SOURCES = check_meta_store_mysql.c $(common_sources)
check_meta_store_mysql_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
EXTRA_DIST = data_builtin_data_types.csv \
data_columns.csv \
diff --git a/tests/multi-threading/Makefile.am b/tests/multi-threading/Makefile.am
index a65586d..265c02c 100644
--- a/tests/multi-threading/Makefile.am
+++ b/tests/multi-threading/Makefile.am
@@ -2,8 +2,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS) \
-DROOT_DIR=\""$(top_srcdir)"\" \
-DTOP_BUILD_DIR=\""$(top_builddir)"\"
@@ -13,27 +13,27 @@ check_PROGRAMS = check_mutex check_parser check_cnc_lock check_threaded_cnc chec
check_mutex_SOURCES = check_mutex.c
check_mutex_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
check_parser_SOURCES = check_parser.c
check_parser_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
check_cnc_lock_SOURCES = check_cnc_lock.c common.c common.h
check_cnc_lock_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
check_threaded_cnc_SOURCES = check_threaded_cnc.c common.c common.h
check_threaded_cnc_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
check_wrapper_SOURCES = check_wrapper.c dummy-object.c dummy-object.h
check_wrapper_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
EXTRA_DIST = testdb.sql
diff --git a/tests/parser/Makefile.am b/tests/parser/Makefile.am
index c774ce7..60a3728 100644
--- a/tests/parser/Makefile.am
+++ b/tests/parser/Makefile.am
@@ -2,8 +2,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS) \
-DROOT_DIR=\""$(top_srcdir)"\" \
-DTOP_BUILD_DIR=\""$(top_builddir)"\" \
-DTOP_SRC_DIR=\""$(top_srcdir)"\"
@@ -14,32 +14,32 @@ check_PROGRAMS = check_parser check_validation check_normalization check_dml_com
check_parser_SOURCES = check_parser.c
check_parser_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
check_validation_SOURCES = check_validation.c
check_validation_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
check_normalization_SOURCES = check_normalization.c
check_normalization_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
check_dml_comp_SOURCES = check_dml_comp.c
check_dml_comp_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
check_script_SOURCES = check_script.c
check_script_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
check_rewrite_for_default_SOURCES = check_rewrite_for_default.c
check_rewrite_for_default_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
EXTRA_DIST = testdata.xml testvalid.xml testscripts.xml \
diff --git a/tests/providers/Makefile.am b/tests/providers/Makefile.am
index f8e1961..0e98db8 100644
--- a/tests/providers/Makefile.am
+++ b/tests/providers/Makefile.am
@@ -2,8 +2,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS) \
-DCHECK_SQL_FILES=\""$(top_srcdir)"\" \
-DTOP_BUILD_DIR=\""$(top_builddir)"\"
@@ -51,49 +51,49 @@ check_sqlite_CFLAGS =
check_sqlite_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
$(top_builddir)/tests/libgda-test-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
check_bdb_SOURCES = $(common_sources) check_bdb.c
check_bdb_CFLAGS =
check_bdb_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
$(top_builddir)/tests/libgda-test-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
check_firebird_SOURCES = $(common_sources) check_firebird.c
check_firebird_CFLAGS =
check_firebird_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
$(top_builddir)/tests/libgda-test-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
check_mdb_SOURCES = $(common_sources) check_mdb.c
check_mdb_CFLAGS =
check_mdb_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
$(top_builddir)/tests/libgda-test-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
check_mysql_SOURCES = $(common_sources) check_mysql.c
check_mysql_CFLAGS =
check_mysql_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
$(top_builddir)/tests/libgda-test-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
check_oracle_SOURCES = $(common_sources) check_oracle.c
check_oracle_CFLAGS =
check_oracle_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
$(top_builddir)/tests/libgda-test-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
check_postgres_SOURCES = $(common_sources) check_postgres.c
check_postgres_CFLAGS =
check_postgres_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
$(top_builddir)/tests/libgda-test-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
EXTRA_DIST = \
README \
diff --git a/tests/value-holders/Makefile.am b/tests/value-holders/Makefile.am
index b04fa54..ca3df7c 100644
--- a/tests/value-holders/Makefile.am
+++ b/tests/value-holders/Makefile.am
@@ -2,8 +2,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS) \
$(JSON_GLIB_CFLAGS) \
-DROOT_DIR=\""$(top_srcdir)"\"
@@ -15,17 +15,17 @@ common_sources = common.c common.h
check_holder_SOURCES = check_holder.c $(common_sources)
check_holder_LDADD = $(JSON_GLIB_LIBS) \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
check_set_SOURCES = check_set.c $(common_sources)
check_set_LDADD = $(JSON_GLIB_LIBS) \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
check_statement_SOURCES = check_statement.c $(common_sources)
check_statement_LDADD = $(JSON_GLIB_LIBS) \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
EXTRA_DIST = set.data stmt.data
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 56a7bc7..59cf513 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -17,8 +17,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libgda/sqlite \
-I$(top_srcdir)/libgda \
-I. \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_CFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_CFLAGS) \
-DROOT_DIR=\""$(top_srcdir)"\"
gda_list_config_5_0_SOURCES = \
@@ -26,7 +26,7 @@ gda_list_config_5_0_SOURCES = \
gda_list_config_5_0_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
gda_sql_5_0_SOURCES = \
config-info.h \
@@ -47,7 +47,7 @@ gda_sql_5_0_SOURCES = \
gda_sql_5_0_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS) \
+ $(COREDEPS_LIBS) \
$(READLINE_LIB) \
$(HISTORY_LIB)
@@ -78,7 +78,7 @@ gda_list_server_op_5_0_SOURCES = \
gda_list_server_op_5_0_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
information_schema_doc_SOURCES = \
@@ -86,14 +86,14 @@ information_schema_doc_SOURCES = \
information_schema_doc_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
information_schema_types_SOURCES = \
information-schema-types.c
information_schema_types_LDADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS)
+ $(COREDEPS_LIBS)
webdatadir = $(datadir)/libgda-5.0/web
webdata_DATA = \
diff --git a/tools/browser/Makefile.am b/tools/browser/Makefile.am
index 99a3a70..1a0becb 100644
--- a/tools/browser/Makefile.am
+++ b/tools/browser/Makefile.am
@@ -16,8 +16,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libgda \
-I$(top_srcdir)/libgda/sqlite \
-I$(top_builddir) \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS) \
$(GTK_CFLAGS) \
$(GTKSOURCEVIEW_CFLAGS) \
$(MAC_INTEGRATION_CFLAGS) \
@@ -110,7 +110,7 @@ gda_browser_5_0_LDADD=\
common/libcommon.la \
$(top_builddir)/libgda/libgda-5.0.la \
$(top_builddir)/libgda-ui/libgda-ui-5.0.la \
- $(LIBGDA_LIBS) $(GTK_LIBS) $(GTKSOURCEVIEW_LIBS) $(MAC_INTEGRATION_LIBS)
+ $(COREDEPS_LIBS) $(GTK_LIBS) $(GTKSOURCEVIEW_LIBS) $(MAC_INTEGRATION_LIBS)
@INTLTOOL_DESKTOP_RULE@
@@ -141,7 +141,7 @@ canvas_example_LDADD=\
common/libcommon.la \
$(top_builddir)/libgda/libgda-5.0.la \
$(top_builddir)/libgda-ui/libgda-ui-5.0.la \
- $(LIBGDA_LIBS) $(GTK_LIBS)
+ $(COREDEPS_LIBS) $(GTK_LIBS)
# icons
iconsdir=$(datadir)/libgda-5.0/pixmaps
diff --git a/tools/browser/canvas/Makefile.am b/tools/browser/canvas/Makefile.am
index aab686c..ce89645 100644
--- a/tools/browser/canvas/Makefile.am
+++ b/tools/browser/canvas/Makefile.am
@@ -5,8 +5,8 @@ AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS) \
$(GTK_CFLAGS) \
$(GOOCANVAS_CFLAGS) \
$(GRAPHVIZ_CFLAGS) \
@@ -36,7 +36,7 @@ libcanvas_la_SOURCES = \
libcanvas_la_LIBADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS) \
+ $(COREDEPS_LIBS) \
$(GTK_LIBS) \
$(GOOCANVAS_LIBS) \
$(GRAPHVIZ_LIBS) \
diff --git a/tools/browser/common/Makefile.am b/tools/browser/common/Makefile.am
index 641b3ec..e274295 100644
--- a/tools/browser/common/Makefile.am
+++ b/tools/browser/common/Makefile.am
@@ -4,8 +4,8 @@ AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS) \
$(GTK_CFLAGS) \
$(MAC_INTEGRATION_CFLAGS)
@@ -32,7 +32,7 @@ $(OBJECTS): marshal.c marshal.h
libcommon_la_LIBADD = \
$(top_builddir)/libgda/libgda-5.0.la \
- $(LIBGDA_LIBS) \
+ $(COREDEPS_LIBS) \
$(GTK_LIBS)
xmldir=$(datadir)/libgda-5.0
diff --git a/tools/browser/data-manager/Makefile.am b/tools/browser/data-manager/Makefile.am
index 2eade22..a2bd6ca 100644
--- a/tools/browser/data-manager/Makefile.am
+++ b/tools/browser/data-manager/Makefile.am
@@ -5,8 +5,8 @@ AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS) \
$(GTK_CFLAGS) \
$(GTKSOURCEVIEW_CFLAGS) \
$(MAC_INTEGRATION_CFLAGS)
diff --git a/tools/browser/doc/Makefile.am b/tools/browser/doc/Makefile.am
index 3970987..50d3e25 100644
--- a/tools/browser/doc/Makefile.am
+++ b/tools/browser/doc/Makefile.am
@@ -34,8 +34,8 @@ GTKDOC_CFLAGS = -I$(top_srcdir) \
-I$(top_srcdir)/libgda \
-I$(top_srcdir)/tools/browser \
-I$(top_srcdir)/tools/browser/common \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS) \
$(GTK_CFLAGS) \
$(GTKSOURCEVIEW_CFLAGS) \
-DGETTEXT_PACKAGE=\""$(GETTEXT_PACKAGE)"\"
@@ -55,7 +55,7 @@ GTKDOC_LIBS = \
$(top_builddir)/tools/browser/common/libcommon.la \
$(top_builddir)/libgda/libgda-5.0.la \
$(top_builddir)/libgda-ui/libgda-ui-5.0.la \
- $(LIBGDA_LIBS) \
+ $(COREDEPS_LIBS) \
$(GTK_LIBS) \
$(GTKSOURCEVIEW_LIBS)
diff --git a/tools/browser/dummy-perspective/Makefile.am b/tools/browser/dummy-perspective/Makefile.am
index dfd04da..76e707c 100644
--- a/tools/browser/dummy-perspective/Makefile.am
+++ b/tools/browser/dummy-perspective/Makefile.am
@@ -5,8 +5,8 @@ AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS) \
$(GTK_CFLAGS) \
$(MAC_INTEGRATION_CFLAGS)
diff --git a/tools/browser/query-exec/Makefile.am b/tools/browser/query-exec/Makefile.am
index 255e174..09020b4 100644
--- a/tools/browser/query-exec/Makefile.am
+++ b/tools/browser/query-exec/Makefile.am
@@ -5,8 +5,8 @@ AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS) \
$(GTK_CFLAGS) \
$(GTKSOURCEVIEW_CFLAGS) \
$(MAC_INTEGRATION_CFLAGS)
diff --git a/tools/browser/schema-browser/Makefile.am b/tools/browser/schema-browser/Makefile.am
index f720ab1..49ffe03 100644
--- a/tools/browser/schema-browser/Makefile.am
+++ b/tools/browser/schema-browser/Makefile.am
@@ -5,8 +5,8 @@ AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/libgda \
- $(LIBGDA_CFLAGS) \
- $(LIBGDA_WFLAGS) \
+ $(COREDEPS_CFLAGS) \
+ $(COREDEPS_WFLAGS) \
$(GTK_CFLAGS) \
$(MAC_INTEGRATION_CFLAGS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
