diff options
| author | Marius Vollmer <marius.vollmer@nokia.com> | 2009-08-17 16:51:47 +0300 |
|---|---|---|
| committer | Marius Vollmer <marius.vollmer@nokia.com> | 2009-08-17 17:12:59 +0300 |
| commit | 2ed26c1d0bebcb97cda0785c3576236302e4af19 (patch) | |
| tree | 95c5541b542212a8a0299e55182b9ffb64338994 | |
| parent | d29ea48aab0aca2ab5d7d7e908e4a674b61febb6 (diff) | |
Adjust build dependency some more.
Don't check nor use GObject. Put GLib and D-Bus back.
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | debian/control | 8 | ||||
| -rw-r--r-- | libcontextprovider/customer-tests/c-api/Makefile.am | 4 | ||||
| -rw-r--r-- | libcontextprovider/customer-tests/c-api/cprovidertests.c | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index c719d4ed..03f056d5 100644 --- a/configure.ac +++ b/configure.ac @@ -14,14 +14,13 @@ AC_PROG_LIBTOOL AM_PATH_PYTHON # check for libraries -PKG_CHECK_MODULES_SUBST([DBUS], [dbus-1]) PKG_CHECK_MODULES_SUBST([QtTest], [QtTest]) PKG_CHECK_MODULES_SUBST([QtCore], [QtCore]) PKG_CHECK_MODULES_SUBST([QtDBus], [QtDBus]) PKG_CHECK_MODULES_SUBST([QtXml], [QtXml]) # only for compiling c code +PKG_CHECK_MODULES_SUBST([DBUS], [dbus-1]) PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.12.0]) -PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.12.0]) AC_PROG_QT_MOC AC_PROG_QT_UIC diff --git a/debian/control b/debian/control index 4cb8511c..49acb7d7 100644 --- a/debian/control +++ b/debian/control @@ -6,10 +6,12 @@ Build-Depends: debhelper (>= 5), automake1.9, python, python-central, - xsltproc, libqt4-dev, - doxygen, - libcdb-dev + libcdb-dev, + libglib2.0-dev (>= 2.12.0), + libdbus-1-dev, + xsltproc, + doxygen XS-Python-Version: all Standards-Version: 3.8.0 diff --git a/libcontextprovider/customer-tests/c-api/Makefile.am b/libcontextprovider/customer-tests/c-api/Makefile.am index c8cb4caa..41d8ff23 100644 --- a/libcontextprovider/customer-tests/c-api/Makefile.am +++ b/libcontextprovider/customer-tests/c-api/Makefile.am @@ -5,5 +5,5 @@ cprovidertests_SOURCES = cprovidertests.c check-customer: PATH=$$PATH:../client CONTEXT_LOG_VERBOSITY=WARNING ./cprovidertests -cprovidertests_CFLAGS = -I$(top_srcdir)/libcontextprovider/src $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(GOBJECT_CFLAGS) -cprovidertests_LDFLAGS = $(GLIB_LIBS) $(DBUS_LIBS) $(GOBJECT_LIBS) -L$(top_builddir)/libcontextprovider/src/.libs -lcontextprovider +cprovidertests_CFLAGS = -I$(top_srcdir)/libcontextprovider/src $(GLIB_CFLAGS) $(DBUS_CFLAGS) +cprovidertests_LDFLAGS = $(GLIB_LIBS) $(DBUS_LIBS) -L$(top_builddir)/libcontextprovider/src/.libs -lcontextprovider diff --git a/libcontextprovider/customer-tests/c-api/cprovidertests.c b/libcontextprovider/customer-tests/c-api/cprovidertests.c index cfbf1809..fb8b6ecf 100644 --- a/libcontextprovider/customer-tests/c-api/cprovidertests.c +++ b/libcontextprovider/customer-tests/c-api/cprovidertests.c @@ -24,7 +24,6 @@ #include <stdio.h> #include <glib.h> #include <dbus/dbus.h> -#include <glib-object.h> #include <assert.h> #include <sys/time.h> #include <sys/types.h> @@ -519,7 +518,6 @@ int main(int argc, char **argv) int ret; /* Initialization */ - g_type_init (); loop = g_main_loop_new (NULL, FALSE); /* Start the client program */ |