[tracker/tracker-cmd: 6/6] gvdb: Don't use TRACKER_UTILS_{CFLAGS|LIBS}

[Martyn James Russell <mr src gnome org>]

commit 5607756dae98bb997976fb922c94764026538ce5
Author: Martyn Russell <martyn lanedo com>
Date:   Mon Oct 6 11:58:33 2014 +0100

    gvdb: Don't use TRACKER_UTILS_{CFLAGS|LIBS}
    
    Now these no longer exist, we can't use them and we shouldn't have been
    anyway. This updates the test to not use GIO APIs anyway, it was only needed
    to remove a file and it's not needed by the GVDB library so we don't want to
    add the dep just to fix a unit test. Instead, we now use the unistd unlink()
    API.

 tests/gvdb/Makefile.am |   23 ++++++++++-------------
 tests/gvdb/gvdb-test.c |    9 ++++++---
 2 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/tests/gvdb/Makefile.am b/tests/gvdb/Makefile.am
index daabc50..32bbe53 100644
--- a/tests/gvdb/Makefile.am
+++ b/tests/gvdb/Makefile.am
@@ -4,18 +4,15 @@ noinst_PROGRAMS += $(test_programs)
 
 test_programs = gvdb-test
 
-AM_CPPFLAGS =                                          \
-       -I$(top_srcdir)/src                            \
-       -I$(top_builddir)/src                          \
-       -DSHAREDIR=\""$(datadir)"\"                    \
-       $(LIBTRACKER_DATA_CFLAGS)
+AM_CPPFLAGS = \
+       $(BUILD_CFLAGS) \
+       -I$(top_srcdir)/src \
+       -I$(top_builddir)/src \
+       -DSHAREDIR=\""$(datadir)"\" \
+       $(GVDB_CFLAGS)
 
 gvdb_test_SOURCES = gvdb-test.c
-gvdb_test_LDADD =      $(top_builddir)/src/gvdb/libgvdb.la     \
-                       $(BUILD_LIBS)                           \
-                       $(GVDB_LIBS)                            \
-                       $(TRACKER_UTILS_LIBS)
-
-gvdb_test_CFLAGS =     $(BUILD_CFLAGS) \
-                       $(GVDB_CFLAGS)  \
-                       $(TRACKER_UTILS_CFLAGS)
+gvdb_test_LDADD = \
+       $(top_builddir)/src/gvdb/libgvdb.la \
+       $(BUILD_LIBS) \
+       $(GVDB_LIBS)
diff --git a/tests/gvdb/gvdb-test.c b/tests/gvdb/gvdb-test.c
index 11afbfa..3a28821 100644
--- a/tests/gvdb/gvdb-test.c
+++ b/tests/gvdb/gvdb-test.c
@@ -1,13 +1,16 @@
+#include "config.h"
+
+#include <unistd.h>
+
 #include <glib.h>
+
 #include "gvdb/gvdb-builder.h"
 #include "gvdb/gvdb-reader.h"
 
 static void
 remove_file (const gchar *filename)
 {
-        GFile *f;
-        f = g_file_new_for_path (filename);
-        g_assert (g_file_delete (f, NULL, NULL));
+        g_assert (unlink (filename) == 0);
 }
 
 static void