GNOME.org
 

[libgda] Misc compilation related corrections

commit bbb9a8403a69cf08e6b128848afa1be0fdebd753
Author: Vivien Malerba <malerba gnome-db org>
Date:   Sun Jan 4 16:53:01 2015 +0100

    Misc compilation related corrections

 control-center/Makefile.am     |   10 ++++++----
 libgda/Makefile.am             |    1 +
 libgda/test-cnc-open.c         |    4 ++--
 po/POTFILES.skip               |    1 +
 providers/postgres/Makefile.am |    6 ++++--
 tests/vala/Makefile.am         |    4 ++--
 tools/Makefile.am              |    7 +++++--
 tools/browser/Makefile.am      |    3 ++-
 tools/common/Makefile.am       |    3 +++
 tools/test-splitter.c          |    2 +-
 10 files changed, 27 insertions(+), 14 deletions(-)
---
diff --git a/control-center/Makefile.am b/control-center/Makefile.am
index 5dba253..70b186b 100644
--- a/control-center/Makefile.am
+++ b/control-center/Makefile.am
@@ -35,11 +35,12 @@ gda_control_center_6_0_SOURCES=\
        control-center.gresources.c
 
 # resources
-RESOURCES=\
+RESOURCES = \
+       control-center.gresource.xml \
        menus.ui \
        gda-control-center.png
 
-control-center.gresources.c: control-center.gresource.xml $(RESOURCES)
+control-center.gresources.c: $(RESOURCES)
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) 
--sourcedir=$(srcdir)/../libgda-ui/data --generate-source $(srcdir)/control-center.gresource.xml
 
 if PLATFORM_WIN32
@@ -78,13 +79,14 @@ Desktop_in_files = gda-control-center-6.0.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
 EXTRA_DIST = \
-       control-center.gresource.xml \
+       $(RESOURCES) \
        control-center-res.rc \
        gda-control-center.ico \
        $(appdata_in_files) \
        $(Desktop_in_files)
 
-DISTCLEANFILES = $(desktop_DATA) \
+DISTCLEANFILES = \
+       $(desktop_DATA) \
        $(appdata_DATA)
 
 CLEANFILES = \
diff --git a/libgda/Makefile.am b/libgda/Makefile.am
index c7b09bd..ec3a242 100644
--- a/libgda/Makefile.am
+++ b/libgda/Makefile.am
@@ -2,6 +2,7 @@ QUIET_GEN = $(Q:@= echo ' GEN '$@;)
 
 lib_LTLIBRARIES = libgda-6.0.la
 
+TESTS_ENVIRONMENT = GDA_TOP_SRC_DIR="$(abs_top_srcdir)" GDA_TOP_BUILD_DIR="$(abs_top_builddir)"
 check_PROGRAMS = test-cnc-open test-cnc-exec test-cnc-meta
 TESTS = test-cnc-open test-cnc-exec test-cnc-meta
 
diff --git a/libgda/test-cnc-open.c b/libgda/test-cnc-open.c
index d4adae5..5d49a58 100644
--- a/libgda/test-cnc-open.c
+++ b/libgda/test-cnc-open.c
@@ -344,8 +344,8 @@ test5 (void)
 
        g_object_unref (cnc);
 
