Commit 384e3e00 authored by Cosimo Cecchi's avatar Cosimo Cecchi Committed by Zeeshan Ali

Move public-api directory to toplevel

We're about to make the src directory optional; move this at the
toplevel so that libgeoclue can include it directly.

https://bugs.freedesktop.org/show_bug.cgi?id=93889
parent 8c7921cb
......@@ -7,7 +7,7 @@ else
LIBGEOCLUE_DIR =
endif
SUBDIRS = build-aux src data $(LIBGEOCLUE_DIR) demo po docs
SUBDIRS = build-aux public-api src data $(LIBGEOCLUE_DIR) demo po docs
INTLTOOL_FILES = \
intltool-extract.in \
......
......@@ -227,7 +227,7 @@ AC_CONFIG_FILES([
src/geoclue-$GEOCLUE_API_VERSION.pc:src/geoclue.pc.in
src/agent/Makefile
src/geocode-glib/Makefile
src/public-api/Makefile
public-api/Makefile
po/Makefile.in
data/org.freedesktop.GeoClue2.conf
data/org.freedesktop.GeoClue2.Agent.conf
......
......@@ -12,8 +12,8 @@ where_am_i_CFLAGS = $(GEOCLUE_CFLAGS) \
-DLOCALEDIR="\"$(datadir)/locale\"" \
-I$(top_srcdir)/libgeoclue \
-I$(top_builddir)/libgeoclue \
-I$(top_srcdir)/src/public-api \
-I$(top_builddir)/src/public-api
-I$(top_srcdir)/public-api \
-I$(top_builddir)/public-api
where_am_i_LDADD = $(GEOCLUE_LIBS) \
../libgeoclue/libgeoclue-2.la
......@@ -46,8 +46,8 @@ agent_CFLAGS = $(DEMO_AGENT_CFLAGS) \
-I$(top_srcdir)/src \
-I$(top_builddir)/src/agent \
-I$(top_srcdir)/src/agent \
-I$(top_builddir)/src/public-api \
-I$(top_srcdir)/src/public-api
-I$(top_builddir)/public-api \
-I$(top_srcdir)/public-api
agent_LDADD = $(DEMO_AGENT_LIBS) \
$(top_builddir)/src/agent/libgeoclue-agent.la
......
......@@ -56,11 +56,11 @@ AM_CPPFLAGS = $(LIBGEOCLUE_CFLAGS) \
-DG_LOG_DOMAIN=\""Geoclue"\" \
-DABS_TOP_SRCDIR=\""$(abs_top_srcdir)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-I$(top_srcdir)/src/public-api \
-I$(top_builddir)/src/public-api
-I$(top_srcdir)/public-api \
-I$(top_builddir)/public-api
ENUMS_HEADER = $(top_srcdir)/src/public-api/gclue-enums.h
ENUMS_LIB = $(top_builddir)/src/public-api/libgeoclue-public-api.la
ENUMS_HEADER = $(top_srcdir)/public-api/gclue-enums.h
ENUMS_LIB = $(top_builddir)/public-api/libgeoclue-public-api.la
libgeoclue_2_la_SOURCES = \
gclue-client.c \
......@@ -102,8 +102,8 @@ Geoclue-2.0.gir: $(libgeoclue_2_la_SOURCES) $(geoclue_include_HEADERS)
--pkg-export=libgeoclue-2.0 \
--libtool=$(top_builddir)/libtool \
-I$(srcdir) \
-I$(top_srcdir)/src/public-api \
-I$(top_builddir)/src/public-api \
-I$(top_srcdir)/public-api \
-I$(top_builddir)/public-api \
--c-include='geoclue.h' \
$^ \
$(ENUMS_HEADER) \
......
......@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
libexec_PROGRAMS = geoclue
SUBDIRS = public-api agent geocode-glib
SUBDIRS = agent geocode-glib
CLIENT_INTERFACE_XML = org.freedesktop.GeoClue2.Client.xml
LOCATION_INTERFACE_XML = org.freedesktop.GeoClue2.Location.xml
......@@ -118,8 +118,8 @@ AM_CPPFLAGS = $(GEOCLUE_CFLAGS) \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-I$(srcdir)/agent \
-I$(builddir)/agent \
-I$(srcdir)/public-api \
-I$(builddir)/public-api
-I$(top_srcdir)/public-api \
-I$(top_builddir)/public-api
libgeoclue_internal_la_SOURCES = \
$(BUILT_SOURCES) \
......@@ -190,7 +190,7 @@ geoclue_LDADD = $(GEOCLUE_LIBS) \
$(builddir)/libgeoclue-internal.la \
$(builddir)/agent/libgeoclue-agent.la \
$(builddir)/geocode-glib/libgeocode-glib.la \
$(builddir)/public-api/libgeoclue-public-api.la
$(top_builddir)/public-api/libgeoclue-public-api.la
CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = $(interface_DATA) \
......
......@@ -24,7 +24,7 @@
#include <glib.h>
#include <gio/gio.h>
#include "public-api/gclue-enum-types.h"
#include "gclue-enum-types.h"
#include "gclue-location.h"
G_BEGIN_DECLS
......
......@@ -25,7 +25,7 @@
#include <gio/gio.h>
#include "gclue-location.h"
#include "public-api/gclue-enum-types.h"
#include "gclue-enum-types.h"
#include "gclue-location-source.h"
G_BEGIN_DECLS
......
......@@ -26,7 +26,7 @@
#include "gclue-nmea-source.h"
#include "gclue-location.h"
#include "config.h"
#include "public-api/gclue-enum-types.h"
#include "gclue-enum-types.h"
#include <avahi-client/lookup.h>
#include <avahi-common/simple-watch.h>
......
......@@ -25,7 +25,7 @@
#include "gclue-service-client.h"
#include "gclue-service-location.h"
#include "gclue-locator.h"
#include "public-api/gclue-enum-types.h"
#include "gclue-enum-types.h"
#include "gclue-config.h"
#define DEFAULT_ACCURACY_LEVEL GCLUE_ACCURACY_LEVEL_CITY
......
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