Commit 44348a53 authored by Zeeshan Ali's avatar Zeeshan Ali

Move public API to a subdir

This is so that we can just point our docs to that directory and it
doesn't complain about all the internal API that we don't want it to
scan anyway. Currently without this patch, the build actually breaks on
doc system parsing the internalized geocode-glib sources.
parent 1d638206
......@@ -180,6 +180,7 @@ AC_CONFIG_FILES([
src/geoclue-2.0.pc
src/agent/Makefile
src/geocode-glib/Makefile
src/public-api/Makefile
src/geoip-server/Makefile
po/Makefile.in
data/org.freedesktop.GeoClue2.conf
......
......@@ -46,7 +46,8 @@ agent_CFLAGS = $(DEMO_AGENT_CFLAGS) \
$(WARN_CFLAGS) \
-DLOCALEDIR="\"$(datadir)/locale\"" \
-DABS_SRCDIR=\""$(abs_srcdir)"\" \
-I$(top_builddir)/src
-I$(top_builddir)/src \
-I$(top_builddir)/src/public-api
agent_LDADD = $(DEMO_AGENT_LIBS)
-include $(top_srcdir)/git.mk
......
......@@ -12,7 +12,7 @@ DOC_MAIN_SGML_FILE=geoclue-docs.xml
SCAN_OPTIONS=--ignore-headers=config.h --rebuild-sections --rebuild-types
# The directory containing the source code. Relative to $(srcdir)
DOC_SOURCE_DIR=../src
DOC_SOURCE_DIR=../src/public-api
# Used for dependencies
HFILE_GLOB=
......@@ -22,7 +22,7 @@ CFILE_GLOB=
IGNORE_HFILES= \
$(NULL)
GTKDOC_LIBS = $(top_srcdir)/src/libgeoclue.la
GTKDOC_LIBS = $(top_srcdir)/src/public-api/libgeoclue-public-api.la
# Extra options to supply to gtkdoc-mkdb
MKDB_OPTIONS=--sgml-mode --output-format=xml
......
......@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
libexec_PROGRAMS = geoclue
SUBDIRS = agent geocode-glib
SUBDIRS = public-api agent geocode-glib
if BUILD_GEOIP_SERVER
SUBDIRS += geoip-server
......@@ -23,8 +23,6 @@ geoclue-interface.h: Makefile.am $(interface_DATA)
BUILT_SOURCES = \
$(dbus_built_sources) \
gclue-enum-types.h \
gclue-enum-types.c \
$(NULL)
noinst_LTLIBRARIES = libgeoclue.la
......@@ -76,7 +74,8 @@ geoclue_SOURCES = \
geoclue_LDADD = $(GEOCLUE_LIBS) \
$(LIBS) \
$(builddir)/libgeoclue.la \
$(builddir)/geocode-glib/libgeocode-glib.la
$(builddir)/geocode-glib/libgeocode-glib.la \
$(builddir)/public-api/libgeoclue-public-api.la
CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = $(interface_DATA) \
......@@ -86,21 +85,4 @@ EXTRA_DIST = $(interface_DATA) \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = geoclue-2.0.pc
# Enum types
GEOCLUE_ENUMS = \
$(srcdir)/gclue-enums.h
gclue-enum-types.h: Makefile.am $(GEOCLUE_ENUMS) $(top_srcdir)/build-aux/gclue-enums-template.h
$(AM_V_GEN) $(GLIB_MKENUMS) \
--fhead "#include \"gclue-enums.h\"\n#ifndef __GCLUE_ENUM_TYPES_H__\n#define __GCLUE_ENUM_TYPES_H__\n" \
--template $(top_srcdir)/build-aux/gclue-enums-template.h \
--ftail "#endif /* __GCLUE_ENUM_TYPES_H__ */\n" \
$(GEOCLUE_ENUMS) > $@
gclue-enum-types.c: Makefile.am $(top_srcdir)/build-aux/gclue-enums-template.c gclue-enum-types.h
$(AM_V_GEN) $(GLIB_MKENUMS) \
--fhead "#include \"gclue-enum-types.h\"" \
--template $(top_srcdir)/build-aux/gclue-enums-template.c \
$(GEOCLUE_ENUMS) > $@
-include $(top_srcdir)/git.mk
......@@ -27,7 +27,7 @@
#include "gclue-wifi.h"
#include "gclue-3g.h"
#include "gclue-modem-gps.h"
#include "gclue-enum-types.h"
#include "public-api/gclue-enum-types.h"
/* This class is like a master location source that hides all individual
* location sources from rest of the code
......
......@@ -25,7 +25,7 @@
#include <gio/gio.h>
#include "geocode-glib/geocode-location.h"
#include "gclue-enum-types.h"
#include "public-api/gclue-enum-types.h"
#include "gclue-location-source.h"
G_BEGIN_DECLS
......
......@@ -25,7 +25,7 @@
#include "gclue-service-client.h"
#include "gclue-service-location.h"
#include "gclue-locator.h"
#include "gclue-enum-types.h"
#include "public-api/gclue-enum-types.h"
#include "gclue-config.h"
#define DEFAULT_ACCURACY_LEVEL GCLUE_ACCURACY_LEVEL_CITY
......
include $(top_srcdir)/Makefile.decl
BUILT_SOURCES = \
gclue-enum-types.h \
gclue-enum-types.c \
$(NULL)
AM_CPPFLAGS = $(GEOCLUE_CFLAGS) \
$(WARN_CFLAGS) \
-DLOCALEDIR="\"$(datadir)/locale\"" \
-DG_LOG_DOMAIN=\""Geoclue"\" \
-DABS_TOP_SRCDIR=\""$(abs_top_srcdir)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\"
noinst_LTLIBRARIES = libgeoclue-public-api.la
libgeoclue_public_api_la_SOURCES = $(BUILT_SOURCES)
CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = gclue-enums.h
# Enum types
GEOCLUE_ENUMS = \
$(srcdir)/gclue-enums.h
gclue-enum-types.h: Makefile.am $(GEOCLUE_ENUMS) $(top_srcdir)/build-aux/gclue-enums-template.h
$(AM_V_GEN) $(GLIB_MKENUMS) \
--fhead "#include \"gclue-enums.h\"\n#ifndef __GCLUE_ENUM_TYPES_H__\n#define __GCLUE_ENUM_TYPES_H__\n" \
--template $(top_srcdir)/build-aux/gclue-enums-template.h \
--ftail "#endif /* __GCLUE_ENUM_TYPES_H__ */\n" \
$(GEOCLUE_ENUMS) > $@
gclue-enum-types.c: Makefile.am $(top_srcdir)/build-aux/gclue-enums-template.c gclue-enum-types.h
$(AM_V_GEN) $(GLIB_MKENUMS) \
--fhead "#include \"gclue-enum-types.h\"" \
--template $(top_srcdir)/build-aux/gclue-enums-template.c \
$(GEOCLUE_ENUMS) > $@
-include $(top_srcdir)/git.mk
......@@ -38,11 +38,11 @@ G_BEGIN_DECLS
* Used to specify level of accuracy requested by, or allowed for a client.
**/
typedef enum {/*< underscore_name=gclue_accuracy_level>*/
GCLUE_ACCURACY_LEVEL_COUNTRY = 1,
GCLUE_ACCURACY_LEVEL_CITY = 4,
GCLUE_ACCURACY_LEVEL_COUNTRY = 1,
GCLUE_ACCURACY_LEVEL_CITY = 4,
GCLUE_ACCURACY_LEVEL_NEIGHBORHOOD = 5,
GCLUE_ACCURACY_LEVEL_STREET = 6,
GCLUE_ACCURACY_LEVEL_EXACT = 8,
GCLUE_ACCURACY_LEVEL_STREET = 6,
GCLUE_ACCURACY_LEVEL_EXACT = 8,
} GClueAccuracyLevel;
G_END_DECLS
......
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