-       if (nsignals != 8) {
-               g_print ("Expected %d signals and got %d\n", 8, nsignals);
+       if (nsignals != 6) {
+               g_print ("Expected %d signals and got %d\n", 6, nsignals);
                return 1;
        }
 
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 7502dda..6e63972 100755
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -36,3 +36,4 @@ providers/sqlcipher/sqlite3.c
 testing/html.c
 tests/gda-ddl-creator.c
 tools/browser/gda-browser-6.0.desktop.in
+libgda/data/Table.c
diff --git a/providers/postgres/Makefile.am b/providers/postgres/Makefile.am
index 27346d7..35b2dbe 100644
--- a/providers/postgres/Makefile.am
+++ b/providers/postgres/Makefile.am
@@ -59,7 +59,7 @@ xml_DATA = $(xml_in_files:.xml.in=.xml)
 # resources
 RESOURCES=$(xml_in_files:.xml.in=.raw.xml)
 postgres.gresources.c: postgres.gresource.xml $(RESOURCES)
-       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source 
$(srcdir)/postgres.gresource.xml
+       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --sourcedir=$(builddir) 
--generate-source $(srcdir)/postgres.gresource.xml
 
 %.raw.xml:%.xml.in
        @echo "  GEN      $@"
@@ -72,5 +72,7 @@ CLEANFILES = \
        postgres.gresources.c \
        $(RESOURCES)
 
-EXTRA_DIST = $(xml_in_files) libgda-postgres-6.0.pc.in
+EXTRA_DIST = $(xml_in_files) \
+       libgda-postgres-6.0.pc.in \
+       postgres.gresource.xml
 DISTCLEANFILES = $(xml_DATA)
diff --git a/tests/vala/Makefile.am b/tests/vala/Makefile.am
index 78bbc5c..47efd1e 100644
--- a/tests/vala/Makefile.am
+++ b/tests/vala/Makefile.am
@@ -10,8 +10,8 @@ AM_CPPFLAGS = \
        -DROOT_DIR=\""$(top_srcdir)"\"
 
 TESTS_ENVIRONMENT = GDA_TOP_SRC_DIR="$(abs_top_srcdir)" GDA_TOP_BUILD_DIR="$(abs_top_builddir)"
-TESTS = check_dataobject check_datamodeliterator check_table
-check_PROGRAMS = check_dataobject check_datamodeliterator check_table
+TESTS = check_dataobject check_table
+check_PROGRAMS = check_dataobject check_table
 
 CLEANFILES =
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index d873d26..62df4f4 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -14,6 +14,7 @@ SUBDIRS+=browser
 noinst_LTLIBRARIES = libbrowser.la
 endif
 
+#TESTS_ENVIRONMENT = GDA_TOP_SRC_DIR="$(abs_top_srcdir)" GDA_TOP_BUILD_DIR="$(abs_top_builddir)"
 TESTS = test-splitter
 check_PROGRAMS = $(TESTS)
 
@@ -101,6 +102,7 @@ endif
 
 # resources
 RESOURCES=\
+       tools.gresource.xml \
        resources/gda-browser-action.png \
        resources/gda-browser-auth-big.png \
        resources/gda-browser-auth.png \
@@ -131,7 +133,7 @@ RESOURCES=\
        resources/gda-browser-table.png \
        resources/gda-browser-view.png
 
-tools.gresources.c: tools.gresource.xml $(RESOURCES)
+tools.gresources.c: $(RESOURCES)
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=resources --generate-source 
$(srcdir)/tools.gresource.xml
 
 # setenv() is in libiberty in mingw
@@ -166,7 +168,8 @@ EXTRA_DIST = \
        gda-sql.ico \
        gda-browser-res.rc \
        gda-browser.ico \
-       $(webdata_DATA)
+       $(webdata_DATA) \
+       $(RESOURCES)
 
 mans = \
        gda-sql-6.0.1
diff --git a/tools/browser/Makefile.am b/tools/browser/Makefile.am
index 1137795..8e706a2 100644
--- a/tools/browser/Makefile.am
+++ b/tools/browser/Makefile.am
@@ -100,6 +100,7 @@ EXTRA_DIST = \
        $(appdata_in_files) \
        $(appicons_DATA)
 
-CLEANFILES = \
+DISTCLEANFILES = \
+       $(desktop_DATA) \
        $(appdata_DATA)
 
diff --git a/tools/common/Makefile.am b/tools/common/Makefile.am
index d3c6452..b3259d1 100644
--- a/tools/common/Makefile.am
+++ b/tools/common/Makefile.am
@@ -51,6 +51,9 @@ endif
 
 libcommon_la_SOURCES = $(nonuisources)
 
+EXTRA_DIST = \
+       marshal.list
+
 if HAVE_UI
 noinst_LTLIBRARIES += libcommonui.la
 
diff --git a/tools/test-splitter.c b/tools/test-splitter.c
index e5dc6e5..5547bdc 100644
--- a/tools/test-splitter.c
+++ b/tools/test-splitter.c
@@ -108,5 +108,5 @@ main (int argc, char * argv[])
        else
                g_print ("%u tests Ok\n", nb);
 
-       return nfailed ? 0 : 1;
+       return nfailed ? 1 : 0;
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]