Commit ece5b27e authored by Jussi Kukkonen's avatar Jussi Kukkonen

Fixed Makefile.am for GeoclueWebService and backends

parent d4498ea7
EXTRA_DIST = geoclue_position_error.h \
geoclue_position_error.c \
geoclue_web_service.h \
geoclue_web_service.c
EXTRA_DIST = geoclue_web_service.h geoclue_position_error.h
noinst_LIBRARIES = libgeoclue_web_service.a libgeoclue_position_error.a
geoclue_web_service_CFLAGS = $(DBUS_CFLAGS) $(HTTPXML_CFLAGS) $(GOBJECT_CFLAGS) $(CONIC_CFLAGS) -I$(top_srcdir)
geoclue_position_error_CFLAGS = $(GLIB_CFLAGS)
libgeoclue_web_service_a_SOURCES = geoclue_web_service.c
libgeoclue_web_service_a_CFLAGS = $(DBUS_CFLAGS) $(HTTPXML_CFLAGS) $(GOBJECT_CFLAGS) $(CONIC_CFLAGS) -I$(top_srcdir)
all: geoclue_web_service.o geoclue_position_error.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 *.o
libgeoclue_position_error_a_SOURCES = geoclue_position_error.c
libgeoclue_position_error_a_CFLAGS = $(GLIB_CFLAGS)
......@@ -17,9 +17,9 @@ $(service_DATA): $(service_in_files) Makefile
LDADD = ../common/libgeoclue_web_service.a
AM_CPPFLAGS = $(YAHOO_CFLAGS) -I$(top_srcdir)
AM_LDFLAGS = $(YAHOO_LIBS) ../common/geoclue_web_service.o
AM_LDFLAGS = $(YAHOO_LIBS)
EXTRA_DIST = \
geoclue_geocode_server_yahoo.h \
......
......@@ -17,9 +17,9 @@ $(service_DATA): $(service_in_files) Makefile
done
LDADD = ../common/libgeoclue_web_service.a
AM_CPPFLAGS = $(YAHOO_CFLAGS) -I$(top_srcdir)
AM_LDFLAGS = $(YAHOO_LIBS) ../common/geoclue_web_service.o
AM_LDFLAGS = $(YAHOO_LIBS)
EXTRA_DIST = \
geoclue_map_server_yahoo.h \
......
......@@ -17,11 +17,10 @@ $(service_DATA): $(service_in_files) Makefile
sed -e 's;@execdir@;$(execdir);' $< > $@ ;\
done
LDADD = ../common/libgeoclue_position_error.a
AM_CPPFLAGS = $(YAHOO_CFLAGS) -I$(top_srcdir)
AM_LDFLAGS = $(YAHOO_LIBS) -lgps \
../../geoclue/libgeoclue.la \
../common/geclue_position_error.o
../../geoclue/libgeoclue.la
EXTRA_DIST = \
geoclue_position_server_gpsd.h \
......
......@@ -17,11 +17,10 @@ $(service_DATA): $(service_in_files) Makefile
done
LDADD = ../common/libgeoclue_web_service.a ../common/libgeoclue_position_error.a
AM_CPPFLAGS = $(YAHOO_CFLAGS) $(CONIC_CFLAGS) -I$(top_srcdir)
AM_LDFLAGS = $(YAHOO_LIBS) $(CONIC_LIBS) \
../../geoclue/libgeoclue.la \
../common/geoclue_web_service.o \
../common/geoclue_position_error.o
../../geoclue/libgeoclue.la
EXTRA_DIST = \
geoclue_position_server_hostip.h \
......
......@@ -3,8 +3,9 @@ bin_PROGRAMS = geoclue-position-server-manual
geoclue_position_server_manual_SOURCES = geoclue_position_server_manual.c \
geoclue_position_signal_marshal.c
LDADD = ../common/libgeoclue_position_error.a
AM_CPPFLAGS = $(YAHOO_CFLAGS) -I$(top_srcdir)
AM_LDFLAGS = $(YAHOO_LIBS) ../../geoclue/libgeoclue.la ../common/geoclue_position_error.o
AM_LDFLAGS = $(YAHOO_LIBS) ../../geoclue/libgeoclue.la
service_in_files = org.freedesktop.geoclue.position.manual.service.in
......
......@@ -7,13 +7,10 @@ geoclue_position_server_plazes_SOURCES = geoclue_position_server_plazes.c \
geoclue_position_signal_marshal.c
# TODO: Yahoo libs/cflags is wrong, fix these...
LDADD = ../common/libgeoclue_web_service.a ../common/libgeoclue_position_error.a
AM_CPPFLAGS = $(YAHOO_CFLAGS) $(CONIC_CFLAGS) -I$(top_srcdir)
AM_LDFLAGS = $(YAHOO_LIBS) $(CONIC_LIBS) \
../../geoclue/libgeoclue.la \
../common/geoclue_web_service.o \
../common/geoclue_position_error.o
../../geoclue/libgeoclue.la
EXTRA_DIST = geoclue_position_server_plazes.h \
position_plazes.desc \
......
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