Commit 4695cbac authored by Jussi Kukkonen's avatar Jussi Kukkonen

Moved geoclue_position_error to backend/common/

Also made sure it's only compiled once...
parent bc8bd630
SUBDIRS = @BACKEND_SUBDIRS@
EXTRA_DIST=geoclue_position_error.h \
geoclue_position_error.c
EXTRA_DIST = geoclue_position_error.h \
geoclue_position_error.c \
geoclue_web_service.h \
geoclue_web_service.c
geoclue_web_service_CFLAGS = $(DBUS_CFLAGS) $(HTTPXML_CFLAGS) $(GOBJECT_CFLAGS) $(CONIC_CFLAGS) -I$(top_srcdir)
geoclue_position_error_CFLAGS = $(GLIB_CFLAGS)
all: geoclue_web_service.o geoclue_position_error.o
all: geoclue_web_service.o
geoclue_position_error.o: geoclue_position_error.c
$(CC) $(geoclue_position_error_CFLAGS) -c geoclue_position_error.c
geoclue_web_service.o: geoclue_web_service.c
$(CC) $(geoclue_web_service_CFLAGS) -c geoclue_web_service.c
clean:
rm geoclue_web_service.o
rm *.o
#include <glib.h>
#include "geoclue_position_error.h"
/* Error domain for position backend errors */
GQuark geoclue_position_error_quark () {
......
bin_PROGRAMS = geoclue-position-server-gpsd
geoclue_position_server_gpsd_SOURCES = geoclue_position_server_gpsd.c \
geoclue_position_signal_marshal.c \
../geoclue_position_error.c
geoclue_position_signal_marshal.c
service_in_files = org.freedesktop.geoclue.position.gpsd.service.in
......@@ -20,7 +19,9 @@ $(service_DATA): $(service_in_files) Makefile
AM_CPPFLAGS = $(YAHOO_CFLAGS) -I$(top_srcdir)
AM_LDFLAGS = $(YAHOO_LIBS) ../../geoclue/libgeoclue.la -lgps
AM_LDFLAGS = $(YAHOO_LIBS) -lgps \
../../geoclue/libgeoclue.la \
../common/geclue_position_error.o
EXTRA_DIST = \
geoclue_position_server_gpsd.h \
......
......@@ -40,7 +40,7 @@
#include <gpsbt.h>
#endif
#include "../geoclue_position_error.h"
#include "../common/geoclue_position_error.h"
#define GPSBT_MAX_ERROR_BUF_LEN 255
......
bin_PROGRAMS = geoclue-position-server-hostip
geoclue_position_server_hostip_SOURCES = geoclue_position_server_hostip.c \
geoclue_position_signal_marshal.c \
../geoclue_position_error.c
geoclue_position_signal_marshal.c
service_in_files = org.freedesktop.geoclue.position.hostip.service.in
service_files = $(service_in_files:.service.in=.service)
......@@ -19,7 +18,10 @@ $(service_DATA): $(service_in_files) Makefile
AM_CPPFLAGS = $(YAHOO_CFLAGS) $(CONIC_CFLAGS) -I$(top_srcdir)
AM_LDFLAGS = $(YAHOO_LIBS) $(CONIC_LIBS) ../../geoclue/libgeoclue.la ../common/geoclue_web_service.o
AM_LDFLAGS = $(YAHOO_LIBS) $(CONIC_LIBS) \
../../geoclue/libgeoclue.la \
../common/geoclue_web_service.o \
../common/geoclue_position_error.o
EXTRA_DIST = \
geoclue_position_server_hostip.h \
......
......@@ -19,7 +19,7 @@
*/
#include "geoclue_position_server_hostip.h"
#include "../geoclue_position_error.h"
#include "../common/geoclue_position_error.h"
#include <geoclue_position_server_glue.h>
#include <geoclue_position_signal_marshal.h>
......
bin_PROGRAMS = geoclue-position-server-manual
geoclue_position_server_manual_SOURCES = geoclue_position_server_manual.c \
geoclue_position_signal_marshal.c \
../geoclue_position_error.c
geoclue_position_signal_marshal.c
AM_CPPFLAGS = $(YAHOO_CFLAGS) -I$(top_srcdir)
AM_LDFLAGS = $(YAHOO_LIBS) ../../geoclue/libgeoclue.la
AM_LDFLAGS = $(YAHOO_LIBS) ../../geoclue/libgeoclue.la ../common/geoclue_position_error.o
service_in_files = org.freedesktop.geoclue.position.manual.service.in
......
......@@ -17,7 +17,7 @@
*/
#include "geoclue_position_server_manual.h"
#include "../geoclue_position_error.h"
#include "../common/geoclue_position_error.h"
#include <geoclue_position_server_glue.h>
#include <geoclue_position_signal_marshal.h>
......
......@@ -4,14 +4,16 @@ service_in_files = org.freedesktop.geoclue.position.plazes.service.in
service_files = $(service_in_files:.service.in=.service)
geoclue_position_server_plazes_SOURCES = geoclue_position_server_plazes.c \
geoclue_position_signal_marshal.c \
../geoclue_position_error.c
geoclue_position_signal_marshal.c
# TODO: Yahoo libs/cflags is wrong, fix these...
AM_CPPFLAGS = $(YAHOO_CFLAGS) $(CONIC_CFLAGS) -I$(top_srcdir)
AM_LDFLAGS = $(YAHOO_LIBS) $(CONIC_LIBS) ../../geoclue/libgeoclue.la ../common/geoclue_web_service.o
AM_LDFLAGS = $(YAHOO_LIBS) $(CONIC_LIBS) \
../../geoclue/libgeoclue.la \
../common/geoclue_web_service.o \
../common/geoclue_position_error.o
EXTRA_DIST = geoclue_position_server_plazes.h \
position_plazes.desc \
......
......@@ -18,7 +18,7 @@
*/
#include "geoclue_position_server_plazes.h"
#include "../geoclue_position_error.h"
#include "../common/geoclue_position_error.h"
#include <geoclue_position_server_glue.h>
#include <geoclue_position_signal_marshal.h>
......
......@@ -67,6 +67,10 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
AC_SUBST(GOBJECT_CFLAGS)
AC_SUBST(GOBJECT_LIBS)
PKG_CHECK_MODULES(GLIB, glib-2.0)
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
DBUS_SERVICES_DIR=`pkg-config dbus-1 --variable=exec_prefix`/share/dbus-1/services
AC_SUBST(DBUS_SERVICES_DIR)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment